Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

liuying

2024-12-01 8bfe5dcf83cdcaa90c45ad86a8b464238748de7c

Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

 CC/iWareCC_ASRS/ThreadService/04_BZ21£¨°áÔËÕû¶â»úÆ÷ÈË£©/DataProcess_BZ21.cs

@@ -132,7 +132,9 @@
                                    mesgather.AreaCode = (int)AreaCodeEnum.合包裁切区;
                                    mesgather.UpiStatus = (int)UpiStatusEnum.已合包;
                                }

                                var upilist=wmsDB.mes_batchOrderUPI_new.Where(x=>x.PackageCode==upiObj.PackageCode).ToList();
                                var upilength = upilist.Max(x => x.Length);
                                var upiwidth= upilist.Max(x => x.Width);
                                cartonhigh = (short)upiObj.Info3;
                                cartonwidth = (short)upiObj.Info2;
                                upiObj.UpiStatus = (int)UpiStatusEnum.已合包;
@@ -194,7 +196,14 @@
                                print.IsAllowPrint= true;
                                print.CreateTime = print.UpdateTime = DateTime.Now;
                                wmsDB.wms_record_print.Add(print);
                                wms_record_print printtwo = print;
                                var printtwo = ClassHelper.RotationMapping<wms_record_print, mes_batchOrderUPI_new>(upiObj);
                                printtwo.PrintType = (int)PrintTypeEnum.包装条码;
                                printtwo.PrintSource = (int)PrintSourceEnum.包装条码打印;
                                printtwo.PrintSheetNum = 1;
                                printtwo.PrintNum = 0;
                                printtwo.PrintStatus = (int)PrintStatuEnum.未打印;
                                printtwo.IsAllowPrint = true;
                                printtwo.CreateTime = print.UpdateTime = DateTime.Now;
                                printtwo.Id= Yitter.IdGenerator.YitIdHelper.NextId();
                                wmsDB.wms_record_print.Add(printtwo);

@@ -216,7 +225,7 @@
                                {

                                    var plcres = client.WriteSurroundTaskInfo((int)EDevice.Station, rgvLocation, short.Parse(task.TaskNo),
                                          (short)upiObj.Length, (short)upiObj.Width, cartonhigh, cartonwidth, 0, 0);
                                          (short)upilength, (short)upiwidth, cartonhigh, cartonwidth, 0, 0);
                                    if (!plcres.result)
                                    {
                                        SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-下发入库任务 å¤±è´¥,WriteInStoreTaskInfoAsync è¿”回:{plcres.resMsg}";

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

@@ -68,6 +68,13 @@
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="材料" prop="info18">
                            <el-input v-model="ruleForm.info18" placeholder="请输入材料" maxlength="50" 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="length">
                            <el-input v-model="ruleForm.length" placeholder="请输入长" maxlength="53" show-word-limit clearable />
                            
@@ -217,13 +224,6 @@
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="包装面积" prop="info13">
                            <el-input v-model="ruleForm.info13" placeholder="请输入包装面积" maxlength="60" 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="info14">
                            <el-input v-model="ruleForm.info14" placeholder="请输入部件名称" maxlength="60" show-word-limit clearable />
                            
                        </el-form-item>
                        

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

@@ -58,6 +58,12 @@
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="材料">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info18" clearable="" placeholder="请输入材料"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="长">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.length" clearable="" placeholder="请输入长"/>
              
@@ -189,12 +195,7 @@
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="部件名称">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info14" clearable="" placeholder="请输入部件名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="部件数量">
              <el-input-number v-model="queryParamsMes_BatchOrderUPI_New.info15"  clearable="" placeholder="请输入部件数量"/>
@@ -265,6 +266,7 @@
            </template>
          </el-table-column>
        <el-table-column prop="detailName" label="部件名称"  show-overflow-tooltip="" />
        <el-table-column prop="info18" label="材料"  show-overflow-tooltip="" />
        <el-table-column prop="length" label="长"  show-overflow-tooltip="" />
        <el-table-column prop="width" label="宽"  show-overflow-tooltip="" />
        <el-table-column prop="thk" label="厚"  show-overflow-tooltip="" />
@@ -287,7 +289,7 @@
        <el-table-column prop="info11" label="自提or发货"  show-overflow-tooltip="" />
        <el-table-column prop="info12" label="包装部件总数量"  show-overflow-tooltip="" />
        <el-table-column prop="info13" label="包装面积"  show-overflow-tooltip="" />
        <el-table-column prop="info14" label="部件名称"  show-overflow-tooltip="" />
       
        <el-table-column prop="info15" label="部件数量"  show-overflow-tooltip="" />
        <el-table-column prop="info16" label="部件尺寸"  show-overflow-tooltip="" />
        <el-table-column prop="info17" label="机械臂是否旋转"  show-overflow-tooltip="" />

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

@@ -205,11 +205,11 @@
        [SugarColumn(ColumnName = "Info13", ColumnDescription = "包装面积", Length = 60)]
        public string? Info13 { get; set; }

        /// <summary>
        /// éƒ¨ä»¶åç§°
        /// </summary>
        [SugarColumn(ColumnName = "Info14", ColumnDescription = "部件名称", Length = 60)]
        public string? Info14 { get; set; }
        ///// <summary>
        ///// éƒ¨ä»¶åç§°
        ///// </summary>
        //[SugarColumn(ColumnName = "Info14", ColumnDescription = "部件名称", Length = 60)]
        //public string? Info14 { get; set; }

        /// <summary>
        /// éƒ¨ä»¶æ•°é‡
@@ -227,5 +227,11 @@
        /// </summary>
        [SugarColumn(ColumnName = "Info17", ColumnDescription = "机械臂是否旋转", Length = 60)]
        public string? Info17 { get; set; }

        /// <summary>
        /// ææ–™
        /// </summary>
        [SugarColumn(ColumnName = "Info18", ColumnDescription = "材料", Length = 60)]
        public string? Info18 { get; set; }
    }
}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordPrint.cs

