222

schangxiang@126.com

2024-11-29 dd53f4d569ed4e48bba9b0912353d54112876342

222

 CC/iWareSql/WmsDBModel/WmsDBModel.cs

@@ -17,6 +17,7 @@
        public virtual DbSet<GoViewPro> GoViewPro { get; set; }
        public virtual DbSet<GoViewProData> GoViewProData { get; set; }
        public virtual DbSet<mes_batchOrderUPI_new> mes_batchOrderUPI_new { get; set; }
        public virtual DbSet<mes_order_gather> mes_order_gather { get; set; }
        public virtual DbSet<mes_package_gather> mes_package_gather { get; set; }
        public virtual DbSet<mes_package_linequeue> mes_package_linequeue { get; set; }
        public virtual DbSet<mes_package_unline_record> mes_package_unline_record { get; set; }

 CC/iWareSql/WmsDBModel/mes_order_gather.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;
    using System.ComponentModel.DataAnnotations;
    using System.ComponentModel.DataAnnotations.Schema;
    using System.Data.Entity.Spatial;

    public partial class mes_order_gather
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }

        [StringLength(60)]
        public string Info5 { get; set; }

        [Required]
        [StringLength(50)]
        public string PlanNo { get; set; }

        [Required]
        [StringLength(50)]
        public string OrderId { get; set; }

        public bool? IsKitting { get; set; }

        public int PackageNum { get; set; }

        public DateTime? CreateTime { get; set; }

        public DateTime? UpdateTime { get; set; }

        public long? CreateUserId { get; set; }

        [StringLength(64)]
        public string CreateUserName { get; set; }

        public long? UpdateUserId { get; set; }

        [StringLength(64)]
        public string UpdateUserName { get; set; }

        public bool IsDelete { get; set; }
    }
}

 CC/iWareSql/WmsDBModel/mes_package_gather.cs

@@ -13,22 +13,24 @@

        [Required]
        [StringLength(50)]
        public string PackageCode { get; set; }

        [StringLength(60)]
        public string Info5 { get; set; }

        [Required]
        [StringLength(50)]
        public string PlanNo { get; set; }

        [Required]
        [StringLength(50)]
        public string OrderId { get; set; }

        [StringLength(60)]
        public string Info5 { get; set; }

        public int? AreaCode { get; set; }

        public int UpiStatus { get; set; }

        [Required]
        [StringLength(50)]
        public string PackageCode { get; set; }
        public bool? IsQiBao { get; set; }

        public double? Info1 { get; set; }

@@ -50,9 +52,6 @@

        [StringLength(60)]
        public string Info10 { get; set; }

        [StringLength(60)]
        public string Info9 { get; set; }

        [StringLength(60)]
        public string Info11 { get; set; }

 CC/iWareSql/WmsDBModel/mes_package_linequeue.cs

@@ -13,22 +13,22 @@

        [Required]
        [StringLength(50)]
        public string PackageCode { get; set; }

        [StringLength(60)]
        public string Info5 { get; set; }

        [Required]
        [StringLength(50)]
        public string PlanNo { get; set; }

        [Required]
        [StringLength(50)]
        public string OrderId { get; set; }

        [StringLength(60)]
        public string Info5 { get; set; }

        public int? AreaCode { get; set; }

        public int UpiStatus { get; set; }

        [Required]
        [StringLength(50)]
        public string PackageCode { get; set; }

        public double? Info1 { get; set; }

@@ -50,9 +50,6 @@

        [StringLength(60)]
        public string Info10 { get; set; }

        [StringLength(60)]
        public string Info9 { get; set; }

        [StringLength(60)]
        public string Info11 { get; set; }
@@ -78,5 +75,8 @@
        public string UpdateUserName { get; set; }

        public bool IsDelete { get; set; }

        [StringLength(60)]
        public string Info9 { get; set; }
    }
}

 CC/iWareSql/WmsDBModel/mes_package_unline_record.cs

@@ -13,18 +13,18 @@

        [Required]
        [StringLength(50)]
        public string PlanNo { get; set; }

        [Required]
        [StringLength(50)]
        public string OrderId { get; set; }
        public string PackageCode { get; set; }

        [StringLength(60)]
        public string Info5 { get; set; }

        [Required]
        [StringLength(50)]
        public string PackageCode { get; set; }
        public string PlanNo { get; set; }

        [Required]
        [StringLength(50)]
        public string OrderId { get; set; }

        public double? Info1 { get; set; }

@@ -46,9 +46,6 @@

        [StringLength(60)]
        public string Info10 { get; set; }

        [StringLength(60)]
        public string Info9 { get; set; }

        [StringLength(60)]
        public string Info11 { get; set; }
