鲁丽木业包装线
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
liuying
2024-12-01 8bfe5dcf83cdcaa90c45ad86a8b464238748de7c 
 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()))