@@ -92,11 +92,11 @@
        [SugarColumn(ColumnName = "Info13", ColumnDescription = "包装面积", Length = 60)]
        public string? Info13 { get; set; }

        /// <summary>
        /// éƒ¨ä»¶åç§°
        /// </summary>
        [SugarColumn(ColumnName = "Info14", ColumnDescription = "部件名称", Length = 60)]
        public string? Info14 { get; set; }
        ///// <summary>
        ///// éƒ¨ä»¶åç§°
        ///// </summary>
        //[SugarColumn(ColumnName = "Info14", ColumnDescription = "部件名称", Length = 60)]
        //public string? Info14 { get; set; }

        /// <summary>
        /// éƒ¨ä»¶æ•°é‡

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/Dto/WmsRecordPrintInput.cs

@@ -73,10 +73,10 @@
        /// </summary>
        public virtual string Info13 { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶åç§°
        /// </summary>
        public virtual string Info14 { get; set; }
        ///// <summary>
        ///// éƒ¨ä»¶åç§°
        ///// </summary>
        //public virtual string Info14 { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶æ•°é‡
@@ -225,10 +225,10 @@
        /// </summary>
        public string? Info13 { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶åç§°
        /// </summary>
        public string? Info14 { get; set; }
        ///// <summary>
        ///// éƒ¨ä»¶åç§°
        ///// </summary>
        //public string? Info14 { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶æ•°é‡

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/Dto/WmsRecordPrintOutput.cs

@@ -75,10 +75,10 @@
    /// </summary>
    public string Info13 { get; set; }
    
    /// <summary>
    /// éƒ¨ä»¶åç§°
    /// </summary>
    public string Info14 { get; set; }
    ///// <summary>
    ///// éƒ¨ä»¶åç§°
    ///// </summary>
    //public string Info14 { get; set; }
    
    /// <summary>
    /// éƒ¨ä»¶æ•°é‡

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs

@@ -136,7 +136,7 @@
                || u.Info11.Contains(input.SearchKey.Trim())
                || u.Info12.Contains(input.SearchKey.Trim())
                || u.Info13.Contains(input.SearchKey.Trim())
                || u.Info14.Contains(input.SearchKey.Trim())
                //|| u.Info14.Contains(input.SearchKey.Trim())
                || u.Info16.Contains(input.SearchKey.Trim())
                || u.Remarks.Contains(input.SearchKey.Trim())
                || u.CreateUserName.Contains(input.SearchKey.Trim())
@@ -154,7 +154,7 @@
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info11), u => u.Info11.Contains(input.Info11.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info12), u => u.Info12.Contains(input.Info12.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info13), u => u.Info13.Contains(input.Info13.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info14), u => u.Info14.Contains(input.Info14.Trim()))
            //.WhereIF(!string.IsNullOrWhiteSpace(input.Info14), u => u.Info14.Contains(input.Info14.Trim()))
            .WhereIF(input.Info15>0, u => u.Info15 == input.Info15)
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info16), u => u.Info16.Contains(input.Info16.Trim()))
            .WhereIF(input.PrintSheetNum>0, u => u.PrintSheetNum == input.PrintSheetNum)

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/GetBatchOrderUPIInput.cs