@@ -77,5 +74,8 @@
        public string UpdateUserName { get; set; }

        public bool IsDelete { get; set; }

        [StringLength(60)]
        public string Info9 { get; set; }
    }
}

 CC/iWareSql/WmsDBModel/mes_push_papercut.cs

@@ -15,12 +15,6 @@
        [StringLength(50)]
        public string PackageCode { get; set; }

        public double? Info1 { get; set; }

        public double? Info2 { get; set; }

        public double? Info3 { get; set; }

        public int PushStatus { get; set; }

        public DateTime? PushTime { get; set; }
@@ -30,12 +24,6 @@
        [Required]
        [StringLength(50)]
        public string ApiMessage { get; set; }

        public long? CreateOrgId { get; set; }

        [Required]
        [StringLength(64)]
        public string CreateOrgName { get; set; }

        public DateTime? CreateTime { get; set; }

@@ -52,5 +40,11 @@
        public string UpdateUserName { get; set; }

        public bool IsDelete { get; set; }

        public double? Info1 { get; set; }

        public double? Info2 { get; set; }

        public double? Info3 { get; set; }
    }
}

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/component/editDialog.vue

@@ -47,6 +47,41 @@
                        </el-form-item>
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="已下线包数" prop="unLinePackageNum">
                            <el-input-number v-model="ruleForm.unLinePackageNum" placeholder="请输入已下线包数" clearable />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="未下线包数" prop="noUnLinePackageNum">
                            <el-input-number v-model="ruleForm.noUnLinePackageNum" placeholder="请输入未下线包数" clearable />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="总包装面积" prop="allPackageArea">
                            <el-input v-model="ruleForm.allPackageArea" placeholder="请输入总包装面积" maxlength="18" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="已扫描包装面积" prop="scanPackageArea">
                            <el-input v-model="ruleForm.scanPackageArea" placeholder="请输入已扫描包装面积" maxlength="18" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="未扫描包装面积" prop="noScanPackageArea">
                            <el-input v-model="ruleForm.noScanPackageArea" placeholder="请输入未扫描包装面积" maxlength="18" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                </el-row>
            </el-form>
            <template #footer>
@@ -90,6 +125,11 @@
        planNo: [{required: true, message: '请输入批次号！', trigger: 'blur',},],
        orderId: [{required: true, message: '请输入订单号！', trigger: 'blur',},],
        packageNum: [{required: true, message: '请输入包数！', trigger: 'blur',},],
        unLinePackageNum: [{required: true, message: '请输入已下线包数！', trigger: 'blur',},],
        noUnLinePackageNum: [{required: true, message: '请输入未下线包数！', trigger: 'blur',},],
        allPackageArea: [{required: true, message: '请输入总包装面积！', trigger: 'blur',},],
        scanPackageArea: [{required: true, message: '请输入已扫描包装面积！', trigger: 'blur',},],
        noScanPackageArea: [{required: true, message: '请输入未扫描包装面积！', trigger: 'blur',},],
        isDelete: [{required: true, message: '请选择软删除！', trigger: 'change',},],
    });


 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue

@@ -42,6 +42,42 @@
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
            <el-form-item label="已下线包数">
              <el-input-number v-model="queryParamsMes_Order_Gather.unLinePackageNum"  clearable="" placeholder="请输入已下线包数"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
            <el-form-item label="未下线包数">
              <el-input-number v-model="queryParamsMes_Order_Gather.noUnLinePackageNum"  clearable="" placeholder="请输入未下线包数"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
            <el-form-item label="总包装面积">
              <el-input v-model="queryParamsMes_Order_Gather.allPackageArea" clearable="" placeholder="请输入总包装面积"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
            <el-form-item label="已扫描包装面积">
              <el-input v-model="queryParamsMes_Order_Gather.scanPackageArea" clearable="" placeholder="请输入已扫描包装面积"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
            <el-form-item label="未扫描包装面积">
              <el-input v-model="queryParamsMes_Order_Gather.noScanPackageArea" clearable="" placeholder="请输入未扫描包装面积"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
            <el-form-item label="创建时间">
              <el-date-picker placeholder="请选择创建时间" value-format="YYYY/MM/DD  HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMes_Order_Gather.createTimeRange" />
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
            <el-form-item>
              <el-button-group style="display: flex; align-items: center;">
