From c00d4c5cda3af8e63a5969c58b9151b858e9105e Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 26 11月 2024 17:41:56 +0800
Subject: [PATCH] 222
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/GetBatchOrderUPIInput.cs | 189 ++++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs | 65 ++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs | 2
LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsRecordPrint/component/editDialog.vue | 7
LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/批次数据导入模板.xlsx | 0
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordPrint.cs | 7
LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsRecordPrint/index.vue | 9
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue | 95 +++
LA24030_LuLiPackageLine_Print/打印模板文件/包装条码模板_二维码.btw | 0
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs | 313 ++++------
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue | 91 +++
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs | 36 +
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs | 842 ++++++++++++++++-------------
13 files changed, 1,067 insertions(+), 589 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
index 581055e..90a1fcb 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
@@ -311,12 +311,36 @@
Dictionary<string, object> data = new Dictionary<string, object>();
if (printClassifyEnum == PrintClassifyEnum.鍖呰鏉＄爜)
{
- //data.Add("bar", item.SNCode);
- //data.Add("material", item.MaterialCode ?? "" + "/" + item.MaterialName ?? "");
- //data.Add("supplier", item.SupplierName ?? "");
- //data.Add("unit", item.MaterialUnit ?? "");
- //data.Add("qty", item.Quantity);
- //data.Add("date", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ data.Add("Info4", item.Info4);//鍚堝悓鍗曞彿
+ data.Add("Info5", item.Info5 ?? "");//鐢熶骇鍗曞彿
+ data.Add("Info6", "绗�" + (item.Info6 ?? "") + "鍖�");//绗嚑鍖�
+ data.Add("bar", item.PackageCode);//浜岀淮鐮侊紙鍖呭彿锛�
+ data.Add("Info7", item.Info7 ?? "");//缁忛攢搴�
+ data.Add("Info8", item.Info8 ?? "");//浜у搧
+ data.Add("Info9", item.PackageCode ?? "");//鍖呰缂栫爜
+ data.Add("Info10", item.Info10 ?? "");//瀹㈡埛鍚嶇О
+ data.Add("Info11", item.Info11 ?? "");//鑷彁or鍙戣揣
+ data.Add("Info12", "鍖呰鏄庣粏 閮ㄤ欢鎬绘暟" + item.Info12 ?? "");//閮ㄤ欢鏄庣粏
+ data.Add("Info13", item.Info13 ?? "");//褰撳墠鍖呴潰绉�
+ data.Add("printTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+
+ //鏌ヨ涓� 鍖呮暟鎹�
+ var mylist = mycontext.mes_batchOrderUPI_new.Where(x => x.PackageCode == item.PackageCode).ToList();
+ var gg = mylist.GroupBy(x => x.DetailName);
+ int i = 0;
+ foreach (var g in gg)
+ {
+ i++;
+ data.Add("detail_" + i, g.Key ?? "");//閮ㄤ欢鍚嶇О
+ data.Add("detail_" + i + "_length", g.ToList().First().Info16 ?? "");//閮ㄤ欢灏哄
+ data.Add("detail_" + i + "_number", g.ToList().Count());//閮ㄤ欢鏁伴噺
+ }
+ for (int p = (i + 1); p <= 6; p++)
+ {
+ data.Add("detail_" + p, "");//閮ㄤ欢鍚嶇О
+ data.Add("detail_" + p + "_length", "");//閮ㄤ欢灏哄
+ data.Add("detail_" + p + "_number", "");//閮ㄤ欢鏁伴噺
+ }
}
else
{
diff --git "a/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw" "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
index a028fb9..a40d44f 100644
--- "a/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
+++ "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
Binary files differ
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsRecordPrint/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsRecordPrint/component/editDialog.vue
index c1b3e13..6564ec7 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsRecordPrint/component/editDialog.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsRecordPrint/component/editDialog.vue
@@ -82,13 +82,6 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
- <el-form-item label="鍖呰缂栫爜" prop="info9">
- <el-input v-model="ruleForm.info9" 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="鑷彁or鍙戣揣" prop="info11">
<el-input v-model="ruleForm.info11" placeholder="璇疯緭鍏ヨ嚜鎻恛r鍙戣揣" maxlength="60" show-word-limit clearable />
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsRecordPrint/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsRecordPrint/index.vue
index f6a1f2d..bfdc572 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsRecordPrint/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsRecordPrint/index.vue
@@ -5,7 +5,7 @@
<el-row>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
<el-form-item label="鍏抽敭瀛�">
- <el-input v-model="queryParamsWmsRecordPrint.searchKey" clearable="" placeholder="鍖呰鍙�,閿�鍞悎鍚屽崟鍙�,鐢熶骇鍗曞彿,绗嚑鍖�,缁忛攢搴楀悕绉�,浜у搧鍚嶇О,瀹㈡埛鍚嶇О,鍖呰缂栫爜,鑷彁or鍙戣揣,鍖呰閮ㄤ欢鎬绘暟閲�,鍖呰闈㈢Н,閮ㄤ欢鍚嶇О,閮ㄤ欢灏哄,澶囨敞,鍒涘缓浜�,淇敼浜�"/>
+ <el-input v-model="queryParamsWmsRecordPrint.searchKey" clearable="" placeholder="鍖呰鍙�,閿�鍞悎鍚屽崟鍙�,鐢熶骇鍗曞彿,绗嚑鍖�,缁忛攢搴楀悕绉�,浜у搧鍚嶇О,瀹㈡埛鍚嶇О,鑷彁or鍙戣揣,鍖呰閮ㄤ欢鎬绘暟閲�,鍖呰闈㈢Н,閮ㄤ欢鍚嶇О,閮ㄤ欢灏哄,澶囨敞,鍒涘缓浜�,淇敼浜�"/>
</el-form-item>
</el-col>
@@ -66,12 +66,6 @@
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRecordPrint">
<el-form-item label="瀹㈡埛鍚嶇О">
<el-input v-model="queryParamsWmsRecordPrint.info10" clearable="" placeholder="璇疯緭鍏ュ鎴峰悕绉�"/>
-
- </el-form-item>
- </el-col>
- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRecordPrint">
- <el-form-item label="鍖呰缂栫爜">
- <el-input v-model="queryParamsWmsRecordPrint.info9" clearable="" placeholder="璇疯緭鍏ュ寘瑁呯紪鐮�"/>
</el-form-item>
</el-col>
@@ -190,7 +184,6 @@
<el-table-column prop="info7" label="缁忛攢搴楀悕绉�" show-overflow-tooltip="" />
<el-table-column prop="info8" label="浜у搧鍚嶇О" show-overflow-tooltip="" />
<el-table-column prop="info10" label="瀹㈡埛鍚嶇О" show-overflow-tooltip="" />
- <el-table-column prop="info9" label="鍖呰缂栫爜" show-overflow-tooltip="" />
<el-table-column prop="info11" label="鑷彁or鍙戣揣" show-overflow-tooltip="" />
<el-table-column prop="info12" label="鍖呰閮ㄤ欢鎬绘暟閲�" show-overflow-tooltip="" />
<el-table-column prop="info13" label="鍖呰闈㈢Н" show-overflow-tooltip="" />
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 a79861a..9b00e9f 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
@@ -186,6 +186,97 @@
</el-form-item>
</el-col>
+ <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>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="绗嚑鍖�" prop="info6">
+ <el-input v-model="ruleForm.info6" 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="info7">
+ <el-input v-model="ruleForm.info7" 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="info8">
+ <el-input v-model="ruleForm.info8" 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="info10">
+ <el-input v-model="ruleForm.info10" 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="info9">
+ <el-input v-model="ruleForm.info9" 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="鑷彁or鍙戣揣" prop="info11">
+ <el-input v-model="ruleForm.info11" placeholder="璇疯緭鍏ヨ嚜鎻恛r鍙戣揣" 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="info12">
+ <el-input v-model="ruleForm.info12" 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="info13">
+ <el-input v-model="ruleForm.info13" placeholder="璇疯緭鍏ュ寘瑁呴潰绉�" maxlength="60" show-word-limit clearable />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="閮ㄤ欢鍚嶇О" prop="info14">
+ <el-input v-model="ruleForm.info14" placeholder="璇疯緭鍏ラ儴浠跺悕绉�" maxlength="60" show-word-limit clearable />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="閮ㄤ欢鏁伴噺" prop="info15">
+ <el-input-number v-model="ruleForm.info15" 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="info16">
+ <el-input v-model="ruleForm.info16" placeholder="璇疯緭鍏ラ儴浠跺昂瀵�" maxlength="60" show-word-limit clearable />
+
+ </el-form-item>
+
+ </el-col>
</el-row>
</el-form>
<template #footer>
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 7889af6..03554ee 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,7 @@
<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="鎵规鍙�,璁㈠崟鍙�,閮ㄤ欢鏉＄爜,閮ㄤ欢鍚嶇О,閮ㄤ欢绾圭悊,鍖呰鍙�,鍒涘缓浜�,淇敼浜�"/>
+ <el-input v-model="queryParamsMes_BatchOrderUPI_New.searchKey" clearable="" placeholder="鎵规鍙�,璁㈠崟鍙�,閮ㄤ欢鏉＄爜,閮ㄤ欢鍚嶇О,閮ㄤ欢绾圭悊,鍖呰鍙�,閿�鍞悎鍚屽崟鍙�,鐢熶骇鍗曞彿,绗嚑鍖�,缁忛攢搴楀悕绉�,浜у搧鍚嶇О,瀹㈡埛鍚嶇О,鍖呰缂栫爜,鑷彁or鍙戣揣,鍖呰閮ㄤ欢鎬绘暟閲�,鍖呰闈㈢Н,閮ㄤ欢鍚嶇О,閮ㄤ欢灏哄,鍒涘缓浜�,淇敼浜�"/>
</el-form-item>
</el-col>
@@ -159,6 +159,84 @@
</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.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>
+ <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.info6" 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.info7" 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.info8" 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.info10" 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.info9" 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="鑷彁or鍙戣揣">
+ <el-input v-model="queryParamsMes_BatchOrderUPI_New.info11" clearable="" placeholder="璇疯緭鍏ヨ嚜鎻恛r鍙戣揣"/>
+
+ </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.info12" 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.info13" 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.info14" clearable="" placeholder="璇疯緭鍏ラ儴浠跺悕绉�"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
+ <el-form-item label="閮ㄤ欢鏁伴噺">
+ <el-input-number v-model="queryParamsMes_BatchOrderUPI_New.info15" clearable="" placeholder="璇疯緭鍏ラ儴浠舵暟閲�"/>
+
+ </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.info16" 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;">
@@ -199,7 +277,7 @@
</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="閮ㄤ欢鏉＄爜" width="200px" 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="" />
@@ -219,6 +297,19 @@
<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="" />
+ <el-table-column prop="info10" label="瀹㈡埛鍚嶇О" show-overflow-tooltip="" />
+ <el-table-column prop="info9" label="鍖呰缂栫爜" show-overflow-tooltip="" />
+ <el-table-column prop="info11" label="鑷彁or鍙戣揣" show-overflow-tooltip="" />
+ <el-table-column prop="info12" label="鍖呰閮ㄤ欢鎬绘暟閲�" show-overflow-tooltip="" />
+ <el-table-column prop="info13" label="鍖呰闈㈢Н" show-overflow-tooltip="" />
+ <el-table-column prop="info14" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" />
+ <el-table-column prop="info15" label="閮ㄤ欢鏁伴噺" show-overflow-tooltip="" />
+ <el-table-column prop="info16" label="閮ㄤ欢灏哄" show-overflow-tooltip="" />
<el-table-column prop="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/WmsStockQuan/WmsRecordPrint.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordPrint.cs
index 51c0d9f..f6cc3b6 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordPrint.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordPrint.cs
@@ -73,12 +73,7 @@
[SugarColumn(ColumnName = "Info10", ColumnDescription = "瀹㈡埛鍚嶇О", Length = 60)]
public string? Info10 { get; set; }
- /// <summary>
- /// 鍖呰缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "Info9", ColumnDescription = "鍖呰缂栫爜", Length = 60)]
- public string? Info9 { get; set; }
-
+
/// <summary>
/// 鑷彁or鍙戣揣
/// </summary>
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs
index 6aad65b..f3edd47 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs
@@ -133,7 +133,6 @@
|| u.Info7.Contains(input.SearchKey.Trim())
|| u.Info8.Contains(input.SearchKey.Trim())
|| u.Info10.Contains(input.SearchKey.Trim())
- || u.Info9.Contains(input.SearchKey.Trim())
|| u.Info11.Contains(input.SearchKey.Trim())
|| u.Info12.Contains(input.SearchKey.Trim())
|| u.Info13.Contains(input.SearchKey.Trim())
@@ -152,7 +151,6 @@
.WhereIF(!string.IsNullOrWhiteSpace(input.Info7), u => u.Info7.Contains(input.Info7.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Info8), u => u.Info8.Contains(input.Info8.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Info10), u => u.Info10.Contains(input.Info10.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.Info9), u => u.Info9.Contains(input.Info9.Trim()))
.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()))
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/GetBatchOrderUPIInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/GetBatchOrderUPIInput.cs
new file mode 100644
index 0000000..ce7d92d
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/GetBatchOrderUPIInput.cs
@@ -0,0 +1,189 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Admin.NET.Application.Service.WmsOrder.Mes_BatchOrderUPI_New.Dto;
+public class GetBatchOrderUPIInput
+{
+ [Required]
+ [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "鎵规鍙�", Length = 50)]
+ public string PlanNo { get; set; }
+
+ [Required]
+ [SugarColumn(ColumnName = "OrderId", ColumnDescription = "璁㈠崟鍙�", Length = 50)]
+ public string OrderId { get; set; }
+
+ [Required]
+ [SugarColumn(ColumnName = "UPI", ColumnDescription = "閮ㄤ欢鏉＄爜", Length = 50)]
+ public string UPI { get; set; }
+
+ [Required]
+ [SugarColumn(ColumnName = "DetailName", ColumnDescription = "閮ㄤ欢鍚嶇О", Length = 50)]
+ public string DetailName { get; set; }
+
+
+ [SugarColumn(ColumnName = "Length", ColumnDescription = "闀�")]
+ public float Length { get; set; }
+
+ [SugarColumn(ColumnName = "Width", ColumnDescription = "瀹�")]
+ public float Width { get; set; }
+
+ [SugarColumn(ColumnName = "Thk", ColumnDescription = "鍘�")]
+ public float Thk { get; set; }
+
+ [SugarColumn(ColumnName = "Matgrid", ColumnDescription = "閮ㄤ欢绾圭悊", Length = 50)]
+ public string? Matgrid { 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; }
+
+ [SugarColumn(ColumnName = "IsPA", ColumnDescription = "鏄惁浼樺寲鍖呰")]
+ public int? IsPA { get; set; }
+
+ /// <summary>
+ /// 閿垏鍥惧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "MaterialIndeX", ColumnDescription = "閿垏鍥惧彿")]
+ public int? MaterialIndeX { get; set; }
+
+
+ #region 鍖呰绾挎湁鍏�
+
+ [Required]
+ [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "鍖呰鍙�", Length = 50)]
+ public string PackageCode { get; set; }
+
+ [Required]
+ [SugarColumn(ColumnName = "MachineXCenter", ColumnDescription = "鍖呰X鍧愭爣", Length = 50)]
+ public float? MachineXCenter { get; set; }
+
+ [Required]
+ [SugarColumn(ColumnName = "MachineYCenter", ColumnDescription = "鍖呰Y鍧愭爣", Length = 50)]
+ public float? MachineYCenter { get; set; }
+
+ [Required]
+ [SugarColumn(ColumnName = "MachineZCenter", ColumnDescription = "鍖呰Z鍧愭爣", Length = 50)]
+ public float? MachineZCenter { get; set; }
+
+ [Required]
+ [SugarColumn(ColumnName = "Sequence", ColumnDescription = "灞傛暟", Length = 50)]
+ public int? Sequence { get; set; }
+
+ [Required]
+ [SugarColumn(ColumnName = "Shelf", ColumnDescription = "娆″簭", Length = 50)]
+ public int? Shelf { get; set; }
+
+ #endregion
+
+
+ /// <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; }
+
+ [SugarColumn(ColumnName = "Info2", ColumnDescription = "绾哥瀹�", Length = 50)]
+ public float? Info2 { get; set; }
+
+ [SugarColumn(ColumnName = "Info3", ColumnDescription = "绾哥楂�", Length = 50)]
+ public float? Info3 { get; set; }
+ /// <summary>
+ /// 閿�鍞悎鍚屽崟鍙�
+ /// </summary>
+ [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>
+ /// 绗嚑鍖�
+ /// </summary>
+ [SugarColumn(ColumnName = "Info6", ColumnDescription = "绗嚑鍖�", Length = 60)]
+ public string? Info6 { get; set; }
+
+ /// <summary>
+ /// 缁忛攢搴楀悕绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "Info7", ColumnDescription = "缁忛攢搴楀悕绉�", Length = 60)]
+ public string? Info7 { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "Info8", ColumnDescription = "浜у搧鍚嶇О", Length = 60)]
+ public string? Info8 { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "Info10", ColumnDescription = "瀹㈡埛鍚嶇О", Length = 60)]
+ public string? Info10 { get; set; }
+
+ /// <summary>
+ /// 鍖呰缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "Info9", ColumnDescription = "鍖呰缂栫爜", Length = 60)]
+ public string? Info9 { get; set; }
+
+ /// <summary>
+ /// 鑷彁or鍙戣揣
+ /// </summary>
+ [SugarColumn(ColumnName = "Info11", ColumnDescription = "鑷彁or鍙戣揣", Length = 60)]
+ public string? Info11 { get; set; }
+
+ /// <summary>
+ /// 鍖呰閮ㄤ欢鎬绘暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "Info12", ColumnDescription = "鍖呰閮ㄤ欢鎬绘暟閲�", Length = 60)]
+ public string? Info12 { get; set; }
+
+ /// <summary>
+ /// 鍖呰闈㈢Н
+ /// </summary>
+ [SugarColumn(ColumnName = "Info13", ColumnDescription = "鍖呰闈㈢Н", Length = 60)]
+ public string? Info13 { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "Info14", ColumnDescription = "閮ㄤ欢鍚嶇О", Length = 60)]
+ public string? Info14 { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "Info15", ColumnDescription = "閮ㄤ欢鏁伴噺")]
+ public int? Info15 { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢灏哄
+ /// </summary>
+ [SugarColumn(ColumnName = "Info16", ColumnDescription = "閮ㄤ欢灏哄", Length = 60)]
+ public string? Info16 { get; set; }
+}
+
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 60db6c3..2dd31e9 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
@@ -129,6 +129,71 @@
public virtual float? Info3 { get; set; }
/// <summary>
+ /// 閿�鍞悎鍚屽崟鍙�
+ /// </summary>
+ public virtual string Info4 { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鍗曞彿
+ /// </summary>
+ public virtual string Info5 { get; set; }
+
+ /// <summary>
+ /// 绗嚑鍖�
+ /// </summary>
+ public virtual string Info6 { get; set; }
+
+ /// <summary>
+ /// 缁忛攢搴楀悕绉�
+ /// </summary>
+ public virtual string Info7 { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ /// </summary>
+ public virtual string Info8 { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鍚嶇О
+ /// </summary>
+ public virtual string Info10 { get; set; }
+
+ /// <summary>
+ /// 鍖呰缂栫爜
+ /// </summary>
+ public virtual string Info9 { get; set; }
+
+ /// <summary>
+ /// 鑷彁or鍙戣揣
+ /// </summary>
+ public virtual string Info11 { get; set; }
+
+ /// <summary>
+ /// 鍖呰閮ㄤ欢鎬绘暟閲�
+ /// </summary>
+ public virtual string Info12 { get; set; }
+
+ /// <summary>
+ /// 鍖呰闈㈢Н
+ /// </summary>
+ public virtual string Info13 { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢鍚嶇О
+ /// </summary>
+ public virtual string Info14 { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢鏁伴噺
+ /// </summary>
+ public virtual int? Info15 { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢灏哄
+ /// </summary>
+ public virtual string Info16 { get; set; }
+
+ /// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
public virtual DateTime? CreateTime { get; set; }
@@ -295,6 +360,71 @@
/// </summary>
public float? Info3 { get; set; }
+ /// <summary>
+ /// 閿�鍞悎鍚屽崟鍙�
+ /// </summary>
+ public string? Info4 { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鍗曞彿
+ /// </summary>
+ public string? Info5 { get; set; }
+
+ /// <summary>
+ /// 绗嚑鍖�
+ /// </summary>
+ public string? Info6 { get; set; }
+
+ /// <summary>
+ /// 缁忛攢搴楀悕绉�
+ /// </summary>
+ public string? Info7 { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ /// </summary>
+ public string? Info8 { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鍚嶇О
+ /// </summary>
+ public string? Info10 { get; set; }
+
+ /// <summary>
+ /// 鍖呰缂栫爜
+ /// </summary>
+ public string? Info9 { get; set; }
+
+ /// <summary>
+ /// 鑷彁or鍙戣揣
+ /// </summary>
+ public string? Info11 { get; set; }
+
+ /// <summary>
+ /// 鍖呰閮ㄤ欢鎬绘暟閲�
+ /// </summary>
+ public string? Info12 { get; set; }
+
+ /// <summary>
+ /// 鍖呰闈㈢Н
+ /// </summary>
+ public string? Info13 { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢鍚嶇О
+ /// </summary>
+ public string? Info14 { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢鏁伴噺
+ /// </summary>
+ public int? Info15 { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢灏哄
+ /// </summary>
+ public string? Info16 { get; set; }
+
}
/// <summary>
@@ -391,186 +521,3 @@
{
}
-
-public class GetBatchOrderUPIInput
-{
- [Required]
- [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "鎵规鍙�", Length = 50)]
- public string PlanNo { get; set; }
-
- [Required]
- [SugarColumn(ColumnName = "OrderId", ColumnDescription = "璁㈠崟鍙�", Length = 50)]
- public string OrderId { get; set; }
-
- [Required]
- [SugarColumn(ColumnName = "UPI", ColumnDescription = "閮ㄤ欢鏉＄爜", Length = 50)]
- public string UPI { get; set; }
-
- [Required]
- [SugarColumn(ColumnName = "DetailName", ColumnDescription = "閮ㄤ欢鍚嶇О", Length = 50)]
- public string DetailName { get; set; }
-
-
- [SugarColumn(ColumnName = "Length", ColumnDescription = "闀�")]
- public float Length { get; set; }
-
- [SugarColumn(ColumnName = "Width", ColumnDescription = "瀹�")]
- public float Width { get; set; }
-
- [SugarColumn(ColumnName = "Thk", ColumnDescription = "鍘�")]
- public float Thk { get; set; }
-
- [SugarColumn(ColumnName = "Matgrid", ColumnDescription = "閮ㄤ欢绾圭悊", Length = 50)]
- public string? Matgrid { 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; }
-
- [SugarColumn(ColumnName = "IsPA", ColumnDescription = "鏄惁浼樺寲鍖呰")]
- public int? IsPA { get; set; }
-
- /// <summary>
- /// 閿垏鍥惧彿
- /// </summary>
- [SugarColumn(ColumnName = "MaterialIndeX", ColumnDescription = "閿垏鍥惧彿")]
- public int? MaterialIndeX { get; set; }
-
-
- #region 鍖呰绾挎湁鍏�
-
- [Required]
- [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "鍖呰鍙�", Length = 50)]
- public string PackageCode { get; set; }
-
- [Required]
- [SugarColumn(ColumnName = "MachineXCenter", ColumnDescription = "鍖呰X鍧愭爣", Length = 50)]
- public float? MachineXCenter { get; set; }
-
- [Required]
- [SugarColumn(ColumnName = "MachineYCenter", ColumnDescription = "鍖呰Y鍧愭爣", Length = 50)]
- public float? MachineYCenter { get; set; }
-
- [Required]
- [SugarColumn(ColumnName = "MachineZCenter", ColumnDescription = "鍖呰Z鍧愭爣", Length = 50)]
- public float? MachineZCenter { get; set; }
-
- [Required]
- [SugarColumn(ColumnName = "Sequence", ColumnDescription = "灞傛暟", Length = 50)]
- public int? Sequence { get; set; }
-
- [Required]
- [SugarColumn(ColumnName = "Shelf", ColumnDescription = "娆″簭", Length = 50)]
- public int? Shelf { get; set; }
-
- #endregion
-
-
- /// <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; }
-
- [SugarColumn(ColumnName = "Info2", ColumnDescription = "绾哥瀹�", Length = 50)]
- public float? Info2 { get; set; }
-
- [SugarColumn(ColumnName = "Info3", ColumnDescription = "绾哥楂�", Length = 50)]
- public float? Info3 { get; set; }
- /// <summary>
- /// 閿�鍞悎鍚屽崟鍙�
- /// </summary>
- [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>
- /// 绗嚑鍖�
- /// </summary>
- [SugarColumn(ColumnName = "Info6", ColumnDescription = "绗嚑鍖�", Length = 60)]
- public string? Info6 { get; set; }
-
- /// <summary>
- /// 缁忛攢搴楀悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "Info7", ColumnDescription = "缁忛攢搴楀悕绉�", Length = 60)]
- public string? Info7 { get; set; }
-
- /// <summary>
- /// 浜у搧鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "Info8", ColumnDescription = "浜у搧鍚嶇О", Length = 60)]
- public string? Info8 { get; set; }
-
- /// <summary>
- /// 瀹㈡埛鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "Info10", ColumnDescription = "瀹㈡埛鍚嶇О", Length = 60)]
- public string? Info10 { get; set; }
-
- /// <summary>
- /// 鍖呰缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "Info9", ColumnDescription = "鍖呰缂栫爜", Length = 60)]
- public string? Info9 { get; set; }
-
- /// <summary>
- /// 鑷彁or鍙戣揣
- /// </summary>
- [SugarColumn(ColumnName = "Info11", ColumnDescription = "鑷彁or鍙戣揣", Length = 60)]
- public string? Info11 { get; set; }
-
- /// <summary>
- /// 鍖呰閮ㄤ欢鎬绘暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "Info12", ColumnDescription = "鍖呰閮ㄤ欢鎬绘暟閲�", Length = 60)]
- public string? Info12 { get; set; }
-
- /// <summary>
- /// 鍖呰闈㈢Н
- /// </summary>
- [SugarColumn(ColumnName = "Info13", ColumnDescription = "鍖呰闈㈢Н", Length = 60)]
- public string? Info13 { get; set; }
-
- /// <summary>
- /// 閮ㄤ欢鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "Info14", ColumnDescription = "閮ㄤ欢鍚嶇О", Length = 60)]
- public string? Info14 { get; set; }
-
- /// <summary>
- /// 閮ㄤ欢鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "Info15", ColumnDescription = "閮ㄤ欢鏁伴噺")]
- public int? Info15 { get; set; }
-
- /// <summary>
- /// 閮ㄤ欢灏哄
- /// </summary>
- [SugarColumn(ColumnName = "Info16", ColumnDescription = "閮ㄤ欢灏哄", Length = 60)]
- public string? Info16 { get; set; }
-}
-
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 4f77f0e..6ee81d5 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
@@ -131,6 +131,71 @@
public float? Info3 { get; set; }
/// <summary>
+ /// 閿�鍞悎鍚屽崟鍙�
+ /// </summary>
+ public string Info4 { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鍗曞彿
+ /// </summary>
+ public string Info5 { get; set; }
+
+ /// <summary>
+ /// 绗嚑鍖�
+ /// </summary>
+ public string Info6 { get; set; }
+
+ /// <summary>
+ /// 缁忛攢搴楀悕绉�
+ /// </summary>
+ public string Info7 { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ /// </summary>
+ public string Info8 { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鍚嶇О
+ /// </summary>
+ public string Info10 { get; set; }
+
+ /// <summary>
+ /// 鍖呰缂栫爜
+ /// </summary>
+ public string Info9 { get; set; }
+
+ /// <summary>
+ /// 鑷彁or鍙戣揣
+ /// </summary>
+ public string Info11 { get; set; }
+
+ /// <summary>
+ /// 鍖呰閮ㄤ欢鎬绘暟閲�
+ /// </summary>
+ public string Info12 { get; set; }
+
+ /// <summary>
+ /// 鍖呰闈㈢Н
+ /// </summary>
+ public string Info13 { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢鍚嶇О
+ /// </summary>
+ public string Info14 { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢鏁伴噺
+ /// </summary>
+ public int? Info15 { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢灏哄
+ /// </summary>
+ public string Info16 { get; set; }
+
+ /// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
public 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 828eb19..24dc311 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
@@ -5,7 +5,7 @@
using System.Web;
using System.Text;
using Furion.DatabaseAccessor;
-using Mapster;
+using Admin.NET.Application.Service.WmsOrder.Mes_BatchOrderUPI_New.Dto;
namespace Admin.NET.Application;
/// <summary>
@@ -95,7 +95,7 @@
var entity = input.Adapt<Mes_BatchOrderUPI_New>();
//閲嶅鎬ч獙璇�
- await CheckExist(entity, true);
+ await CheckExist(entity,true);
await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
}
@@ -113,28 +113,12 @@
return await _rep.GetFirstAsync(u => u.Id == input.Id);
}
- [HttpPost]
- [ApiDescriptionSettings(Name = "GetBatchOrderUPIList")]
- [UnitOfWork]
- [AllowAnonymous]
- public async Task GetBatchOrderUPIList(List<GetBatchOrderUPIInput> input)
- {
- List<Mes_BatchOrderUPI_New> list = new List<Mes_BatchOrderUPI_New>();
- foreach (var item in input)
- {
- Mes_BatchOrderUPI_New task = new Mes_BatchOrderUPI_New();
- task = item.Adapt<Mes_BatchOrderUPI_New>();
- task.AreaCode = AreaCodeEnum.鏃犲尯鍩�;
- task.UpiStatus = UpiStatusEnum.鍒濆;
- list.Add(task);
- }
- await _rep.InsertRangeAsync(list);
- }
+
#region 瀵煎叆
-
+
/// <summary>
/// Excel妯℃澘瀵煎叆鎵规鏁版嵁鍔熻兘
/// </summary>
@@ -144,15 +128,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>
@@ -167,309 +151,373 @@
{
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 = "";//绾哥楂�
- #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();
- #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(_MachineXCenter))
- //{
- // addItem.MachineXCenter = (float)(_MachineXCenter.Trim());
- // }
- //if(!string.IsNullOrEmpty(_MachineYCenter))
- //{
- // addItem.MachineYCenter = (float)(_MachineYCenter.Trim());
- // }
- //if(!string.IsNullOrEmpty(_MachineZCenter))
- //{
- // addItem.MachineZCenter = (float)(_MachineZCenter.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(_Rotation))
- //{
- // addItem.Rotation = (float)(_Rotation.Trim());
- // }
- //if(!string.IsNullOrEmpty(_Info1))
- //{
- // addItem.Info1 = (float)(_Info1.Trim());
- // }
- //if(!string.IsNullOrEmpty(_Info2))
- //{
- // addItem.Info2 = (float)(_Info2.Trim());
- // }
- //if(!string.IsNullOrEmpty(_Info3))
- //{
- // addItem.Info3 = (float)(_Info3.Trim());
- // }
- #endregion
-
+
+ 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
+
details.Add(addItem);
}
@@ -477,7 +525,7 @@
await CheckExisitForImport(details);
return details;
}
-
+
/// <summary>
/// 鏍规嵁鐗堟湰涓嬭浇鎵规鏁版嵁鐨凟xcel瀵煎叆妯℃澘
/// </summary>
@@ -491,7 +539,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 绉佹湁鏂规硶
@@ -511,6 +559,18 @@
|| 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())
+ || u.Info10.Contains(input.SearchKey.Trim())
+ || u.Info9.Contains(input.SearchKey.Trim())
+ || 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.Info16.Contains(input.SearchKey.Trim())
|| u.CreateUserName.Contains(input.SearchKey.Trim())
|| u.UpdateUserName.Contains(input.SearchKey.Trim())
)
@@ -521,60 +581,92 @@
.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(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(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()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info10), u => u.Info10.Contains(input.Info10.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info9), u => u.Info9.Contains(input.Info9.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info11), u => u.Info11.Contains(input.Info11.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info12), u => u.Info12.Contains(input.Info12.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info13), u => u.Info13.Contains(input.Info13.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info14), u => u.Info14.Contains(input.Info14.Trim()))
+ .WhereIF(input.Info15>0, u => u.Info15 == input.Info15)
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info16), u => u.Info16.Contains(input.Info16.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
+
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "GetBatchOrderUPIList")]
+ [UnitOfWork]
+ [AllowAnonymous]
+ public async Task GetBatchOrderUPIList(List<GetBatchOrderUPIInput> input)
+ {
+ List<Mes_BatchOrderUPI_New> list = new List<Mes_BatchOrderUPI_New>();
+ foreach (var item in input)
+ {
+ Mes_BatchOrderUPI_New task = new Mes_BatchOrderUPI_New();
+ task = item.Adapt<Mes_BatchOrderUPI_New>();
+ task.AreaCode = AreaCodeEnum.鏃犲尯鍩�;
+ task.UpiStatus = UpiStatusEnum.鍒濆;
+ list.Add(task);
+ }
+ await _rep.InsertRangeAsync(list);
+ }
+
}
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 4dc5348..c56c236 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