@@ -23,6 +23,12 @@
    [SugarColumn(ColumnName = "DetailName", ColumnDescription = "部件名称", Length = 50)]
    public string DetailName { get; set; }

    /// <summary>
    /// ææ–™
    /// </summary>
    [SugarColumn(ColumnName = "Info18", ColumnDescription = "材料", Length = 60)]
    public string? Info18 { get; set; }


    [SugarColumn(ColumnName = "Length", ColumnDescription = "长")]
    public float Length { get; set; }
@@ -168,11 +174,11 @@
    [SugarColumn(ColumnName = "Info13", ColumnDescription = "包装面积", Length = 60)]
    public string? Info13 { get; set; }

    /// <summary>
    /// éƒ¨ä»¶åç§°
    /// </summary>
    [SugarColumn(ColumnName = "Info14", ColumnDescription = "部件名称", Length = 60)]
    public string? Info14 { get; set; }
    ///// <summary>
    ///// éƒ¨ä»¶åç§°
    ///// </summary>
    //[SugarColumn(ColumnName = "Info14", ColumnDescription = "部件名称", Length = 60)]
    //public string? Info14 { get; set; }

    /// <summary>
    /// éƒ¨ä»¶æ•°é‡

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs

@@ -44,6 +44,12 @@
        public virtual string DetailName { get; set; }
        
        /// <summary>
    /// ææ–™
    /// </summary>
    [SugarColumn(ColumnName = "Info18", ColumnDescription = "材料", Length = 60)]
    public virtual string? Info18 { get; set; }

    /// <summary>
        /// é•¿
        /// </summary>
        public virtual float Length { get; set; }
