LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
@@ -13,21 +13,8 @@ <el-input v-model="ruleForm.id" /> </el-form-item> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="æå¨åºå" prop="areaCode"> <el-select clearable v-model="ruleForm.areaCode" placeholder="请éæ©æå¨åºå"> <el-option v-for="(item,index) in getEnumAreaCodeData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option> </el-select> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="æ¿æç¶æ" prop="upiStatus"> <el-select clearable v-model="ruleForm.upiStatus" placeholder="请éæ©æ¿æç¶æ"> <el-option v-for="(item,index) in getEnumUpiStatusData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option> </el-select> <el-form-item label="é¨ä»¶æ¡ç " prop="upi"> <el-input v-model="ruleForm.upi" placeholder="请è¾å ¥é¨ä»¶æ¡ç " maxlength="50" show-word-limit clearable /> </el-form-item> @@ -47,8 +34,28 @@ </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="é¨ä»¶æ¡ç " prop="upi"> <el-input v-model="ruleForm.upi" placeholder="请è¾å ¥é¨ä»¶æ¡ç " maxlength="50" show-word-limit clearable /> <el-form-item label="ç产åå·" prop="info5"> <el-input v-model="ruleForm.info5" 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="areaCode"> <el-select clearable v-model="ruleForm.areaCode" placeholder="请éæ©æå¨åºå"> <el-option v-for="(item,index) in getEnumAreaCodeData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option> </el-select> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="æ¿æç¶æ" prop="upiStatus"> <el-select clearable v-model="ruleForm.upiStatus" placeholder="请éæ©æ¿æç¶æ"> <el-option v-for="(item,index) in getEnumUpiStatusData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option> </el-select> </el-form-item> @@ -82,36 +89,8 @@ </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="é¨ä»¶çº¹ç" prop="matgrid"> <el-input v-model="ruleForm.matgrid" 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="isEB"> <el-input-number v-model="ruleForm.isEB" placeholder="请è¾å ¥æ¯å¦å°è¾¹" clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="æå设å¤ç¼å·" prop="dRNum"> <el-input-number v-model="ruleForm.dRNum" placeholder="请è¾å ¥æå设å¤ç¼å·" clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="æ¯å¦ä¼åå è£ " prop="isPA"> <el-input-number v-model="ruleForm.isPA" placeholder="请è¾å ¥æ¯å¦ä¼åå è£ " clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="é¯åå¾å·" prop="materialIndeX"> <el-input-number v-model="ruleForm.materialIndeX" placeholder="请è¾å ¥é¯åå¾å·" clearable /> </el-form-item> @@ -159,13 +138,6 @@ </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="转åè§åº¦" prop="rotation"> <el-input v-model="ruleForm.rotation" placeholder="请è¾å ¥è½¬åè§åº¦" maxlength="53" 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="info1"> <el-input v-model="ruleForm.info1" placeholder="请è¾å ¥çº¸ç®±é¿" maxlength="53" show-word-limit clearable /> @@ -189,13 +161,6 @@ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="éå®åååå·" prop="info4"> <el-input v-model="ruleForm.info4" 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="info5"> <el-input v-model="ruleForm.info5" placeholder="请è¾å ¥ç产åå·" maxlength="60" show-word-limit clearable /> </el-form-item> @@ -277,6 +242,13 @@ </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="æºæ¢°èæ¯å¦æ转" prop="info17"> <el-input v-model="ruleForm.info17" placeholder="请è¾å ¥æºæ¢°èæ¯å¦æ转" maxlength="60" show-word-limit clearable /> </el-form-item> </el-col> </el-row> </el-form> <template #footer> @@ -321,10 +293,10 @@ const ruleForm = ref<any>({}); //èªè¡æ·»å å ¶ä»è§å const rules = ref<FormRules>({ upiStatus: [{required: true, message: '请éæ©æ¿æç¶æï¼', trigger: 'change',},], upi: [{required: true, message: '请è¾å ¥é¨ä»¶æ¡ç ï¼', trigger: 'blur',},], planNo: [{required: true, message: '请è¾å ¥æ¹æ¬¡å·ï¼', trigger: 'blur',},], orderId: [{required: true, message: '请è¾å ¥è®¢åå·ï¼', trigger: 'blur',},], upi: [{required: true, message: '请è¾å ¥é¨ä»¶æ¡ç ï¼', trigger: 'blur',},], upiStatus: [{required: true, message: '请éæ©æ¿æç¶æï¼', trigger: 'change',},], detailName: [{required: true, message: '请è¾å ¥é¨ä»¶å称ï¼', trigger: 'blur',},], length: [{required: true, message: '请è¾å ¥é¿ï¼', trigger: 'blur',},], width: [{required: true, message: '请è¾å ¥å®½ï¼', trigger: 'blur',},], LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
@@ -5,7 +5,31 @@ <el-row> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10"> <el-form-item label="å ³é®å"> <el-input v-model="queryParamsMes_BatchOrderUPI_New.searchKey" clearable="" placeholder="æ¹æ¬¡å·,订åå·,é¨ä»¶æ¡ç ,é¨ä»¶å称,é¨ä»¶çº¹ç,å è£ å·,éå®åååå·,ç产åå·,第å å ,ç»éåºå称,产åå称,客æ·å称,å è£ ç¼ç ,èªæoråè´§,å è£ é¨ä»¶æ»æ°é,å è£ é¢ç§¯,é¨ä»¶å称,é¨ä»¶å°ºå¯¸,å建人,ä¿®æ¹äºº"/> <el-input v-model="queryParamsMes_BatchOrderUPI_New.searchKey" clearable="" placeholder="é¨ä»¶æ¡ç ,æ¹æ¬¡å·,订åå·,ç产åå·,é¨ä»¶å称,å è£ å·,éå®åååå·,第å å ,ç»éåºå称,产åå称,客æ·å称,å è£ ç¼ç ,èªæoråè´§,å è£ é¨ä»¶æ»æ°é,å è£ é¢ç§¯,é¨ä»¶å称,é¨ä»¶å°ºå¯¸,æºæ¢°èæ¯å¦æ转,å建人,ä¿®æ¹äºº"/> </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.upi" 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.planNo" 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.orderId" 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.info5" clearable="" placeholder="请è¾å ¥ç产åå·"/> </el-form-item> </el-col> @@ -24,24 +48,6 @@ <el-option v-for="(item,index) in getEnumUpiStatusData_Index" :key="index" :value="item.value" :label="`${item.describe}`" /> </el-select> </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.planNo" 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.orderId" 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.upi" clearable="" placeholder="请è¾å ¥é¨ä»¶æ¡ç "/> </el-form-item> </el-col> @@ -70,32 +76,8 @@ </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.matgrid" 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.isEB" 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.dRNum" 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.isPA" 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.materialIndeX" clearable="" placeholder="请è¾å ¥é¯åå¾å·"/> </el-form-item> </el-col> @@ -136,12 +118,6 @@ </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.rotation" 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.info1" clearable="" placeholder="请è¾å ¥çº¸ç®±é¿"/> @@ -162,12 +138,6 @@ <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.info4" 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.info5" clearable="" placeholder="请è¾å ¥ç产åå·"/> </el-form-item> </el-col> @@ -237,6 +207,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.info17" clearable="" placeholder="请è¾å ¥æºæ¢°èæ¯å¦æ转"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10"> <el-form-item> <el-button-group style="display: flex; align-items: center;"> @@ -265,6 +241,10 @@ @sort-change="sortChangeMes_BatchOrderUPI_New" border=""> <el-table-column type="index" label="åºå·" width="55" align="center"/> <el-table-column prop="upi" label="é¨ä»¶æ¡ç " show-overflow-tooltip="" /> <el-table-column prop="planNo" label="æ¹æ¬¡å·" show-overflow-tooltip="" /> <el-table-column prop="orderId" label="订åå·" show-overflow-tooltip="" /> <el-table-column prop="info5" label="ç产åå·" show-overflow-tooltip="" /> <el-table-column prop="areaCode" label="æå¨åºå" show-overflow-tooltip="" > <template #default="scope"> <el-tag>{{ getEnumDesc(scope.row.areaCode, getEnumAreaCodeData_Index)}}</el-tag> @@ -275,30 +255,21 @@ <el-tag>{{ getEnumDesc(scope.row.upiStatus, getEnumUpiStatusData_Index)}}</el-tag> </template> </el-table-column> <el-table-column prop="planNo" label="æ¹æ¬¡å·" show-overflow-tooltip="" /> <el-table-column prop="orderId" label="订åå·" show-overflow-tooltip="" /> <el-table-column prop="upi" label="é¨ä»¶æ¡ç " show-overflow-tooltip="" /> <el-table-column prop="detailName" 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="" /> <el-table-column prop="matgrid" label="é¨ä»¶çº¹ç" show-overflow-tooltip="" /> <el-table-column prop="isEB" label="æ¯å¦å°è¾¹" show-overflow-tooltip="" /> <el-table-column prop="dRNum" label="æå设å¤ç¼å·" show-overflow-tooltip="" /> <el-table-column prop="isPA" label="æ¯å¦ä¼åå è£ " show-overflow-tooltip="" /> <el-table-column prop="materialIndeX" label="é¯åå¾å·" show-overflow-tooltip="" /> <el-table-column prop="packageCode" label="å è£ å·" show-overflow-tooltip="" /> <el-table-column prop="machineXCenter" label="å è£ Xåæ " show-overflow-tooltip="" /> <el-table-column prop="machineYCenter" label="å è£ Yåæ " show-overflow-tooltip="" /> <el-table-column prop="machineZCenter" label="å è£ Zåæ " show-overflow-tooltip="" /> <el-table-column prop="sequence" label="å±æ°" show-overflow-tooltip="" /> <el-table-column prop="shelf" label="次åº" show-overflow-tooltip="" /> <el-table-column prop="rotation" label="转åè§åº¦" show-overflow-tooltip="" /> <el-table-column prop="info1" label="纸箱é¿" show-overflow-tooltip="" /> <el-table-column prop="info2" label="纸箱宽" show-overflow-tooltip="" /> <el-table-column prop="info3" label="纸箱é«" show-overflow-tooltip="" /> <el-table-column prop="info4" label="éå®åååå·" show-overflow-tooltip="" /> <el-table-column prop="info5" label="ç产åå·" show-overflow-tooltip="" /> <el-table-column prop="info6" label="第å å " show-overflow-tooltip="" /> <el-table-column prop="info7" label="ç»éåºå称" show-overflow-tooltip="" /> <el-table-column prop="info8" label="产åå称" show-overflow-tooltip="" /> @@ -310,6 +281,7 @@ <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="" /> <el-table-column prop="createTime" label="å建æ¶é´" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" /> <el-table-column prop="updateTime" label="ä¿®æ¹æ¶é´" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" /> <el-table-column prop="createUserName" label="å建人" show-overflow-tooltip="" /> LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs
@@ -13,25 +13,10 @@ [SugarTable("mes_batchOrderUPI_new", "æ¹æ¬¡æ°æ®")] public class Mes_BatchOrderUPI_New : EntityBase { #region wmsæ°å¢å段 ãEditby shaocx,2024-11-20ã /// <summary> /// æå¨åºå /// </summary> [SugarColumn(ColumnName = "AreaCode", ColumnDescription = "æå¨åºå")] public AreaCodeEnum? AreaCode { get; set; } /// <summary> /// æ¿æç¶æ /// </summary> [Required] [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "æ¿æç¶æ")] public UpiStatusEnum UpiStatus { get; set; } #endregion [SugarColumn(ColumnName = "UPI", ColumnDescription = "é¨ä»¶æ¡ç ", Length = 50)] public string UPI { get; set; } [Required] @@ -42,9 +27,31 @@ [SugarColumn(ColumnName = "OrderId", ColumnDescription = "订åå·", Length = 50)] public string OrderId { get; set; } /// <summary> /// ç产åå· /// </summary> [SugarColumn(ColumnName = "Info5", ColumnDescription = "ç产åå·", Length = 60)] public string? Info5 { get; set; } #region wmsæ°å¢å段 ãEditby shaocx,2024-11-20ã /// <summary> /// æå¨åºå /// </summary> [SugarColumn(ColumnName = "AreaCode", ColumnDescription = "æå¨åºå")] public AreaCodeEnum? AreaCode { get; set; } = AreaCodeEnum.æ åºå; /// <summary> /// æ¿æç¶æ /// </summary> [Required] [SugarColumn(ColumnName = "UPI", ColumnDescription = "é¨ä»¶æ¡ç ", Length = 50)] public string UPI { get; set; } [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "æ¿æç¶æ")] public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.åå§; #endregion [Required] [SugarColumn(ColumnName = "DetailName", ColumnDescription = "é¨ä»¶å称", Length = 50)] @@ -60,30 +67,30 @@ [SugarColumn(ColumnName = "Thk", ColumnDescription = "å")] public float Thk { get; set; } [SugarColumn(ColumnName = "Matgrid", ColumnDescription = "é¨ä»¶çº¹ç", Length = 50)] public string? Matgrid { get; set; } //[SugarColumn(ColumnName = "Matgrid", ColumnDescription = "é¨ä»¶çº¹ç", Length = 50)] //public string? Matgrid { get; set; } [SugarColumn(ColumnName = "IsEB", ColumnDescription = "æ¯å¦å°è¾¹")] public int? IsEB { get; set; } //[SugarColumn(ColumnName = "IsEB", ColumnDescription = "æ¯å¦å°è¾¹")] //public int? IsEB { get; set; } /// <summary> /// æå设å¤ç¼å· ãEditBy shaocx,2022-05-28ã /// 0ï¼ä¸æå /// 1ï¼åé¢é» /// 2ï¼è±ªè¿å é¢é» /// 5ï¼åå ´å é¢é» /// </summary> [SugarColumn(ColumnName = "DRNum", ColumnDescription = "æå设å¤ç¼å·")] public int? DRNum { get; set; } ///// <summary> ///// æå设å¤ç¼å· ãEditBy shaocx,2022-05-28ã ///// 0ï¼ä¸æå ///// 1ï¼åé¢é» ///// 2ï¼è±ªè¿å é¢é» ///// 5ï¼åå ´å é¢é» ///// </summary> //[SugarColumn(ColumnName = "DRNum", ColumnDescription = "æå设å¤ç¼å·")] //public int? DRNum { get; set; } [SugarColumn(ColumnName = "IsPA", ColumnDescription = "æ¯å¦ä¼åå è£ ")] public int? IsPA { get; set; } /// <summary> /// é¯åå¾å· /// </summary> [SugarColumn(ColumnName = "MaterialIndeX", ColumnDescription = "é¯åå¾å·")] public int? MaterialIndeX { get; set; } ///// <summary> ///// é¯åå¾å· ///// </summary> //[SugarColumn(ColumnName = "MaterialIndeX", ColumnDescription = "é¯åå¾å·")] //public int? MaterialIndeX { get; set; } #region å è£ çº¿æå ³ @@ -115,15 +122,15 @@ #endregion /// <summary> /// æ¯å¦è½¬å /// 0ï¼ä¸è½¬å /// 1ï¼è½¬å /// ç®ååªæåé¢é»æè½è½¬å /// </summary> [Required] [SugarColumn(ColumnName = "Rotation", ColumnDescription = "转åè§åº¦", Length = 50)] public float? Rotation { get; set; } ///// <summary> ///// æ¯å¦è½¬å ///// 0ï¼ä¸è½¬å ///// 1ï¼è½¬å ///// ç®ååªæåé¢é»æè½è½¬å ///// </summary> //[Required] //[SugarColumn(ColumnName = "Rotation", ColumnDescription = "转åè§åº¦", Length = 50)] //public float? Rotation { get; set; } @@ -141,11 +148,7 @@ [SugarColumn(ColumnName = "Info4", ColumnDescription = "éå®åååå·", Length = 60)] public string? Info4 { get; set; } /// <summary> /// ç产åå· /// </summary> [SugarColumn(ColumnName = "Info5", ColumnDescription = "ç产åå·", Length = 60)] public string? Info5 { get; set; } /// <summary> /// 第å å LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs
@@ -9,14 +9,9 @@ public class Mes_BatchOrderUPI_NewBaseInput { /// <summary> /// æå¨åºå /// é¨ä»¶æ¡ç /// </summary> public virtual Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; } /// <summary> /// æ¿æç¶æ /// </summary> public virtual Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; } public virtual string UPI { get; set; } /// <summary> /// æ¹æ¬¡å· @@ -29,9 +24,19 @@ public virtual string OrderId { get; set; } /// <summary> /// é¨ä»¶æ¡ç /// ç产åå· /// </summary> public virtual string UPI { get; set; } 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> /// é¨ä»¶å称 @@ -54,29 +59,9 @@ public virtual float Thk { get; set; } /// <summary> /// é¨ä»¶çº¹ç /// </summary> public virtual string Matgrid { get; set; } /// <summary> /// æ¯å¦å°è¾¹ /// </summary> public virtual int? IsEB { get; set; } /// <summary> /// æå设å¤ç¼å· /// </summary> public virtual int? DRNum { get; set; } /// <summary> /// æ¯å¦ä¼åå è£ /// </summary> public virtual int? IsPA { get; set; } /// <summary> /// é¯åå¾å· /// </summary> public virtual int? MaterialIndeX { get; set; } /// <summary> /// å è£ å· @@ -109,11 +94,6 @@ public virtual int? Shelf { get; set; } /// <summary> /// 转åè§åº¦ /// </summary> public virtual float? Rotation { get; set; } /// <summary> /// çº¸ç®±é¿ /// </summary> public virtual float? Info1 { get; set; } @@ -132,11 +112,6 @@ /// éå®åååå· /// </summary> public virtual string Info4 { get; set; } /// <summary> /// ç产åå· /// </summary> public virtual string Info5 { get; set; } /// <summary> /// 第å å @@ -194,6 +169,11 @@ public virtual string Info16 { get; set; } /// <summary> /// æºæ¢°èæ¯å¦æ转 /// </summary> public virtual string Info17 { get; set; } /// <summary> /// å建æ¶é´ /// </summary> public virtual DateTime? CreateTime { get; set; } @@ -241,14 +221,9 @@ public string? SearchKey { get; set; } /// <summary> /// æå¨åºå /// é¨ä»¶æ¡ç /// </summary> public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; } /// <summary> /// æ¿æç¶æ /// </summary> public Admin.NET.Application.UpiStatusEnum? UpiStatus { get; set; } public string? UPI { get; set; } /// <summary> /// æ¹æ¬¡å· @@ -261,9 +236,19 @@ public string? OrderId { get; set; } /// <summary> /// é¨ä»¶æ¡ç /// ç产åå· /// </summary> public string? UPI { get; set; } 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> /// é¨ä»¶å称 @@ -286,29 +271,9 @@ public float? Thk { get; set; } /// <summary> /// é¨ä»¶çº¹ç /// </summary> public string? Matgrid { get; set; } /// <summary> /// æ¯å¦å°è¾¹ /// </summary> public int? IsEB { get; set; } /// <summary> /// æå设å¤ç¼å· /// </summary> public int? DRNum { get; set; } /// <summary> /// æ¯å¦ä¼åå è£ /// </summary> public int? IsPA { get; set; } /// <summary> /// é¯åå¾å· /// </summary> public int? MaterialIndeX { get; set; } /// <summary> /// å è£ å· @@ -341,11 +306,6 @@ public int? Shelf { get; set; } /// <summary> /// 转åè§åº¦ /// </summary> public float? Rotation { get; set; } /// <summary> /// çº¸ç®±é¿ /// </summary> public float? Info1 { get; set; } @@ -364,11 +324,6 @@ /// éå®åååå· /// </summary> public string? Info4 { get; set; } /// <summary> /// ç产åå· /// </summary> public string? Info5 { get; set; } /// <summary> /// 第å å @@ -425,6 +380,11 @@ /// </summary> public string? Info16 { get; set; } /// <summary> /// æºæ¢°èæ¯å¦æ转 /// </summary> public string? Info17 { get; set; } } /// <summary> @@ -433,10 +393,10 @@ public class AddMes_BatchOrderUPI_NewInput : Mes_BatchOrderUPI_NewBaseInput { /// <summary> /// æ¿æç¶æ /// é¨ä»¶æ¡ç /// </summary> [Required(ErrorMessage = "æ¿æç¶æä¸è½ä¸ºç©º")] public override Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; } [Required(ErrorMessage = "é¨ä»¶æ¡ç ä¸è½ä¸ºç©º")] public override string UPI { get; set; } /// <summary> /// æ¹æ¬¡å· @@ -451,10 +411,10 @@ public override string OrderId { get; set; } /// <summary> /// é¨ä»¶æ¡ç /// æ¿æç¶æ /// </summary> [Required(ErrorMessage = "é¨ä»¶æ¡ç ä¸è½ä¸ºç©º")] public override string UPI { get; set; } [Required(ErrorMessage = "æ¿æç¶æä¸è½ä¸ºç©º")] public override Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; } /// <summary> /// é¨ä»¶å称 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs
@@ -11,14 +11,9 @@ public long? Id { get; set; } /// <summary> /// æå¨åºå /// é¨ä»¶æ¡ç /// </summary> public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; } /// <summary> /// æ¿æç¶æ /// </summary> public Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; } public string UPI { get; set; } /// <summary> /// æ¹æ¬¡å· @@ -31,9 +26,19 @@ public string OrderId { get; set; } /// <summary> /// é¨ä»¶æ¡ç /// ç产åå· /// </summary> public string UPI { get; set; } 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> /// é¨ä»¶å称 @@ -56,29 +61,9 @@ public float Thk { get; set; } /// <summary> /// é¨ä»¶çº¹ç /// </summary> public string Matgrid { get; set; } /// <summary> /// æ¯å¦å°è¾¹ /// </summary> public int? IsEB { get; set; } /// <summary> /// æå设å¤ç¼å· /// </summary> public int? DRNum { get; set; } /// <summary> /// æ¯å¦ä¼åå è£ /// </summary> public int? IsPA { get; set; } /// <summary> /// é¯åå¾å· /// </summary> public int? MaterialIndeX { get; set; } /// <summary> /// å è£ å· @@ -111,11 +96,6 @@ public int? Shelf { get; set; } /// <summary> /// 转åè§åº¦ /// </summary> public float? Rotation { get; set; } /// <summary> /// çº¸ç®±é¿ /// </summary> public float? Info1 { get; set; } @@ -134,11 +114,6 @@ /// éå®åååå· /// </summary> public string Info4 { get; set; } /// <summary> /// ç产åå· /// </summary> public string Info5 { get; set; } /// <summary> /// 第å å @@ -196,6 +171,11 @@ public string Info16 { get; set; } /// <summary> /// æºæ¢°èæ¯å¦æ转 /// </summary> public string Info17 { get; set; } /// <summary> /// å建æ¶é´ /// </summary> public DateTime? CreateTime { get; set; } LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs
@@ -4,9 +4,6 @@ using System.Data; using System.Web; using System.Text; using Furion.DatabaseAccessor; using Admin.NET.Application.Service.WmsOrder.Mes_BatchOrderUPI_New.Dto; namespace Admin.NET.Application; /// <summary> /// æ¹æ¬¡æ°æ®æå¡ @@ -154,32 +151,27 @@ var addItem = new Mes_BatchOrderUPI_New(); #region å®ä¹åé var _AreaCode = "";//æå¨åºå var _UpiStatus = "";//æ¿æç¶æ var _UPI = "";//é¨ä»¶æ¡ç var _PlanNo = "";//æ¹æ¬¡å· var _OrderId = "";//订åå· var _UPI = "";//é¨ä»¶æ¡ç var _Info5 = "";//ç产åå· var _AreaCode = "";//æå¨åºå var _UpiStatus = "";//æ¿æç¶æ var _DetailName = "";//é¨ä»¶å称 var _Length = "";//é¿ var _Width = "";//宽 var _Thk = "";//å var _Matgrid = "";//é¨ä»¶çº¹ç var _IsEB = "";//æ¯å¦å°è¾¹ var _DRNum = "";//æå设å¤ç¼å· var _IsPA = "";//æ¯å¦ä¼åå è£ var _MaterialIndeX = "";//é¯åå¾å· var _PackageCode = "";//å è£ å· var _MachineXCenter = "";//å è£ Xåæ var _MachineYCenter = "";//å è£ Yåæ var _MachineZCenter = "";//å è£ Zåæ var _Sequence = "";//å±æ° var _Shelf = "";//æ¬¡åº var _Rotation = "";//转åè§åº¦ var _Info1 = "";//çº¸ç®±é¿ var _Info2 = "";//纸箱宽 var _Info3 = "";//çº¸ç®±é« var _Info4 = "";//éå®åååå· var _Info5 = "";//ç产åå· var _Info6 = "";//第å å var _Info7 = "";//ç»éåºå称 var _Info8 = "";//产åå称 @@ -191,36 +183,32 @@ var _Info14 = "";//é¨ä»¶å称 var _Info15 = "";//é¨ä»¶æ°é var _Info16 = "";//é¨ä»¶å°ºå¯¸ var _Info17 = "";//æºæ¢°èæ¯å¦æ转 #endregion #region åå¼ _AreaCode = row["æå¨åºå"]?.ToString(); _UpiStatus = row["æ¿æç¶æ"]?.ToString(); _UPI = row["é¨ä»¶æ¡ç "]?.ToString() ; _PlanNo = row["æ¹æ¬¡å·"]?.ToString(); _OrderId = row["订åå·"]?.ToString(); _UPI = row["é¨ä»¶æ¡ç "]?.ToString(); _Info5 = row["ç产åå·"]?.ToString() ; _AreaCode = row["æå¨åºå"]?.ToString() ; _UpiStatus = row["æ¿æç¶æ"]?.ToString() ; _DetailName = row["é¨ä»¶å称"]?.ToString(); _Length = row["é¿"]?.ToString(); _Width = row["宽"]?.ToString(); _Thk = row["å"]?.ToString(); _Matgrid = row["é¨ä»¶çº¹ç"]?.ToString(); _IsEB = row["æ¯å¦å°è¾¹"]?.ToString(); _DRNum = row["æå设å¤ç¼å·"]?.ToString(); _IsPA = row["æ¯å¦ä¼åå è£ "]?.ToString(); _MaterialIndeX = row["é¯åå¾å·"]?.ToString(); _PackageCode = row["å è£ å·"]?.ToString(); _MachineXCenter = row["å è£ Xåæ "]?.ToString(); _MachineYCenter = row["å è£ Yåæ "]?.ToString(); _MachineZCenter = row["å è£ Zåæ "]?.ToString(); _Sequence = row["å±æ°"]?.ToString(); _Shelf = row["次åº"]?.ToString(); _Rotation = row["转åè§åº¦"]?.ToString(); _Info1 = row["纸箱é¿"]?.ToString(); _Info2 = row["纸箱宽"]?.ToString(); _Info3 = row["纸箱é«"]?.ToString(); _Info4 = row["éå®åååå·"]?.ToString(); _Info5 = row["ç产åå·"]?.ToString(); _Info6 = row["第å å "]?.ToString(); _Info7 = row["ç»éåºå称"]?.ToString(); _Info8 = row["产åå称"]?.ToString(); @@ -232,10 +220,45 @@ _Info14 = row["é¨ä»¶å称"]?.ToString(); _Info15 = row["é¨ä»¶æ°é"]?.ToString(); _Info16 = row["é¨ä»¶å°ºå¯¸"]?.ToString(); _Info17 = 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); @@ -271,36 +294,6 @@ } 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(_UPI)) { throw Oops.Oh($"第{index}è¡[é¨ä»¶æ¡ç ]{_UPI}ä¸è½ä¸ºç©ºï¼"); } if (!string.IsNullOrEmpty(_UPI)) { addItem.UPI = (string)(_UPI.Trim()); } if (string.IsNullOrEmpty(_DetailName)) { throw Oops.Oh($"第{index}è¡[é¨ä»¶å称]{_DetailName}ä¸è½ä¸ºç©ºï¼"); @@ -316,66 +309,13 @@ throw Oops.Oh($"第{index}è¡[é¿]{_Length}ä¸è½ä¸ºç©ºï¼"); } //if(!string.IsNullOrEmpty(_Length)) //{ // addItem.Length = (float)(_Length.Trim()); // } //if (string.IsNullOrEmpty(_Width)) //{ // throw Oops.Oh($"第{index}è¡[宽]{_Width}ä¸è½ä¸ºç©ºï¼"); //} //if(!string.IsNullOrEmpty(_Width)) //{ // addItem.Width = (float)(_Width.Trim()); // } //if (string.IsNullOrEmpty(_Thk)) //{ // throw Oops.Oh($"第{index}è¡[å]{_Thk}ä¸è½ä¸ºç©ºï¼"); //} //if(!string.IsNullOrEmpty(_Thk)) //{ // addItem.Thk = (float)(_Thk.Trim()); // } if (!string.IsNullOrEmpty(_Matgrid)) if (string.IsNullOrEmpty(_Thk)) { addItem.Matgrid = (string)(_Matgrid.Trim()); } if (!string.IsNullOrEmpty(_IsEB)) { if (!int.TryParse(_IsEB, out int outIsEB) && !string.IsNullOrEmpty(_IsEB)) { throw Oops.Oh($"第{index}è¡[æ¯å¦å°è¾¹]{_IsEB}å¼ä¸æ£ç¡®ï¼"); } if (outIsEB <= 0 && !string.IsNullOrEmpty(_IsEB)) { throw Oops.Oh($"第{index}è¡[æ¯å¦å°è¾¹]{_IsEB}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.IsEB = outIsEB; throw Oops.Oh($"第{index}è¡[å]{_Thk}ä¸è½ä¸ºç©ºï¼"); } } if (!string.IsNullOrEmpty(_DRNum)) { if (!int.TryParse(_DRNum, out int outDRNum) && !string.IsNullOrEmpty(_DRNum)) { throw Oops.Oh($"第{index}è¡[æå设å¤ç¼å·]{_DRNum}å¼ä¸æ£ç¡®ï¼"); } if (outDRNum <= 0 && !string.IsNullOrEmpty(_DRNum)) { throw Oops.Oh($"第{index}è¡[æå设å¤ç¼å·]{_DRNum}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.DRNum = outDRNum; } } if (!string.IsNullOrEmpty(_IsPA)) { if (!int.TryParse(_IsPA, out int outIsPA) && !string.IsNullOrEmpty(_IsPA)) @@ -389,22 +329,6 @@ else { addItem.IsPA = outIsPA; } } if (!string.IsNullOrEmpty(_MaterialIndeX)) { if (!int.TryParse(_MaterialIndeX, out int outMaterialIndeX) && !string.IsNullOrEmpty(_MaterialIndeX)) { throw Oops.Oh($"第{index}è¡[é¯åå¾å·]{_MaterialIndeX}å¼ä¸æ£ç¡®ï¼"); } if (outMaterialIndeX <= 0 && !string.IsNullOrEmpty(_MaterialIndeX)) { throw Oops.Oh($"第{index}è¡[é¯åå¾å·]{_MaterialIndeX}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.MaterialIndeX = outMaterialIndeX; } } @@ -452,18 +376,6 @@ } if (!string.IsNullOrEmpty(_Info4)) { addItem.Info4 = (string)(_Info4.Trim()); } if (!string.IsNullOrEmpty(_Info5)) { addItem.Info5 = (string)(_Info5.Trim()); } if (!string.IsNullOrEmpty(_Info6)) { addItem.Info6 = (string)(_Info6.Trim()); } if (!string.IsNullOrEmpty(_Info7)) { addItem.Info7 = (string)(_Info7.Trim()); @@ -516,6 +428,10 @@ { addItem.Info16 = (string)(_Info16.Trim()); } if(!string.IsNullOrEmpty(_Info17)) { addItem.Info17 = (string)(_Info17.Trim()); } #endregion @@ -553,14 +469,13 @@ { var query = _rep.AsQueryable() .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.PlanNo.Contains(input.SearchKey.Trim()) u.UPI.Contains(input.SearchKey.Trim()) || u.PlanNo.Contains(input.SearchKey.Trim()) || u.OrderId.Contains(input.SearchKey.Trim()) || u.UPI.Contains(input.SearchKey.Trim()) || u.Info5.Contains(input.SearchKey.Trim()) || u.DetailName.Contains(input.SearchKey.Trim()) || u.Matgrid.Contains(input.SearchKey.Trim()) || u.PackageCode.Contains(input.SearchKey.Trim()) || u.Info4.Contains(input.SearchKey.Trim()) || u.Info5.Contains(input.SearchKey.Trim()) || u.Info6.Contains(input.SearchKey.Trim()) || u.Info7.Contains(input.SearchKey.Trim()) || u.Info8.Contains(input.SearchKey.Trim()) @@ -571,25 +486,22 @@ || u.Info13.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()) || u.UpdateUserName.Contains(input.SearchKey.Trim()) ) .WhereIF(input.AreaCode.HasValue, u => u.AreaCode == input.AreaCode) .WhereIF(input.UpiStatus.HasValue, u => u.UpiStatus == input.UpiStatus) .WhereIF(!string.IsNullOrWhiteSpace(input.UPI), u => u.UPI.Contains(input.UPI.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.PlanNo), u => u.PlanNo.Contains(input.PlanNo.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.UPI), u => u.UPI.Contains(input.UPI.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim())) .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(!string.IsNullOrWhiteSpace(input.Matgrid), u => u.Matgrid.Contains(input.Matgrid.Trim())) .WhereIF(input.IsEB > 0, u => u.IsEB == input.IsEB) .WhereIF(input.DRNum > 0, u => u.DRNum == input.DRNum) .WhereIF(input.IsPA > 0, u => u.IsPA == input.IsPA) .WhereIF(input.MaterialIndeX > 0, u => u.MaterialIndeX == input.MaterialIndeX) .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(!string.IsNullOrWhiteSpace(input.Info4), u => u.Info4.Contains(input.Info4.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.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())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info8), u => u.Info8.Contains(input.Info8.Trim())) @@ -601,6 +513,7 @@ .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())) .Select<Mes_BatchOrderUPI_NewOutput>(); return query; } @@ -648,7 +561,6 @@ } #endregion } Binary files differ
