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

zongzhibin

2024-11-30 aa00074986140e57be1f56272311e84abd8566ac

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

@@ -184,6 +184,7 @@
                           var _Info15 = "";//部件数量
                           var _Info16 = "";//部件尺寸
                           var _Info17 = "";//机械臂是否旋转
                           var _UpiFlag = "";//标记
                          #endregion
                          
                          
@@ -221,6 +222,7 @@
                           _Info15 = row["部件数量"]?.ToString() ;
                           _Info16 = row["部件尺寸"]?.ToString() ;
                           _Info17 = row["机械臂是否旋转"]?.ToString() ;
                           _UpiFlag = row["标记"]?.ToString() ;
                          #endregion
                          
                          
@@ -309,12 +311,6 @@
                            throw Oops.Oh($"第{index}行[长]{_Length}不能为空！");
                          }
                          
                         
                          if (string.IsNullOrEmpty(_Thk))
                          {
                            throw Oops.Oh($"第{index}行[厚]{_Thk}不能为空！");
                          }
                          
                      
                          if(!string.IsNullOrEmpty(_IsPA))
                          {
@@ -342,7 +338,7 @@
                          {
                                addItem.PackageCode = (string)(_PackageCode.Trim());
                           }
                         
                          
                          if(!string.IsNullOrEmpty(_Sequence))
                          {
                              if (!int.TryParse(_Sequence, out int outSequence)&&!string.IsNullOrEmpty(_Sequence))
@@ -375,7 +371,15 @@
                              }
                          
                          }
                         
                       
                          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());
@@ -431,6 +435,20 @@
                          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
                          
@@ -514,6 +532,7 @@
            .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;
       }