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,8 +154,8 @@
            .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(input.Info15>0, u => u.Info15 == input.Info15)
            //.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)
            .WhereIF(input.PrintNum>0, u => u.PrintNum == input.PrintNum)

 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

@@ -3,491 +3,503 @@

namespace Admin.NET.Application;

/// <summary>
/// æ‰¹æ¬¡æ•°æ®åŸºç¡€è¾“入参数
/// </summary>
public class Mes_BatchOrderUPI_NewBaseInput
{
    /// <summary>
    /// æ‰¹æ¬¡æ•°æ®åŸºç¡€è¾“入参数
    /// éƒ¨ä»¶æ¡ç 
    /// </summary>
    public class Mes_BatchOrderUPI_NewBaseInput
    {
        /// <summary>
        /// éƒ¨ä»¶æ¡ç 
        /// </summary>
        public virtual string UPI { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        public virtual string PlanNo { get; set; }
        
        /// <summary>
        /// è®¢å•å·
        /// </summary>
        public virtual string OrderId { get; set; }
        
        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        public virtual string Info5 { get; set; }
        
        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// </summary>
        public virtual Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
        
        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        public virtual Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶åç§°
        /// </summary>
        public virtual string DetailName { get; set; }
        
        /// <summary>
        /// é•¿
        /// </summary>
        public virtual float Length { get; set; }
        
        /// <summary>
        /// å®½
        /// </summary>
        public virtual float Width { get; set; }
        
        /// <summary>
        /// åŽš
        /// </summary>
        public virtual float Thk { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ä¼˜åŒ–包装
        /// </summary>
        public virtual int? IsPA { get; set; }
        
        /// <summary>
        /// åŒ…装号
        /// </summary>
        public virtual string PackageCode { get; set; }
        
        /// <summary>
        /// åŒ…装X坐标
        /// </summary>
        public virtual float? MachineXCenter { get; set; }
        
        /// <summary>
        /// åŒ…装Y坐标
        /// </summary>
        public virtual float? MachineYCenter { get; set; }
        
        /// <summary>
        /// åŒ…装Z坐标
        /// </summary>
        public virtual float? MachineZCenter { get; set; }
        
        /// <summary>
        /// å±‚æ•°
        /// </summary>
        public virtual int? Sequence { get; set; }
        
        /// <summary>
        /// æ¬¡åº
        /// </summary>
        public virtual int? Shelf { get; set; }
        
        /// <summary>
        /// çº¸ç®±é•¿
        /// </summary>
        public virtual float? Info1 { get; set; }
        
        /// <summary>
        /// çº¸ç®±å®½
        /// </summary>
        public virtual float? Info2 { get; set; }
        
        /// <summary>
        /// çº¸ç®±é«˜
        /// </summary>
        public virtual float? Info3 { get; set; }
        
        /// <summary>
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        public virtual string Info4 { get; set; }
        
        /// <summary>
        /// ç¬¬å‡ åŒ…
        /// </summary>
        public virtual string Info6 { get; set; }
        
        /// <summary>
        /// ç»é”€åº—名称
        /// </summary>
        public virtual string Info7 { get; set; }
        
        /// <summary>
        /// äº§å“åç§°
        /// </summary>
        public virtual string Info8 { get; set; }
        
        /// <summary>
        /// å®¢æˆ·åç§°
        /// </summary>
        public virtual string Info10 { get; set; }
        
        /// <summary>
        /// åŒ…装编码
        /// </summary>
        public virtual string Info9 { get; set; }
        
        /// <summary>
        /// è‡ªæor发货
        /// </summary>
        public virtual string Info11 { get; set; }
        
        /// <summary>
        /// åŒ…装部件总数量
        /// </summary>
        public virtual string Info12 { get; set; }
        
        /// <summary>
        /// åŒ…装面积
        /// </summary>
        public virtual string Info13 { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶åç§°
        /// </summary>
        public virtual string Info14 { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶æ•°é‡
        /// </summary>
        public virtual int? Info15 { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶å°ºå¯¸
        /// </summary>
        public virtual string Info16 { get; set; }
        
        /// <summary>
        /// æœºæ¢°è‡‚是否旋转
        /// </summary>
        public virtual string Info17 { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        public virtual DateTime? CreateTime { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹æ—¶é—´
        /// </summary>
        public virtual DateTime? UpdateTime { get; set; }
        
        /// <summary>
        /// åˆ›å»ºäººId
        /// </summary>
        public virtual long? CreateUserId { get; set; }
        
        /// <summary>
        /// åˆ›å»ºäºº
        /// </summary>
        public virtual string CreateUserName { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹äººId
        /// </summary>
        public virtual long? UpdateUserId { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹äºº
        /// </summary>
        public virtual string UpdateUserName { get; set; }
        
        /// <summary>
        /// è½¯åˆ é™¤
        /// </summary>
        public virtual bool IsDelete { get; set; }
        
        /// <summary>
        /// æ ‡è®°
        /// </summary>
        public virtual Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
        
    }
    public virtual string UPI { get; set; }

    /// <summary>
    /// æ‰¹æ¬¡æ•°æ®åˆ†é¡µæŸ¥è¯¢è¾“入参数
    /// æ‰¹æ¬¡å·
    /// </summary>
    public class Mes_BatchOrderUPI_NewInput : BasePageInput
    {
        /// <summary>
        /// å…³é”®å­—查询
        /// </summary>
        public string? SearchKey { get; set; }

        /// <summary>
        /// éƒ¨ä»¶æ¡ç 
        /// </summary>
        public string? UPI { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        public string? PlanNo { get; set; }
        
        /// <summary>
        /// è®¢å•å·
        /// </summary>
        public string? OrderId { get; set; }
        
        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        public string? Info5 { get; set; }
        
        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// </summary>
        public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
        
        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        public Admin.NET.Application.UpiStatusEnum? UpiStatus { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶åç§°
        /// </summary>
        public string? DetailName { get; set; }
        
        /// <summary>
        /// é•¿
        /// </summary>
        public float? Length { get; set; }
        
        /// <summary>
        /// å®½
        /// </summary>
        public float? Width { get; set; }
        
        /// <summary>
        /// åŽš
        /// </summary>
        public float? Thk { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ä¼˜åŒ–包装
        /// </summary>
        public int? IsPA { get; set; }
        
        /// <summary>
        /// åŒ…装号
        /// </summary>
        public string? PackageCode { get; set; }
        
        /// <summary>
        /// åŒ…装X坐标
        /// </summary>
        public float? MachineXCenter { get; set; }
        
        /// <summary>
        /// åŒ…装Y坐标
        /// </summary>
        public float? MachineYCenter { get; set; }
        
        /// <summary>
        /// åŒ…装Z坐标
        /// </summary>
        public float? MachineZCenter { get; set; }
        
        /// <summary>
        /// å±‚æ•°
        /// </summary>
        public int? Sequence { get; set; }
        
        /// <summary>
        /// æ¬¡åº
        /// </summary>
        public int? Shelf { get; set; }
        
        /// <summary>
        /// çº¸ç®±é•¿
        /// </summary>
        public float? Info1 { get; set; }
        
        /// <summary>
        /// çº¸ç®±å®½
        /// </summary>
        public float? Info2 { get; set; }
        
        /// <summary>
        /// çº¸ç®±é«˜
        /// </summary>
        public float? Info3 { get; set; }
        
        /// <summary>
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        public string? Info4 { get; set; }
        
        /// <summary>
        /// ç¬¬å‡ åŒ…
        /// </summary>
        public string? Info6 { get; set; }
        
        /// <summary>
        /// ç»é”€åº—名称
        /// </summary>
        public string? Info7 { get; set; }
        
        /// <summary>
        /// äº§å“åç§°
        /// </summary>
        public string? Info8 { get; set; }
        
        /// <summary>
        /// å®¢æˆ·åç§°
        /// </summary>
        public string? Info10 { get; set; }
        
        /// <summary>
        /// åŒ…装编码
        /// </summary>
        public string? Info9 { get; set; }
        
        /// <summary>
        /// è‡ªæor发货
        /// </summary>
        public string? Info11 { get; set; }
        
        /// <summary>
        /// åŒ…装部件总数量
        /// </summary>
        public string? Info12 { get; set; }
        
        /// <summary>
        /// åŒ…装面积
        /// </summary>
        public string? Info13 { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶åç§°
        /// </summary>
        public string? Info14 { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶æ•°é‡
        /// </summary>
        public int? Info15 { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶å°ºå¯¸
        /// </summary>
        public string? Info16 { get; set; }
        
        /// <summary>
        /// æœºæ¢°è‡‚是否旋转
        /// </summary>
        public string? Info17 { get; set; }
        
        /// <summary>
        /// æ ‡è®°
        /// </summary>
        public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
        
    }
    public virtual string PlanNo { get; set; }

    /// <summary>
    /// æ‰¹æ¬¡æ•°æ®å¢žåŠ è¾“入参数
    /// è®¢å•å·
    /// </summary>
    public class AddMes_BatchOrderUPI_NewInput : Mes_BatchOrderUPI_NewBaseInput
    {
        /// <summary>
        /// éƒ¨ä»¶æ¡ç 
        /// </summary>
        [Required(ErrorMessage = "部件条码不能为空")]
        public override string UPI { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        [Required(ErrorMessage = "批次号不能为空")]
        public override string PlanNo { get; set; }
        
        /// <summary>
        /// è®¢å•å·
        /// </summary>
        [Required(ErrorMessage = "订单号不能为空")]
        public override string OrderId { get; set; }
        
        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        [Required(ErrorMessage = "板料状态不能为空")]
        public override Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶åç§°
        /// </summary>
        [Required(ErrorMessage = "部件名称不能为空")]
        public override string DetailName { get; set; }
        
        /// <summary>
        /// é•¿
        /// </summary>
        [Required(ErrorMessage = "长不能为空")]
        public override float Length { get; set; }
        
        /// <summary>
        /// å®½
        /// </summary>
        [Required(ErrorMessage = "宽不能为空")]
        public override float Width { get; set; }
        
        /// <summary>
        /// åŽš
        /// </summary>
        [Required(ErrorMessage = "厚不能为空")]
        public override float Thk { get; set; }
        
        /// <summary>
        /// åŒ…装号
        /// </summary>
        [Required(ErrorMessage = "包装号不能为空")]
        public override string PackageCode { get; set; }
        
        /// <summary>
        /// è½¯åˆ é™¤
        /// </summary>
        [Required(ErrorMessage = "软删除不能为空")]
        public override bool IsDelete { get; set; }
        
    }
    public virtual string OrderId { get; set; }

    /// <summary>
    /// æ‰¹æ¬¡æ•°æ®åˆ é™¤è¾“入参数
    /// ç”Ÿäº§å•å·
    /// </summary>
    public class DeleteMes_BatchOrderUPI_NewInput : BaseIdInput
    {
    }
    public virtual string Info5 { get; set; }

    /// <summary>
    /// æ‰¹æ¬¡æ•°æ®æ›´æ–°è¾“入参数
    /// æ‰€åœ¨åŒºåŸŸ
    /// </summary>
    public class UpdateMes_BatchOrderUPI_NewInput : AddMes_BatchOrderUPI_NewInput
    {
        /// <summary>
        /// ä¸»é”®Id
        /// </summary>
        [Required(ErrorMessage = "主键Id不能为空")]
        public long Id { get; set; }
        
    }
    public virtual Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }

    /// <summary>
    /// æ‰¹æ¬¡æ•°æ®ä¸»é”®æŸ¥è¯¢è¾“入参数
    /// æ¿æ–™çŠ¶æ€
    /// </summary>
    public class QueryByIdMes_BatchOrderUPI_NewInput : DeleteMes_BatchOrderUPI_NewInput
    {
    public virtual Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }

    }
    /// <summary>
    /// éƒ¨ä»¶åç§°
    /// </summary>
    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; }

    /// <summary>
    /// å®½
    /// </summary>
    public virtual float Width { get; set; }

    /// <summary>
    /// åŽš
    /// </summary>
    public virtual float Thk { get; set; }

    /// <summary>
    /// æ˜¯å¦ä¼˜åŒ–包装
    /// </summary>
    public virtual int? IsPA { get; set; }

    /// <summary>
    /// åŒ…装号
    /// </summary>
    public virtual string PackageCode { get; set; }

    /// <summary>
    /// åŒ…装X坐标
    /// </summary>
    public virtual float? MachineXCenter { get; set; }

    /// <summary>
    /// åŒ…装Y坐标
    /// </summary>
    public virtual float? MachineYCenter { get; set; }

    /// <summary>
    /// åŒ…装Z坐标
    /// </summary>
    public virtual float? MachineZCenter { get; set; }

    /// <summary>
    /// å±‚æ•°
    /// </summary>
    public virtual int? Sequence { get; set; }

    /// <summary>
    /// æ¬¡åº
    /// </summary>
    public virtual int? Shelf { get; set; }

    /// <summary>
    /// çº¸ç®±é•¿
    /// </summary>
    public virtual float? Info1 { get; set; }

    /// <summary>
    /// çº¸ç®±å®½
    /// </summary>
    public virtual float? Info2 { get; set; }

    /// <summary>
    /// çº¸ç®±é«˜
    /// </summary>
    public virtual float? Info3 { get; set; }

    /// <summary>
    /// é”€å”®åˆåŒå•å·
    /// </summary>
    public virtual string Info4 { get; set; }

    /// <summary>
    /// ç¬¬å‡ åŒ…
    /// </summary>
    public virtual string Info6 { get; set; }

    /// <summary>
    /// ç»é”€åº—名称
    /// </summary>
    public virtual string Info7 { get; set; }

    /// <summary>
    /// äº§å“åç§°
    /// </summary>
    public virtual string Info8 { get; set; }

    /// <summary>
    /// å®¢æˆ·åç§°
    /// </summary>
    public virtual string Info10 { get; set; }

    /// <summary>
    /// åŒ…装编码
    /// </summary>
    public virtual string Info9 { get; set; }

    /// <summary>
    /// è‡ªæor发货
    /// </summary>
    public virtual string Info11 { get; set; }

    /// <summary>
    /// åŒ…装部件总数量
    /// </summary>
    public virtual string Info12 { get; set; }

    /// <summary>
    /// åŒ…装面积
    /// </summary>
    public virtual string Info13 { get; set; }

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

    /// <summary>
    /// éƒ¨ä»¶æ•°é‡
    /// </summary>
    public virtual int? Info15 { get; set; }

    /// <summary>
    /// éƒ¨ä»¶å°ºå¯¸
    /// </summary>
    public virtual string Info16 { get; set; }

    /// <summary>
    /// æœºæ¢°è‡‚是否旋转
    /// </summary>
    public virtual string Info17 { get; set; }

    /// <summary>
    /// åˆ›å»ºæ—¶é—´
    /// </summary>
    public virtual DateTime? CreateTime { get; set; }

    /// <summary>
    /// ä¿®æ”¹æ—¶é—´
    /// </summary>
    public virtual DateTime? UpdateTime { get; set; }

    /// <summary>
    /// åˆ›å»ºäººId
    /// </summary>
    public virtual long? CreateUserId { get; set; }

    /// <summary>
    /// åˆ›å»ºäºº
    /// </summary>
    public virtual string CreateUserName { get; set; }

    /// <summary>
    /// ä¿®æ”¹äººId
    /// </summary>
    public virtual long? UpdateUserId { get; set; }

    /// <summary>
    /// ä¿®æ”¹äºº
    /// </summary>
    public virtual string UpdateUserName { get; set; }

    /// <summary>
    /// è½¯åˆ é™¤
    /// </summary>
    public virtual bool IsDelete { get; set; }

    /// <summary>
    /// æ ‡è®°
    /// </summary>
    public virtual Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }

}

/// <summary>
/// æ‰¹æ¬¡æ•°æ®åˆ†é¡µæŸ¥è¯¢è¾“入参数
/// </summary>
public class Mes_BatchOrderUPI_NewInput : BasePageInput
{
    /// <summary>
    /// å…³é”®å­—查询
    /// </summary>
    public string? SearchKey { get; set; }

    /// <summary>
    /// éƒ¨ä»¶æ¡ç 
    /// </summary>
    public string? UPI { get; set; }

    /// <summary>
    /// æ‰¹æ¬¡å·
    /// </summary>
    public string? PlanNo { get; set; }

    /// <summary>
    /// è®¢å•å·
    /// </summary>
    public string? OrderId { get; set; }

    /// <summary>
    /// ç”Ÿäº§å•å·
    /// </summary>
    public string? Info5 { get; set; }

    /// <summary>
    /// æ‰€åœ¨åŒºåŸŸ
    /// </summary>
    public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }

    /// <summary>
    /// æ¿æ–™çŠ¶æ€
    /// </summary>
    public Admin.NET.Application.UpiStatusEnum? UpiStatus { get; set; }

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

    /// <summary>
    /// é•¿
    /// </summary>
    public float? Length { get; set; }

    /// <summary>
    /// å®½
    /// </summary>
    public float? Width { get; set; }

    /// <summary>
    /// åŽš
    /// </summary>
    public float? Thk { get; set; }

    /// <summary>
    /// æ˜¯å¦ä¼˜åŒ–包装
    /// </summary>
    public int? IsPA { get; set; }

    /// <summary>
    /// åŒ…装号
    /// </summary>
    public string? PackageCode { get; set; }

    /// <summary>
    /// åŒ…装X坐标
    /// </summary>
    public float? MachineXCenter { get; set; }

    /// <summary>
    /// åŒ…装Y坐标
    /// </summary>
    public float? MachineYCenter { get; set; }

    /// <summary>
    /// åŒ…装Z坐标
    /// </summary>
    public float? MachineZCenter { get; set; }

    /// <summary>
    /// å±‚æ•°
    /// </summary>
    public int? Sequence { get; set; }

    /// <summary>
    /// æ¬¡åº
    /// </summary>
    public int? Shelf { get; set; }

    /// <summary>
    /// çº¸ç®±é•¿
    /// </summary>
    public float? Info1 { get; set; }

    /// <summary>
    /// çº¸ç®±å®½
    /// </summary>
    public float? Info2 { get; set; }

    /// <summary>
    /// çº¸ç®±é«˜
    /// </summary>
    public float? Info3 { get; set; }

    /// <summary>
    /// é”€å”®åˆåŒå•å·
    /// </summary>
    public string? Info4 { get; set; }

    /// <summary>
    /// ç¬¬å‡ åŒ…
    /// </summary>
    public string? Info6 { get; set; }

    /// <summary>
    /// ç»é”€åº—名称
    /// </summary>
    public string? Info7 { get; set; }

    /// <summary>
    /// äº§å“åç§°
    /// </summary>
    public string? Info8 { get; set; }

    /// <summary>
    /// å®¢æˆ·åç§°
    /// </summary>
    public string? Info10 { get; set; }

    /// <summary>
    /// åŒ…装编码
    /// </summary>
    public string? Info9 { get; set; }

    /// <summary>
    /// è‡ªæor发货
    /// </summary>
    public string? Info11 { get; set; }

    /// <summary>
    /// åŒ…装部件总数量
    /// </summary>
    public string? Info12 { get; set; }

    /// <summary>
    /// åŒ…装面积
    /// </summary>
    public string? Info13 { get; set; }

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

    /// <summary>
    /// éƒ¨ä»¶æ•°é‡
    /// </summary>
    public int? Info15 { get; set; }

    /// <summary>
    /// éƒ¨ä»¶å°ºå¯¸
    /// </summary>
    public string? Info16 { get; set; }

    /// <summary>
    /// æœºæ¢°è‡‚是否旋转
    /// </summary>
    public string? Info17 { get; set; }

    /// <summary>
    /// æ ‡è®°
    /// </summary>
    public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }

}

/// <summary>
/// æ‰¹æ¬¡æ•°æ®å¢žåŠ è¾“入参数
/// </summary>
public class AddMes_BatchOrderUPI_NewInput : Mes_BatchOrderUPI_NewBaseInput
{
    /// <summary>
    /// éƒ¨ä»¶æ¡ç 
    /// </summary>
    [Required(ErrorMessage = "部件条码不能为空")]
    public override string UPI { get; set; }

    /// <summary>
    /// æ‰¹æ¬¡å·
    /// </summary>
    [Required(ErrorMessage = "批次号不能为空")]
    public override string PlanNo { get; set; }

    /// <summary>
    /// è®¢å•å·
    /// </summary>
    [Required(ErrorMessage = "订单号不能为空")]
    public override string OrderId { get; set; }

    /// <summary>
    /// æ¿æ–™çŠ¶æ€
    /// </summary>
    [Required(ErrorMessage = "板料状态不能为空")]
    public override Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }

    /// <summary>
    /// éƒ¨ä»¶åç§°
    /// </summary>
    [Required(ErrorMessage = "部件名称不能为空")]
    public override string DetailName { get; set; }

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

    /// <summary>
    /// é•¿
    /// </summary>
    [Required(ErrorMessage = "长不能为空")]
    public override float Length { get; set; }

    /// <summary>
    /// å®½
    /// </summary>
    [Required(ErrorMessage = "宽不能为空")]
    public override float Width { get; set; }

    /// <summary>
    /// åŽš
    /// </summary>
    [Required(ErrorMessage = "厚不能为空")]
    public override float Thk { get; set; }

    /// <summary>
    /// åŒ…装号
    /// </summary>
    [Required(ErrorMessage = "包装号不能为空")]
    public override string PackageCode { get; set; }

    /// <summary>
    /// è½¯åˆ é™¤
    /// </summary>
    [Required(ErrorMessage = "软删除不能为空")]
    public override bool IsDelete { get; set; }

}

/// <summary>
/// æ‰¹æ¬¡æ•°æ®åˆ é™¤è¾“入参数
/// </summary>
public class DeleteMes_BatchOrderUPI_NewInput : BaseIdInput
{
}

/// <summary>
/// æ‰¹æ¬¡æ•°æ®æ›´æ–°è¾“入参数
/// </summary>
public class UpdateMes_BatchOrderUPI_NewInput : AddMes_BatchOrderUPI_NewInput
{
    /// <summary>
    /// ä¸»é”®Id
    /// </summary>
    [Required(ErrorMessage = "主键Id不能为空")]
    public long Id { get; set; }

}

/// <summary>
/// æ‰¹æ¬¡æ•°æ®ä¸»é”®æŸ¥è¯¢è¾“入参数
/// </summary>
public class QueryByIdMes_BatchOrderUPI_NewInput : DeleteMes_BatchOrderUPI_NewInput
{

}

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

@@ -44,7 +44,13 @@
    /// éƒ¨ä»¶åç§°
    /// </summary>
    public string DetailName { get; set; }
    

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

    /// <summary>
    /// é•¿
    /// </summary>
@@ -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

@@ -92,7 +92,7 @@
        var entity = input.Adapt<Mes_BatchOrderUPI_New>();

        //重复性验证
        await CheckExist(entity,true);
        await CheckExist(entity, true);

        await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
    }
@@ -115,7 +115,7 @@


    #region å¯¼å…¥
    

    /// <summary>
    /// Excel模板导入批次数据功能
    /// </summary>
@@ -125,15 +125,15 @@
    [ApiDescriptionSettings(Name = "ImportExcel")]
    [Description("Mes_BatchOrderUPI_New/ImportExcel")]
    public async Task<int> ImportExcelAsync(IFormFile file)
    { 
    {
        int _HeadStartLine = 2;//第1行是说明,第2行是列名
        int _DataStartLine = 3;//第3行开始是数据
        DataTable importDataTable = ExcelUtil.ImportExcelToDataTable(file, _HeadStartLine, _DataStartLine);
        var addList =await CommonImport(importDataTable, _DataStartLine);
        var addList = await CommonImport(importDataTable, _DataStartLine);
        await _rep.InsertRangeAsync(addList);
        return addList.Count;
    }
    

    /// <summary>
    ///  DataTable转换实体对象列表
    /// </summary>
@@ -148,310 +148,310 @@
        {
            index++;
            //导入模版定制化代码（替换模版使用）
                                      
                           var addItem = new Mes_BatchOrderUPI_New();
                          #region å®šä¹‰å˜é‡
                           var _UPI = "";//部件条码
                           var _PlanNo = "";//批次号
                           var _OrderId = "";//订单号
                           var _Info5 = "";//生产单号
                           var _AreaCode = "";//所在区域
                           var _UpiStatus = "";//板料状态
                           var _DetailName = "";//部件名称
                           var _Length = "";//长
                           var _Width = "";//宽
                           var _Thk = "";//厚
                           var _IsPA = "";//是否优化包装
                           var _PackageCode = "";//包装号
                           var _MachineXCenter = "";//包装X坐标
                           var _MachineYCenter = "";//包装Y坐标
                           var _MachineZCenter = "";//包装Z坐标
                           var _Sequence = "";//层数
                           var _Shelf = "";//次序
                           var _Info1 = "";//纸箱长
                           var _Info2 = "";//纸箱宽
                           var _Info3 = "";//纸箱高
                           var _Info4 = "";//销售合同单号
                           var _Info6 = "";//第几包
                           var _Info7 = "";//经销店名称
                           var _Info8 = "";//产品名称
                           var _Info10 = "";//客户名称
                           var _Info9 = "";//包装编码
                           var _Info11 = "";//自提or发货
                           var _Info12 = "";//包装部件总数量
                           var _Info13 = "";//包装面积
                           var _Info14 = "";//部件名称
                           var _Info15 = "";//部件数量
                           var _Info16 = "";//部件尺寸
                           var _Info17 = "";//机械臂是否旋转
                           var _UpiFlag = "";//标记
                          #endregion
                          
                          
                          #region å–值
                           _UPI = row["部件条码"]?.ToString() ;
                           _PlanNo = row["批次号"]?.ToString() ;
                           _OrderId = row["订单号"]?.ToString() ;
                           _Info5 = row["生产单号"]?.ToString() ;
                           _AreaCode = row["所在区域"]?.ToString() ;
                           _UpiStatus = row["板料状态"]?.ToString() ;
                           _DetailName = row["部件名称"]?.ToString() ;
                           _Length = row["长"]?.ToString() ;
                           _Width = row["宽"]?.ToString() ;
                           _Thk = row["厚"]?.ToString() ;
                           _IsPA = row["是否优化包装"]?.ToString() ;
                           _PackageCode = row["包装号"]?.ToString() ;
                           _MachineXCenter = row["包装X坐标"]?.ToString() ;
                           _MachineYCenter = row["包装Y坐标"]?.ToString() ;
                           _MachineZCenter = row["包装Z坐标"]?.ToString() ;
                           _Sequence = row["层数"]?.ToString() ;
                           _Shelf = row["次序"]?.ToString() ;
                           _Info1 = row["纸箱长"]?.ToString() ;
                           _Info2 = row["纸箱宽"]?.ToString() ;
                           _Info3 = row["纸箱高"]?.ToString() ;
                           _Info4 = row["销售合同单号"]?.ToString() ;
                           _Info6 = row["第几包"]?.ToString() ;
                           _Info7 = row["经销店名称"]?.ToString() ;
                           _Info8 = row["产品名称"]?.ToString() ;
                           _Info10 = row["客户名称"]?.ToString() ;
                           _Info9 = row["包装编码"]?.ToString() ;
                           _Info11 = row["自提or发货"]?.ToString() ;
                           _Info12 = row["包装部件总数量"]?.ToString() ;
                           _Info13 = row["包装面积"]?.ToString() ;
                           _Info14 = row["部件名称"]?.ToString() ;
                           _Info15 = row["部件数量"]?.ToString() ;
                           _Info16 = row["部件尺寸"]?.ToString() ;
                           _Info17 = row["机械臂是否旋转"]?.ToString() ;
                           _UpiFlag = row["标记"]?.ToString() ;
                          #endregion
                          
                          
                          #region éªŒè¯
                          
                          if (string.IsNullOrEmpty(_UPI))
                          {
                            throw Oops.Oh($"第{index}行[部件条码]{_UPI}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_UPI))
                          {
                                addItem.UPI = (string)(_UPI.Trim());
                           }
                          
                          if (string.IsNullOrEmpty(_PlanNo))
                          {
                            throw Oops.Oh($"第{index}行[批次号]{_PlanNo}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_PlanNo))
                          {
                                addItem.PlanNo = (string)(_PlanNo.Trim());
                           }
                          
                          if (string.IsNullOrEmpty(_OrderId))
                          {
                            throw Oops.Oh($"第{index}行[订单号]{_OrderId}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_OrderId))
                          {
                                addItem.OrderId = (string)(_OrderId.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info5))
                          {
                                addItem.Info5 = (string)(_Info5.Trim());
                           }
                          if(!string.IsNullOrEmpty(_AreaCode))
                          {
                          Admin.NET.Application.AreaCodeEnum  enumAreaCode = default(Admin.NET.Application.AreaCodeEnum);
                          
                             if(!Enum.TryParse<Admin.NET.Application.AreaCodeEnum>(_AreaCode, out enumAreaCode)&&!string.IsNullOrEmpty(_AreaCode))
                              {
                                throw Oops.Oh($"第{index}行[所在区域]{_AreaCode}值不正确！");
                              }
                              else
                              {
                                 addItem.AreaCode = enumAreaCode;
                              }
                          
                           }
                          
                          if (string.IsNullOrEmpty(_UpiStatus))
                          {
                            throw Oops.Oh($"第{index}行[板料状态]{_UpiStatus}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_UpiStatus))
                          {
                          Admin.NET.Application.UpiStatusEnum  enumUpiStatus = default(Admin.NET.Application.UpiStatusEnum);
                          
                             if(!Enum.TryParse<Admin.NET.Application.UpiStatusEnum>(_UpiStatus, out enumUpiStatus)&&!string.IsNullOrEmpty(_UpiStatus))
                              {
                                throw Oops.Oh($"第{index}行[板料状态]{_UpiStatus}值不正确！");
                              }
                              else
                              {
                                 addItem.UpiStatus = enumUpiStatus;
                              }
                          
                           }
                          
                          if (string.IsNullOrEmpty(_DetailName))
                          {
                            throw Oops.Oh($"第{index}行[部件名称]{_DetailName}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_DetailName))
                          {
                                addItem.DetailName = (string)(_DetailName.Trim());
                           }
                          
                          if (string.IsNullOrEmpty(_Length))
                          {
                            throw Oops.Oh($"第{index}行[长]{_Length}不能为空！");
                          }
                          
                      
                          if(!string.IsNullOrEmpty(_IsPA))
                          {
                              if (!int.TryParse(_IsPA, out int outIsPA)&&!string.IsNullOrEmpty(_IsPA))
                              {
                                 throw Oops.Oh($"第{index}行[是否优化包装]{_IsPA}值不正确！");
                              }
                              if (outIsPA <= 0&&!string.IsNullOrEmpty(_IsPA))
                              {
                                 throw Oops.Oh($"第{index}行[是否优化包装]{_IsPA}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.IsPA = outIsPA;
                              }
                          
                          }
                          
                          if (string.IsNullOrEmpty(_PackageCode))
                          {
                            throw Oops.Oh($"第{index}行[包装号]{_PackageCode}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_PackageCode))
                          {
                                addItem.PackageCode = (string)(_PackageCode.Trim());
                           }
                          
                          if(!string.IsNullOrEmpty(_Sequence))
                          {
                              if (!int.TryParse(_Sequence, out int outSequence)&&!string.IsNullOrEmpty(_Sequence))
                              {
                                 throw Oops.Oh($"第{index}行[层数]{_Sequence}值不正确！");
                              }
                              if (outSequence <= 0&&!string.IsNullOrEmpty(_Sequence))
                              {
                                 throw Oops.Oh($"第{index}行[层数]{_Sequence}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.Sequence = outSequence;
                              }
                          
                          }
                          if(!string.IsNullOrEmpty(_Shelf))
                          {
                              if (!int.TryParse(_Shelf, out int outShelf)&&!string.IsNullOrEmpty(_Shelf))
                              {
                                 throw Oops.Oh($"第{index}行[次序]{_Shelf}值不正确！");
                              }
                              if (outShelf <= 0&&!string.IsNullOrEmpty(_Shelf))
                              {
                                 throw Oops.Oh($"第{index}行[次序]{_Shelf}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.Shelf = outShelf;
                              }
                          
                          }
                       
                          if(!string.IsNullOrEmpty(_Info4))
                          {
                                addItem.Info4 = (string)(_Info4.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info6))
                          {
                                addItem.Info6 = (string)(_Info6.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info7))
                          {
                                addItem.Info7 = (string)(_Info7.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info8))
                          {
                                addItem.Info8 = (string)(_Info8.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info10))
                          {
                                addItem.Info10 = (string)(_Info10.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info9))
                          {
                                addItem.Info9 = (string)(_Info9.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info11))
                          {
                                addItem.Info11 = (string)(_Info11.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info12))
                          {
                                addItem.Info12 = (string)(_Info12.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info13))
                          {
                                addItem.Info13 = (string)(_Info13.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info14))
                          {
                                addItem.Info14 = (string)(_Info14.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info15))
                          {
                              if (!int.TryParse(_Info15, out int outInfo15)&&!string.IsNullOrEmpty(_Info15))
                              {
                                 throw Oops.Oh($"第{index}行[部件数量]{_Info15}值不正确！");
                              }
                              if (outInfo15 <= 0&&!string.IsNullOrEmpty(_Info15))
                              {
                                 throw Oops.Oh($"第{index}行[部件数量]{_Info15}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.Info15 = outInfo15;
                              }
                          
                          }
                          if(!string.IsNullOrEmpty(_Info16))
                          {
                                addItem.Info16 = (string)(_Info16.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info17))
                          {
                                addItem.Info17 = (string)(_Info17.Trim());
                           }
                          if(!string.IsNullOrEmpty(_UpiFlag))
                          {
                          Admin.NET.Application.UpiFlagEnum  enumUpiFlag = default(Admin.NET.Application.UpiFlagEnum);
                          
                             if(!Enum.TryParse<Admin.NET.Application.UpiFlagEnum>(_UpiFlag, out enumUpiFlag)&&!string.IsNullOrEmpty(_UpiFlag))
                              {
                                throw Oops.Oh($"第{index}行[标记]{_UpiFlag}值不正确！");
                              }
                              else
                              {
                                 addItem.UpiFlag = enumUpiFlag;
                              }
                          
                           }
                          #endregion
                          

            var addItem = new Mes_BatchOrderUPI_New();
            #region å®šä¹‰å˜é‡
            var _UPI = "";//部件条码
            var _PlanNo = "";//批次号
            var _OrderId = "";//订单号
            var _Info5 = "";//生产单号
            var _AreaCode = "";//所在区域
            var _UpiStatus = "";//板料状态
            var _DetailName = "";//部件名称
            var _Length = "";//长
            var _Width = "";//宽
            var _Thk = "";//厚
            var _IsPA = "";//是否优化包装
            var _PackageCode = "";//包装号
            var _MachineXCenter = "";//包装X坐标
            var _MachineYCenter = "";//包装Y坐标
            var _MachineZCenter = "";//包装Z坐标
            var _Sequence = "";//层数
            var _Shelf = "";//次序
            var _Info1 = "";//纸箱长
            var _Info2 = "";//纸箱宽
            var _Info3 = "";//纸箱高
            var _Info4 = "";//销售合同单号
            var _Info6 = "";//第几包
            var _Info7 = "";//经销店名称
            var _Info8 = "";//产品名称
            var _Info10 = "";//客户名称
            var _Info9 = "";//包装编码
            var _Info11 = "";//自提or发货
            var _Info12 = "";//包装部件总数量
            var _Info13 = "";//包装面积
                             //var _Info14 = "";//部件名称
            var _Info15 = "";//部件数量
            var _Info16 = "";//部件尺寸
            var _Info17 = "";//机械臂是否旋转
            var _UpiFlag = "";//标记
            #endregion


            #region å–值
            _UPI = row["部件条码"]?.ToString();
            _PlanNo = row["批次号"]?.ToString();
            _OrderId = row["订单号"]?.ToString();
            _Info5 = row["生产单号"]?.ToString();
            _AreaCode = row["所在区域"]?.ToString();
            _UpiStatus = row["板料状态"]?.ToString();
            _DetailName = row["部件名称"]?.ToString();
            _Length = row["长"]?.ToString();
            _Width = row["宽"]?.ToString();
            _Thk = row["厚"]?.ToString();
            _IsPA = row["是否优化包装"]?.ToString();
            _PackageCode = row["包装号"]?.ToString();
            _MachineXCenter = row["包装X坐标"]?.ToString();
            _MachineYCenter = row["包装Y坐标"]?.ToString();
            _MachineZCenter = row["包装Z坐标"]?.ToString();
            _Sequence = row["层数"]?.ToString();
            _Shelf = row["次序"]?.ToString();
            _Info1 = row["纸箱长"]?.ToString();
            _Info2 = row["纸箱宽"]?.ToString();
            _Info3 = row["纸箱高"]?.ToString();
            _Info4 = row["销售合同单号"]?.ToString();
            _Info6 = row["第几包"]?.ToString();
            _Info7 = row["经销店名称"]?.ToString();
            _Info8 = row["产品名称"]?.ToString();
            _Info10 = row["客户名称"]?.ToString();
            _Info9 = row["包装编码"]?.ToString();
            _Info11 = row["自提or发货"]?.ToString();
            _Info12 = row["包装部件总数量"]?.ToString();
            _Info13 = row["包装面积"]?.ToString();
            //_Info14 = row["部件名称"]?.ToString() ;
            _Info15 = row["部件数量"]?.ToString();
            _Info16 = row["部件尺寸"]?.ToString();
            _Info17 = row["机械臂是否旋转"]?.ToString();
            _UpiFlag = row["标记"]?.ToString();
            #endregion


            #region éªŒè¯

            if (string.IsNullOrEmpty(_UPI))
            {
                throw Oops.Oh($"第{index}行[部件条码]{_UPI}不能为空！");
            }

            if (!string.IsNullOrEmpty(_UPI))
            {
                addItem.UPI = (string)(_UPI.Trim());
            }

            if (string.IsNullOrEmpty(_PlanNo))
            {
                throw Oops.Oh($"第{index}行[批次号]{_PlanNo}不能为空！");
            }

            if (!string.IsNullOrEmpty(_PlanNo))
            {
                addItem.PlanNo = (string)(_PlanNo.Trim());
            }

            if (string.IsNullOrEmpty(_OrderId))
            {
                throw Oops.Oh($"第{index}行[订单号]{_OrderId}不能为空！");
            }

            if (!string.IsNullOrEmpty(_OrderId))
            {
                addItem.OrderId = (string)(_OrderId.Trim());
            }
            if (!string.IsNullOrEmpty(_Info5))
            {
                addItem.Info5 = (string)(_Info5.Trim());
            }
            if (!string.IsNullOrEmpty(_AreaCode))
            {
                Admin.NET.Application.AreaCodeEnum enumAreaCode = default(Admin.NET.Application.AreaCodeEnum);

                if (!Enum.TryParse<Admin.NET.Application.AreaCodeEnum>(_AreaCode, out enumAreaCode) && !string.IsNullOrEmpty(_AreaCode))
                {
                    throw Oops.Oh($"第{index}行[所在区域]{_AreaCode}值不正确！");
                }
                else
                {
                    addItem.AreaCode = enumAreaCode;
                }

            }

            if (string.IsNullOrEmpty(_UpiStatus))
            {
                throw Oops.Oh($"第{index}行[板料状态]{_UpiStatus}不能为空！");
            }

            if (!string.IsNullOrEmpty(_UpiStatus))
            {
                Admin.NET.Application.UpiStatusEnum enumUpiStatus = default(Admin.NET.Application.UpiStatusEnum);

                if (!Enum.TryParse<Admin.NET.Application.UpiStatusEnum>(_UpiStatus, out enumUpiStatus) && !string.IsNullOrEmpty(_UpiStatus))
                {
                    throw Oops.Oh($"第{index}行[板料状态]{_UpiStatus}值不正确！");
                }
                else
                {
                    addItem.UpiStatus = enumUpiStatus;
                }

            }

            if (string.IsNullOrEmpty(_DetailName))
            {
                throw Oops.Oh($"第{index}行[部件名称]{_DetailName}不能为空！");
            }

            if (!string.IsNullOrEmpty(_DetailName))
            {
                addItem.DetailName = (string)(_DetailName.Trim());
            }

            if (string.IsNullOrEmpty(_Length))
            {
                throw Oops.Oh($"第{index}行[长]{_Length}不能为空！");
            }


            if (!string.IsNullOrEmpty(_IsPA))
            {
                if (!int.TryParse(_IsPA, out int outIsPA) && !string.IsNullOrEmpty(_IsPA))
                {
                    throw Oops.Oh($"第{index}行[是否优化包装]{_IsPA}值不正确！");
                }
                if (outIsPA <= 0 && !string.IsNullOrEmpty(_IsPA))
                {
                    throw Oops.Oh($"第{index}行[是否优化包装]{_IsPA}值不能小于等于0！");
                }
                else
                {
                    addItem.IsPA = outIsPA;
                }

            }

            if (string.IsNullOrEmpty(_PackageCode))
            {
                throw Oops.Oh($"第{index}行[包装号]{_PackageCode}不能为空！");
            }

            if (!string.IsNullOrEmpty(_PackageCode))
            {
                addItem.PackageCode = (string)(_PackageCode.Trim());
            }

            if (!string.IsNullOrEmpty(_Sequence))
            {
                if (!int.TryParse(_Sequence, out int outSequence) && !string.IsNullOrEmpty(_Sequence))
                {
                    throw Oops.Oh($"第{index}行[层数]{_Sequence}值不正确！");
                }
                if (outSequence <= 0 && !string.IsNullOrEmpty(_Sequence))
                {
                    throw Oops.Oh($"第{index}行[层数]{_Sequence}值不能小于等于0！");
                }
                else
                {
                    addItem.Sequence = outSequence;
                }

            }
            if (!string.IsNullOrEmpty(_Shelf))
            {
                if (!int.TryParse(_Shelf, out int outShelf) && !string.IsNullOrEmpty(_Shelf))
                {
                    throw Oops.Oh($"第{index}行[次序]{_Shelf}值不正确！");
                }
                if (outShelf <= 0 && !string.IsNullOrEmpty(_Shelf))
                {
                    throw Oops.Oh($"第{index}行[次序]{_Shelf}值不能小于等于0！");
                }
                else
                {
                    addItem.Shelf = outShelf;
                }

            }

            if (!string.IsNullOrEmpty(_Info4))
            {
                addItem.Info4 = (string)(_Info4.Trim());
            }
            if (!string.IsNullOrEmpty(_Info6))
            {
                addItem.Info6 = (string)(_Info6.Trim());
            }
            if (!string.IsNullOrEmpty(_Info7))
            {
                addItem.Info7 = (string)(_Info7.Trim());
            }
            if (!string.IsNullOrEmpty(_Info8))
            {
                addItem.Info8 = (string)(_Info8.Trim());
            }
            if (!string.IsNullOrEmpty(_Info10))
            {
                addItem.Info10 = (string)(_Info10.Trim());
            }
            if (!string.IsNullOrEmpty(_Info9))
            {
                addItem.Info9 = (string)(_Info9.Trim());
            }
            if (!string.IsNullOrEmpty(_Info11))
            {
                addItem.Info11 = (string)(_Info11.Trim());
            }
            if (!string.IsNullOrEmpty(_Info12))
            {
                addItem.Info12 = (string)(_Info12.Trim());
            }
            if (!string.IsNullOrEmpty(_Info13))
            {
                addItem.Info13 = (string)(_Info13.Trim());
            }
            //if(!string.IsNullOrEmpty(_Info14))
            //{
            //      addItem.Info14 = (string)(_Info14.Trim());
            // }
            if (!string.IsNullOrEmpty(_Info15))
            {
                if (!int.TryParse(_Info15, out int outInfo15) && !string.IsNullOrEmpty(_Info15))
                {
                    throw Oops.Oh($"第{index}行[部件数量]{_Info15}值不正确！");
                }
                if (outInfo15 <= 0 && !string.IsNullOrEmpty(_Info15))
                {
                    throw Oops.Oh($"第{index}行[部件数量]{_Info15}值不能小于等于0！");
                }
                else
                {
                    addItem.Info15 = outInfo15;
                }

            }
            if (!string.IsNullOrEmpty(_Info16))
            {
                addItem.Info16 = (string)(_Info16.Trim());
            }
            if (!string.IsNullOrEmpty(_Info17))
            {
                addItem.Info17 = (string)(_Info17.Trim());
            }
            if (!string.IsNullOrEmpty(_UpiFlag))
            {
                Admin.NET.Application.UpiFlagEnum enumUpiFlag = default(Admin.NET.Application.UpiFlagEnum);

                if (!Enum.TryParse<Admin.NET.Application.UpiFlagEnum>(_UpiFlag, out enumUpiFlag) && !string.IsNullOrEmpty(_UpiFlag))
                {
                    throw Oops.Oh($"第{index}行[标记]{_UpiFlag}值不正确！");
                }
                else
                {
                    addItem.UpiFlag = enumUpiFlag;
                }

            }
            #endregion


            details.Add(addItem);
        }
@@ -459,7 +459,7 @@
        await CheckExisitForImport(details);
        return details;
    }
    

    /// <summary>
    /// æ ¹æ®ç‰ˆæœ¬ä¸‹è½½æ‰¹æ¬¡æ•°æ®çš„Excel导入模板
    /// </summary>
@@ -473,7 +473,7 @@
        var fileName = HttpUtility.UrlEncode($"导入模板(批次数据).xlsx", Encoding.GetEncoding("UTF-8"));
        return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
    }
    

    #endregion

    #region ç§æœ‰æ–¹æ³•
@@ -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())
@@ -515,10 +515,10 @@
            .WhereIF(input.AreaCode.HasValue, u => u.AreaCode == input.AreaCode)
            .WhereIF(input.UpiStatus.HasValue, u => u.UpiStatus == input.UpiStatus)
            .WhereIF(!string.IsNullOrWhiteSpace(input.DetailName), u => u.DetailName.Contains(input.DetailName.Trim()))
            .WhereIF(input.IsPA>0, u => u.IsPA == input.IsPA)
            .WhereIF(input.IsPA > 0, u => u.IsPA == input.IsPA)
            .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
            .WhereIF(input.Sequence>0, u => u.Sequence == input.Sequence)
            .WhereIF(input.Shelf>0, u => u.Shelf == input.Shelf)
            .WhereIF(input.Sequence > 0, u => u.Sequence == input.Sequence)
            .WhereIF(input.Shelf > 0, u => u.Shelf == input.Shelf)
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info4), u => u.Info4.Contains(input.Info4.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info6), u => u.Info6.Contains(input.Info6.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info7), u => u.Info7.Contains(input.Info7.Trim()))
@@ -528,58 +528,58 @@
            .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(input.Info15>0, u => u.Info15 == input.Info15)
            //.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()))
            .WhereIF(input.UpiFlag.HasValue, u => u.UpiFlag == input.UpiFlag)
            .Select<Mes_BatchOrderUPI_NewOutput>();
        return query;
       }
    }

        /// <summary>
        /// é‡å¤æ€§éªŒè¯
        /// </summary>
        /// <param name="input">验证对象</param>
        /// <param name="isEdit">是否是编辑</param>
        /// <returns></returns>
        private async Task CheckExist( Mes_BatchOrderUPI_New input,bool isEdit=false)
    /// <summary>
    /// é‡å¤æ€§éªŒè¯
    /// </summary>
    /// <param name="input">验证对象</param>
    /// <param name="isEdit">是否是编辑</param>
    /// <returns></returns>
    private async Task CheckExist(Mes_BatchOrderUPI_New input, bool isEdit = false)
    {



        //没有配置组合校验，不需要验重


        //没有配置单独校验，不需要验重
    }

    /// <summary>
    /// æ ¹æ®ç»„合校验和单独校验验证数据是否已存在-导入时验证
    /// </summary>
    /// <param name="inputs"></param>
    /// <returns></returns>
    private async Task CheckExisitForImport(List<Mes_BatchOrderUPI_New> inputs)
    {
        if (inputs?.Count <= 0)
        {
           


            //没有配置组合校验，不需要验重

           
            //没有配置单独校验，不需要验重
       }

       /// <summary>
        /// æ ¹æ®ç»„合校验和单独校验验证数据是否已存在-导入时验证
        /// </summary>
        /// <param name="inputs"></param>
        /// <returns></returns>
        private async Task CheckExisitForImport(List<Mes_BatchOrderUPI_New> inputs)
        { 
            if (inputs?.Count <= 0)
            {
                throw Oops.Oh($"导入数据不能为空");
            }
            //根据组合校验验证表格中中是否已存在相同数据  
                      






          
           //根据单独校验验证表格中中是否已存在相同数据  
           
           
           
            throw Oops.Oh($"导入数据不能为空");
        }
     #endregion
        //根据组合校验验证表格中中是否已存在相同数据  








        //根据单独校验验证表格中中是否已存在相同数据  



    }
    #endregion

}


 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,