@@ -153,10 +159,10 @@
        /// </summary>
        public virtual string Info13 { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶åç§°
        /// </summary>
        public virtual string Info14 { get; set; }
    ///// <summary>
    ///// éƒ¨ä»¶åç§°
    ///// </summary>
    //public virtual string Info14 { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶æ•°é‡
@@ -370,10 +376,10 @@
        /// </summary>
        public string? Info13 { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶åç§°
        /// </summary>
        public string? Info14 { get; set; }
    ///// <summary>
    ///// éƒ¨ä»¶åç§°
    ///// </summary>
    //public string? Info14 { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶æ•°é‡
@@ -433,6 +439,12 @@
        public override string DetailName { get; set; }
        
        /// <summary>
    /// ææ–™
    /// </summary>
    [SugarColumn(ColumnName = "Info18", ColumnDescription = "材料", Length = 60)]
    public override string? Info18 { get; set; }

    /// <summary>
        /// é•¿
        /// </summary>
        [Required(ErrorMessage = "长不能为空")]

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs

@@ -46,6 +46,12 @@
    public string DetailName { get; set; }
    
    /// <summary>
    /// ææ–™
    /// </summary>
    [SugarColumn(ColumnName = "Info18", ColumnDescription = "材料", Length = 60)]
    public string? Info18 { get; set; }

    /// <summary>
    /// é•¿
    /// </summary>
    public float Length { get; set; }
@@ -155,10 +161,10 @@
    /// </summary>
    public string Info13 { get; set; }
    
    /// <summary>
    /// éƒ¨ä»¶åç§°
    /// </summary>
    public string Info14 { get; set; }
    ///// <summary>
    ///// éƒ¨ä»¶åç§°
    ///// </summary>
    //public string Info14 { get; set; }
    
    /// <summary>
    /// éƒ¨ä»¶æ•°é‡

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs

@@ -180,7 +180,7 @@
                           var _Info11 = "";//自提or发货
                           var _Info12 = "";//包装部件总数量
                           var _Info13 = "";//包装面积
                           var _Info14 = "";//部件名称
                             //var _Info14 = "";//部件名称
                           var _Info15 = "";//部件数量
                           var _Info16 = "";//部件尺寸
                           var _Info17 = "";//机械臂是否旋转
@@ -218,7 +218,7 @@
                           _Info11 = row["自提or发货"]?.ToString() ;
                           _Info12 = row["包装部件总数量"]?.ToString() ;
                           _Info13 = row["包装面积"]?.ToString() ;
                           _Info14 = row["部件名称"]?.ToString() ;
            //_Info14 = row["部件名称"]?.ToString() ;
                           _Info15 = row["部件数量"]?.ToString() ;
                           _Info16 = row["部件尺寸"]?.ToString() ;
                           _Info17 = row["机械臂是否旋转"]?.ToString() ;
@@ -408,10 +408,10 @@
                          {
                                addItem.Info13 = (string)(_Info13.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info14))
                          {
                                addItem.Info14 = (string)(_Info14.Trim());
                           }
            //if(!string.IsNullOrEmpty(_Info14))
            //{
            //      addItem.Info14 = (string)(_Info14.Trim());
            // }
                          if(!string.IsNullOrEmpty(_Info15))
                          {
                              if (!int.TryParse(_Info15, out int outInfo15)&&!string.IsNullOrEmpty(_Info15))
@@ -502,7 +502,7 @@
                || u.Info11.Contains(input.SearchKey.Trim())
                || u.Info12.Contains(input.SearchKey.Trim())
                || u.Info13.Contains(input.SearchKey.Trim())
                || u.Info14.Contains(input.SearchKey.Trim())
                //|| u.Info14.Contains(input.SearchKey.Trim())
                || u.Info16.Contains(input.SearchKey.Trim())
                || u.Info17.Contains(input.SearchKey.Trim())
                || u.CreateUserName.Contains(input.SearchKey.Trim())
@@ -528,7 +528,7 @@
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info11), u => u.Info11.Contains(input.Info11.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info12), u => u.Info12.Contains(input.Info12.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info13), u => u.Info13.Contains(input.Info13.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info14), u => u.Info14.Contains(input.Info14.Trim()))
            //.WhereIF(!string.IsNullOrWhiteSpace(input.Info14), u => u.Info14.Contains(input.Info14.Trim()))
            .WhereIF(input.Info15>0, u => u.Info15 == input.Info15)
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info16), u => u.Info16.Contains(input.Info16.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info17), u => u.Info17.Contains(input.Info17.Trim()))

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs

@@ -275,10 +275,10 @@
    /// </summary>
    public string? Info13 { get; set; }

    /// <summary>
    /// éƒ¨ä»¶åç§°
    /// </summary>
    public string? Info14 { get; set; }
    ///// <summary>
    ///// éƒ¨ä»¶åç§°
    ///// </summary>
    //public string? Info14 { get; set; }
    /// <summary>
    /// éƒ¨ä»¶æ•°é‡
    /// </summary>

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs

@@ -456,7 +456,7 @@
                    Info11 = item.Info11,
                    Info12= item.Info12,
                    Info13 = item.Info13,
                    Info14 = item.Info14,
                    //Info14 = item.Info14,
                    Info15 = item.Info15,
                    Info16 = item.Info16,
                    Length = item.Length,