@@ -81,6 +117,11 @@
          
        </el-table-column>
        <el-table-column prop="packageNum" label="包数"  show-overflow-tooltip="" />
        <el-table-column prop="unLinePackageNum" label="已下线包数"  show-overflow-tooltip="" />
        <el-table-column prop="noUnLinePackageNum" label="未下线包数"  show-overflow-tooltip="" />
        <el-table-column prop="allPackageArea" label="总包装面积"  show-overflow-tooltip="" />
        <el-table-column prop="scanPackageArea" label="已扫描包装面积"  show-overflow-tooltip="" />
        <el-table-column prop="noScanPackageArea" label="未扫描包装面积"  show-overflow-tooltip="" />
         <el-table-column prop="createTime" label="创建时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
         <el-table-column prop="updateTime" label="修改时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
        <el-table-column prop="createUserName" label="创建人"  show-overflow-tooltip="" />

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Order_Gather.cs

@@ -41,5 +41,36 @@
        [SugarColumn(ColumnName = "PackageNum", ColumnDescription = "包数")]
        public int PackageNum { get; set; }

        /// <summary>
        /// å·²ä¸‹çº¿åŒ…æ•°
        /// </summary>
        [SugarColumn(ColumnName = "UnLinePackageNum", ColumnDescription = "已下线包数")]
        public int UnLinePackageNum { get; set; }

        /// <summary>
        /// æœªä¸‹çº¿åŒ…æ•°
        /// </summary>
        [SugarColumn(ColumnName = "NoUnLinePackageNum", ColumnDescription = "未下线包数")]
        public int NoUnLinePackageNum { get; set; }


        /// <summary>
        /// æ€»åŒ…装面积
        /// </summary>
        [SugarColumn(ColumnName = "AllPackageArea", ColumnDescription = "总包装面积")]
        public decimal AllPackageArea { get; set; }

        /// <summary>
        /// å·²æ‰«æåŒ…装面积
        /// </summary>
        [SugarColumn(ColumnName = "ScanPackageArea", ColumnDescription = "已扫描包装面积")]
        public decimal ScanPackageArea { get; set; }

        /// <summary>
        /// æœªæ‰«æåŒ…装面积
        /// </summary>
        [SugarColumn(ColumnName = "NoScanPackageArea", ColumnDescription = "未扫描包装面积")]
        public decimal NoScanPackageArea { get; set; }

    }
}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs

@@ -45,6 +45,10 @@
            throw Oops.Oh("本次有重复的UPI！重复号为:" + dit.Key + ",重复条数:" + dit.Value);
        }

        //同一个UPI只能属于一个 æ‰¹æ¬¡å·+订单号
        //会存在 ä¸€ä¸ªæ‰¹æ¬¡å·ï¼Œå¤šä¸ªè®¢å•å·çš„情况 
        //会存在 ä¸€ä¸ªè®¢å•å·ï¼Œå¤šä¸ªæ‰¹æ¬¡å·çš„情况 

        //按照批次号+订单号删除
        List<string> packageList = new List<string>();
        input.ForEach(x => packageList.Add(x.PlanNo + "_" + x.OrderId));//upis是传过来的upi字段集合

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs

