From 59e703685d36818247da3fcd101ca72e691d86de Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 27 11月 2024 10:05:57 +0800
Subject: [PATCH] 222
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs | 58 -
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue | 100 +--
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs | 128 ++---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue | 94 +--
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs | 107 ++--
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs | 788 +++++++++++++++-------------------
LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/批次数据导入模板.xlsx | 0
7 files changed, 537 insertions(+), 738 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
index 9b00e9f..5e346a1 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
+++ b/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',},],
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
index 03554ee..187d450 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
+++ b/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="" />
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs
index e354693..77a7d63 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs
+++ b/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鏂板瀛楁 銆怑ditby 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鏂板瀛楁 銆怑ditby 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>
- /// 鎵撳瓟璁惧缂栧彿 銆怑ditBy shaocx,2022-05-28銆�
- /// 0锛氫笉鎵撳瓟
- /// 1锛氬洓闈㈤捇
- /// 2锛氳豹杩堝叚闈㈤捇
- /// 5锛氬崡鍏村叚闈㈤捇
- /// </summary>
- [SugarColumn(ColumnName = "DRNum", ColumnDescription = "鎵撳瓟璁惧缂栧彿")]
- public int? DRNum { get; set; }
+ ///// <summary>
+ ///// 鎵撳瓟璁惧缂栧彿 銆怑ditBy 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,18 +122,18 @@
#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; }
-
+
[SugarColumn(ColumnName = "Info1", ColumnDescription = "绾哥闀�", Length = 50)]
public float? Info1 { 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>
/// 绗嚑鍖�
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs
index 2dd31e9..a7e559b 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs
+++ b/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>
/// 閮ㄤ欢鍚嶇О
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs
index 6ee81d5..6488fce 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs
+++ b/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; }
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs
index d3bcc88..130f7d3 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs
+++ b/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>
/// 鎵规鏁版嵁鏈嶅姟
@@ -95,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();
}
@@ -118,7 +115,7 @@
#region 瀵煎叆
-
+
/// <summary>
/// Excel妯℃澘瀵煎叆鎵规鏁版嵁鍔熻兘
/// </summary>
@@ -128,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>
@@ -151,373 +148,292 @@
{
index++;
//瀵煎叆妯＄増瀹氬埗鍖栦唬鐮侊紙鏇挎崲妯＄増浣跨敤锛�
-
- var addItem = new Mes_BatchOrderUPI_New();
- #region 瀹氫箟鍙橀噺
- var _AreaCode = "";//鎵�鍦ㄥ尯鍩�
- var _UpiStatus = "";//鏉挎枡鐘舵��
- var _PlanNo = "";//鎵规鍙�
- var _OrderId = "";//璁㈠崟鍙�
- var _UPI = "";//閮ㄤ欢鏉＄爜
- 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 = "";//浜у搧鍚嶇О
- var _Info10 = "";//瀹㈡埛鍚嶇О
- var _Info9 = "";//鍖呰缂栫爜
- var _Info11 = "";//鑷彁or鍙戣揣
- var _Info12 = "";//鍖呰閮ㄤ欢鎬绘暟閲�
- var _Info13 = "";//鍖呰闈㈢Н
- var _Info14 = "";//閮ㄤ欢鍚嶇О
- var _Info15 = "";//閮ㄤ欢鏁伴噺
- var _Info16 = "";//閮ㄤ欢灏哄
- #endregion
-
-
- #region 鍙栧��
- _AreaCode = row["鎵�鍦ㄥ尯鍩�"]?.ToString();
- _UpiStatus = row["鏉挎枡鐘舵��"]?.ToString();
- _PlanNo = row["鎵规鍙�"]?.ToString();
- _OrderId = row["璁㈠崟鍙�"]?.ToString();
- _UPI = 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();
- _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();
- #endregion
-
-
- #region 楠岃瘉
- 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(_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}涓嶈兘涓虹┖锛�");
- }
-
- if (!string.IsNullOrEmpty(_DetailName))
- {
- addItem.DetailName = (string)(_DetailName.Trim());
- }
-
- if (string.IsNullOrEmpty(_Length))
- {
- 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))
- {
- 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;
- }
-
- }
- 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))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁浼樺寲鍖呰]{_IsPA}鍊间笉姝ｇ‘锛�");
- }
- if (outIsPA <= 0 && !string.IsNullOrEmpty(_IsPA))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁浼樺寲鍖呰]{_IsPA}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- 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;
- }
-
- }
-
- 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(_Info5))
- {
- addItem.Info5 = (string)(_Info5.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());
- }
- #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 = "";//鏈烘鑷傛槸鍚︽棆杞�
+ #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() ;
+ #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(_Thk))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鍘歖{_Thk}涓嶈兘涓虹┖锛�");
+ }
+
+
+ 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(_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());
+ }
+ #endregion
+
details.Add(addItem);
}
@@ -525,7 +441,7 @@
await CheckExisitForImport(details);
return details;
}
-
+
/// <summary>
/// 鏍规嵁鐗堟湰涓嬭浇鎵规鏁版嵁鐨凟xcel瀵煎叆妯℃澘
/// </summary>
@@ -539,7 +455,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 绉佹湁鏂规硶
@@ -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.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(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(!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.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()))
@@ -599,56 +511,56 @@
.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(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;
- }
+ }
- /// <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="input">楠岃瘉瀵硅薄</param>
+ /// <param name="isEdit">鏄惁鏄紪杈�</param>
+ /// <returns></returns>
+ private async Task CheckExist( Mes_BatchOrderUPI_New input,bool isEdit=false)
{
- throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+
+
+
+ //娌℃湁閰嶇疆缁勫悎鏍￠獙锛屼笉闇�瑕侀獙閲�
+
+
+ //娌℃湁閰嶇疆鍗曠嫭鏍￠獙锛屼笉闇�瑕侀獙閲�
+ }
+
+ /// <summary>
+ /// 鏍规嵁缁勫悎鏍￠獙鍜屽崟鐙牎楠岄獙璇佹暟鎹槸鍚﹀凡瀛樺湪-瀵煎叆鏃堕獙璇�
+ /// </summary>
+ /// <param name="inputs"></param>
+ /// <returns></returns>
+ private async Task CheckExisitForImport(List<Mes_BatchOrderUPI_New> inputs)
+ {
+ if (inputs?.Count <= 0)
+ {
+ throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
+
+
+
+
+
+ //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
}
- //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
-
-
-
-
-
-
-
-
- //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
-
-
-
- }
- #endregion
-
+ #endregion
}
diff --git "a/LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/\346\211\271\346\254\241\346\225\260\346\215\256\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/\346\211\271\346\254\241\346\225\260\346\215\256\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index c56c236..c22d136 100644
--- "a/LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/\346\211\271\346\254\241\346\225\260\346\215\256\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/\346\211\271\346\254\241\346\225\260\346\215\256\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
--
Gitblit v1.9.3