@@ -34,6 +34,31 @@
        public virtual int PackageNum { get; set; }
        
        /// <summary>
        /// å·²ä¸‹çº¿åŒ…æ•°
        /// </summary>
        public virtual int UnLinePackageNum { get; set; }
        
        /// <summary>
        /// æœªä¸‹çº¿åŒ…æ•°
        /// </summary>
        public virtual int NoUnLinePackageNum { get; set; }
        
        /// <summary>
        /// æ€»åŒ…装面积
        /// </summary>
        public virtual decimal AllPackageArea { get; set; }
        
        /// <summary>
        /// å·²æ‰«æåŒ…装面积
        /// </summary>
        public virtual decimal ScanPackageArea { get; set; }
        
        /// <summary>
        /// æœªæ‰«æåŒ…装面积
        /// </summary>
        public virtual decimal NoScanPackageArea { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        public virtual DateTime? CreateTime { get; set; }
@@ -105,6 +130,40 @@
        /// </summary>
        public int? PackageNum { get; set; }
        
        /// <summary>
        /// å·²ä¸‹çº¿åŒ…æ•°
        /// </summary>
        public int? UnLinePackageNum { get; set; }
        
        /// <summary>
        /// æœªä¸‹çº¿åŒ…æ•°
        /// </summary>
        public int? NoUnLinePackageNum { get; set; }
        
        /// <summary>
        /// æ€»åŒ…装面积
        /// </summary>
        public decimal? AllPackageArea { get; set; }
        
        /// <summary>
        /// å·²æ‰«æåŒ…装面积
        /// </summary>
        public decimal? ScanPackageArea { get; set; }
        
        /// <summary>
        /// æœªæ‰«æåŒ…装面积
        /// </summary>
        public decimal? NoScanPackageArea { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        public DateTime? CreateTime { get; set; }
        
        /// <summary>
         /// åˆ›å»ºæ—¶é—´èŒƒå›´
         /// </summary>
         public List<DateTime?> CreateTimeRange { get; set; } 
    }

    /// <summary>
@@ -131,6 +190,36 @@
        public override int PackageNum { get; set; }
        
        /// <summary>
        /// å·²ä¸‹çº¿åŒ…æ•°
        /// </summary>
        [Required(ErrorMessage = "已下线包数不能为空")]
        public override int UnLinePackageNum { get; set; }
        
        /// <summary>
        /// æœªä¸‹çº¿åŒ…æ•°
        /// </summary>
        [Required(ErrorMessage = "未下线包数不能为空")]
        public override int NoUnLinePackageNum { get; set; }
        
        /// <summary>
        /// æ€»åŒ…装面积
        /// </summary>
        [Required(ErrorMessage = "总包装面积不能为空")]
        public override decimal AllPackageArea { get; set; }
        
        /// <summary>
        /// å·²æ‰«æåŒ…装面积
        /// </summary>
        [Required(ErrorMessage = "已扫描包装面积不能为空")]
        public override decimal ScanPackageArea { get; set; }
        
        /// <summary>
        /// æœªæ‰«æåŒ…装面积
        /// </summary>
        [Required(ErrorMessage = "未扫描包装面积不能为空")]
        public override decimal NoScanPackageArea { get; set; }
        
        /// <summary>
        /// è½¯åˆ é™¤
        /// </summary>
        [Required(ErrorMessage = "软删除不能为空")]

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherOutput.cs

@@ -36,6 +36,31 @@
    public int PackageNum { get; set; }
    
    /// <summary>
    /// å·²ä¸‹çº¿åŒ…æ•°
    /// </summary>
    public int UnLinePackageNum { get; set; }
    
    /// <summary>
    /// æœªä¸‹çº¿åŒ…æ•°
    /// </summary>
    public int NoUnLinePackageNum { get; set; }
    
    /// <summary>
    /// æ€»åŒ…装面积
    /// </summary>
    public decimal AllPackageArea { get; set; }
    
    /// <summary>
    /// å·²æ‰«æåŒ…装面积
    /// </summary>
    public decimal ScanPackageArea { get; set; }
    
    /// <summary>
    /// æœªæ‰«æåŒ…装面积
    /// </summary>
    public decimal NoScanPackageArea { get; set; }
    
    /// <summary>
    /// åˆ›å»ºæ—¶é—´
    /// </summary>
    public DateTime? CreateTime { get; set; }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs

@@ -137,7 +137,19 @@
            .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))
            .WhereIF(input.IsKitting.HasValue, u => u.IsKitting == input.IsKitting)
            .WhereIF(input.PackageNum>0, u => u.PackageNum == input.PackageNum)
            .WhereIF(input.UnLinePackageNum>0, u => u.UnLinePackageNum == input.UnLinePackageNum)
            .WhereIF(input.NoUnLinePackageNum>0, u => u.NoUnLinePackageNum == input.NoUnLinePackageNum)
            .Select<Mes_Order_GatherOutput>();
        if(input.CreateTimeRange != null && input.CreateTimeRange.Count >0)
        {
            DateTime? start= input.CreateTimeRange[0].Value;
            query = query.WhereIF(start.HasValue, u => u.CreateTime >= start);
            if (input.CreateTimeRange.Count >1 && input.CreateTimeRange[1].HasValue)
            {
                var end = input.CreateTimeRange[1].Value;
                query = query.Where(u => u.CreateTime <= end);
            }
        } 
        return query;
       }


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs

@@ -172,12 +172,14 @@
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "KittingList")]
    [Description("WmsStockQuan/KittingList")]
    public async Task<List<Mes_Order_Gather>> KittingList([FromQuery] KittingListInput input)
    [ApiDescriptionSettings(Name = "QueryNoKittingList")]
    [Description("WmsOperationTask/QueryNoKittingList")]
    public async Task<List<Mes_Order_Gather>> QueryNoKittingList([FromQuery] KittingListInput input)
    {
        var list = await _mesOrderGatherRep.AsQueryable()
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
            .Where(x=>((DateTime)x.CreateTime).ToString("yyyyMMdd")==DateTime.Now.ToString("yyyyMMdd"))
            .Where(x => x.IsKitting == false)
            .OrderBy(g => g.Id)
            .ToListAsync(); // ç¡®ä¿èŽ·å–结果为 List