From 8bfe5dcf83cdcaa90c45ad86a8b464238748de7c Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周日, 01 12月 2024 16:02:38 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/GetBatchOrderUPIInput.cs | 16
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs | 16
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/Dto/WmsRecordPrintOutput.cs | 8
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs | 16
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs | 6
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs | 2
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordPrint.cs | 10
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/Dto/WmsRecordPrintInput.cs | 16
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue | 16
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs | 952 +++++++++++++++---------------
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue | 14
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs | 718 +++++++++++-----------
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs | 8
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/DataProcess_BZ21.cs | 15
14 files changed, 927 insertions(+), 886 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
index 5778a5c..5627637 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
@@ -132,7 +132,9 @@
mesgather.AreaCode = (int)AreaCodeEnum.鍚堝寘瑁佸垏鍖�;
mesgather.UpiStatus = (int)UpiStatusEnum.宸插悎鍖�;
}
-
+ var upilist=wmsDB.mes_batchOrderUPI_new.Where(x=>x.PackageCode==upiObj.PackageCode).ToList();
+ var upilength = upilist.Max(x => x.Length);
+ var upiwidth= upilist.Max(x => x.Width);
cartonhigh = (short)upiObj.Info3;
cartonwidth = (short)upiObj.Info2;
upiObj.UpiStatus = (int)UpiStatusEnum.宸插悎鍖�;
@@ -194,7 +196,14 @@
print.IsAllowPrint= true;
print.CreateTime = print.UpdateTime = DateTime.Now;
wmsDB.wms_record_print.Add(print);
- wms_record_print printtwo = print;
+ var printtwo = ClassHelper.RotationMapping<wms_record_print, mes_batchOrderUPI_new>(upiObj);
+ printtwo.PrintType = (int)PrintTypeEnum.鍖呰鏉＄爜;
+ printtwo.PrintSource = (int)PrintSourceEnum.鍖呰鏉＄爜鎵撳嵃;
+ printtwo.PrintSheetNum = 1;
+ printtwo.PrintNum = 0;
+ printtwo.PrintStatus = (int)PrintStatuEnum.鏈墦鍗�;
+ printtwo.IsAllowPrint = true;
+ printtwo.CreateTime = print.UpdateTime = DateTime.Now;
printtwo.Id= Yitter.IdGenerator.YitIdHelper.NextId();
wmsDB.wms_record_print.Add(printtwo);
@@ -216,7 +225,7 @@
{
var plcres = client.WriteSurroundTaskInfo((int)EDevice.Station, rgvLocation, short.Parse(task.TaskNo),
- (short)upiObj.Length, (short)upiObj.Width, cartonhigh, cartonwidth, 0, 0);
+ (short)upilength, (short)upiwidth, cartonhigh, cartonwidth, 0, 0);
if (!plcres.result)
{
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 澶辫触,WriteInStoreTaskInfoAsync 杩斿洖:{plcres.resMsg}";
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 e3725a6..6dccf1b 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
@@ -68,6 +68,13 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鏉愭枡" prop="info18">
+ <el-input v-model="ruleForm.info18" 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="length">
<el-input v-model="ruleForm.length" placeholder="璇疯緭鍏ラ暱" maxlength="53" show-word-limit clearable />
@@ -217,13 +224,6 @@
<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>
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 6e9d331..846ba5d 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
@@ -58,6 +58,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.info18" 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.length" clearable="" placeholder="璇疯緭鍏ラ暱"/>
@@ -189,12 +195,7 @@
</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="璇疯緭鍏ラ儴浠舵暟閲�"/>
@@ -265,6 +266,7 @@
</template>
</el-table-column>
<el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" />
+ <el-table-column prop="info18" 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="" />
@@ -287,7 +289,7 @@
<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="info17" 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 2f0bdca..452bf15 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
@@ -205,11 +205,11 @@
[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 = "Info14", ColumnDescription = "閮ㄤ欢鍚嶇О", Length = 60)]
+ //public string? Info14 { get; set; }
/// <summary>
/// 閮ㄤ欢鏁伴噺
@@ -227,5 +227,11 @@
/// </summary>
[SugarColumn(ColumnName = "Info17", ColumnDescription = "鏈烘鑷傛槸鍚︽棆杞�", Length = 60)]
public string? Info17 { get; set; }
+
+ /// <summary>
+ /// 鏉愭枡
+ /// </summary>
+ [SugarColumn(ColumnName = "Info18", ColumnDescription = "鏉愭枡", Length = 60)]
+ public string? Info18 { get; set; }
}
}
\ No newline at end of file
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 f6cc3b6..215aa3e 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordPrint.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordPrint.cs
@@ -92,11 +92,11 @@
[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 = "Info14", ColumnDescription = "閮ㄤ欢鍚嶇О", Length = 60)]
+ //public string? Info14 { get; set; }
/// <summary>
/// 閮ㄤ欢鏁伴噺
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/Dto/WmsRecordPrintInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/Dto/WmsRecordPrintInput.cs
index db0cbdc..ba755b9 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/Dto/WmsRecordPrintInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/Dto/WmsRecordPrintInput.cs
@@ -73,10 +73,10 @@
/// </summary>
public virtual string Info13 { get; set; }
- /// <summary>
- /// 閮ㄤ欢鍚嶇О
- /// </summary>
- public virtual string Info14 { get; set; }
+ ///// <summary>
+ ///// 閮ㄤ欢鍚嶇О
+ ///// </summary>
+ //public virtual string Info14 { get; set; }
/// <summary>
/// 閮ㄤ欢鏁伴噺
@@ -225,10 +225,10 @@
/// </summary>
public string? Info13 { get; set; }
- /// <summary>
- /// 閮ㄤ欢鍚嶇О
- /// </summary>
- public string? Info14 { get; set; }
+ ///// <summary>
+ ///// 閮ㄤ欢鍚嶇О
+ ///// </summary>
+ //public string? Info14 { get; set; }
/// <summary>
/// 閮ㄤ欢鏁伴噺
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/Dto/WmsRecordPrintOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/Dto/WmsRecordPrintOutput.cs
index 28466e8..df3f23e 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/Dto/WmsRecordPrintOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/Dto/WmsRecordPrintOutput.cs
@@ -75,10 +75,10 @@
/// </summary>
public string Info13 { get; set; }
- /// <summary>
- /// 閮ㄤ欢鍚嶇О
- /// </summary>
- public string Info14 { get; set; }
+ ///// <summary>
+ ///// 閮ㄤ欢鍚嶇О
+ ///// </summary>
+ //public string Info14 { get; set; }
/// <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 f3edd47..3ae4043 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
@@ -136,7 +136,7 @@
|| u.Info11.Contains(input.SearchKey.Trim())
|| u.Info12.Contains(input.SearchKey.Trim())
|| u.Info13.Contains(input.SearchKey.Trim())
- || u.Info14.Contains(input.SearchKey.Trim())
+ //|| u.Info14.Contains(input.SearchKey.Trim())
|| u.Info16.Contains(input.SearchKey.Trim())
|| u.Remarks.Contains(input.SearchKey.Trim())
|| u.CreateUserName.Contains(input.SearchKey.Trim())
@@ -154,8 +154,8 @@
.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.Info14), u => u.Info14.Contains(input.Info14.Trim()))
+ .WhereIF(input.Info15 > 0, u => u.Info15 == input.Info15)
.WhereIF(!string.IsNullOrWhiteSpace(input.Info16), u => u.Info16.Contains(input.Info16.Trim()))
.WhereIF(input.PrintSheetNum>0, u => u.PrintSheetNum == input.PrintSheetNum)
.WhereIF(input.PrintNum>0, u => u.PrintNum == input.PrintNum)
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
index ce7d92d..93c182a 100644
--- 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
@@ -23,6 +23,12 @@
[SugarColumn(ColumnName = "DetailName", ColumnDescription = "閮ㄤ欢鍚嶇О", Length = 50)]
public string DetailName { get; set; }
+ /// <summary>
+ /// 鏉愭枡
+ /// </summary>
+ [SugarColumn(ColumnName = "Info18", ColumnDescription = "鏉愭枡", Length = 60)]
+ public string? Info18 { get; set; }
+
[SugarColumn(ColumnName = "Length", ColumnDescription = "闀�")]
public float Length { get; set; }
@@ -168,11 +174,11 @@
[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 = "Info14", ColumnDescription = "閮ㄤ欢鍚嶇О", Length = 60)]
+ //public string? Info14 { 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 6305717..49085c1 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
@@ -3,491 +3,503 @@
namespace Admin.NET.Application;
+/// <summary>
+/// 鎵规鏁版嵁鍩虹杈撳叆鍙傛暟
+/// </summary>
+public class Mes_BatchOrderUPI_NewBaseInput
+{
/// <summary>
- /// 鎵规鏁版嵁鍩虹杈撳叆鍙傛暟
+ /// 閮ㄤ欢鏉＄爜
/// </summary>
- public class Mes_BatchOrderUPI_NewBaseInput
- {
- /// <summary>
- /// 閮ㄤ欢鏉＄爜
- /// </summary>
- public virtual string UPI { get; set; }
-
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public virtual string PlanNo { get; set; }
-
- /// <summary>
- /// 璁㈠崟鍙�
- /// </summary>
- public virtual string OrderId { get; set; }
-
- /// <summary>
- /// 鐢熶骇鍗曞彿
- /// </summary>
- 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>
- /// 閮ㄤ欢鍚嶇О
- /// </summary>
- public virtual string DetailName { get; set; }
-
- /// <summary>
- /// 闀�
- /// </summary>
- public virtual float Length { get; set; }
-
- /// <summary>
- /// 瀹�
- /// </summary>
- public virtual float Width { get; set; }
-
- /// <summary>
- /// 鍘�
- /// </summary>
- public virtual float Thk { get; set; }
-
- /// <summary>
- /// 鏄惁浼樺寲鍖呰
- /// </summary>
- public virtual int? IsPA { get; set; }
-
- /// <summary>
- /// 鍖呰鍙�
- /// </summary>
- public virtual string PackageCode { get; set; }
-
- /// <summary>
- /// 鍖呰X鍧愭爣
- /// </summary>
- public virtual float? MachineXCenter { get; set; }
-
- /// <summary>
- /// 鍖呰Y鍧愭爣
- /// </summary>
- public virtual float? MachineYCenter { get; set; }
-
- /// <summary>
- /// 鍖呰Z鍧愭爣
- /// </summary>
- public virtual float? MachineZCenter { get; set; }
-
- /// <summary>
- /// 灞傛暟
- /// </summary>
- public virtual int? Sequence { get; set; }
-
- /// <summary>
- /// 娆″簭
- /// </summary>
- public virtual int? Shelf { get; set; }
-
- /// <summary>
- /// 绾哥闀�
- /// </summary>
- public virtual float? Info1 { get; set; }
-
- /// <summary>
- /// 绾哥瀹�
- /// </summary>
- public virtual float? Info2 { get; set; }
-
- /// <summary>
- /// 绾哥楂�
- /// </summary>
- public virtual float? Info3 { get; set; }
-
- /// <summary>
- /// 閿�鍞悎鍚屽崟鍙�
- /// </summary>
- public virtual string Info4 { 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 string Info17 { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public virtual DateTime? CreateTime { get; set; }
-
- /// <summary>
- /// 淇敼鏃堕棿
- /// </summary>
- public virtual DateTime? UpdateTime { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜篒d
- /// </summary>
- public virtual long? CreateUserId { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- public virtual string CreateUserName { get; set; }
-
- /// <summary>
- /// 淇敼浜篒d
- /// </summary>
- public virtual long? UpdateUserId { get; set; }
-
- /// <summary>
- /// 淇敼浜�
- /// </summary>
- public virtual string UpdateUserName { get; set; }
-
- /// <summary>
- /// 杞垹闄�
- /// </summary>
- public virtual bool IsDelete { get; set; }
-
- /// <summary>
- /// 鏍囪
- /// </summary>
- public virtual Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
-
- }
+ public virtual string UPI { get; set; }
/// <summary>
- /// 鎵规鏁版嵁鍒嗛〉鏌ヨ杈撳叆鍙傛暟
+ /// 鎵规鍙�
/// </summary>
- public class Mes_BatchOrderUPI_NewInput : BasePageInput
- {
- /// <summary>
- /// 鍏抽敭瀛楁煡璇�
- /// </summary>
- public string? SearchKey { get; set; }
-
- /// <summary>
- /// 閮ㄤ欢鏉＄爜
- /// </summary>
- public string? UPI { get; set; }
-
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public string? PlanNo { get; set; }
-
- /// <summary>
- /// 璁㈠崟鍙�
- /// </summary>
- public string? OrderId { get; set; }
-
- /// <summary>
- /// 鐢熶骇鍗曞彿
- /// </summary>
- 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>
- /// 閮ㄤ欢鍚嶇О
- /// </summary>
- public string? DetailName { get; set; }
-
- /// <summary>
- /// 闀�
- /// </summary>
- public float? Length { get; set; }
-
- /// <summary>
- /// 瀹�
- /// </summary>
- public float? Width { get; set; }
-
- /// <summary>
- /// 鍘�
- /// </summary>
- public float? Thk { get; set; }
-
- /// <summary>
- /// 鏄惁浼樺寲鍖呰
- /// </summary>
- public int? IsPA { get; set; }
-
- /// <summary>
- /// 鍖呰鍙�
- /// </summary>
- public string? PackageCode { get; set; }
-
- /// <summary>
- /// 鍖呰X鍧愭爣
- /// </summary>
- public float? MachineXCenter { get; set; }
-
- /// <summary>
- /// 鍖呰Y鍧愭爣
- /// </summary>
- public float? MachineYCenter { get; set; }
-
- /// <summary>
- /// 鍖呰Z鍧愭爣
- /// </summary>
- public float? MachineZCenter { get; set; }
-
- /// <summary>
- /// 灞傛暟
- /// </summary>
- public int? Sequence { get; set; }
-
- /// <summary>
- /// 娆″簭
- /// </summary>
- public int? Shelf { get; set; }
-
- /// <summary>
- /// 绾哥闀�
- /// </summary>
- public float? Info1 { get; set; }
-
- /// <summary>
- /// 绾哥瀹�
- /// </summary>
- public float? Info2 { get; set; }
-
- /// <summary>
- /// 绾哥楂�
- /// </summary>
- public float? Info3 { get; set; }
-
- /// <summary>
- /// 閿�鍞悎鍚屽崟鍙�
- /// </summary>
- public string? Info4 { 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 string? Info17 { get; set; }
-
- /// <summary>
- /// 鏍囪
- /// </summary>
- public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
-
- }
+ public virtual string PlanNo { get; set; }
/// <summary>
- /// 鎵规鏁版嵁澧炲姞杈撳叆鍙傛暟
+ /// 璁㈠崟鍙�
/// </summary>
- public class AddMes_BatchOrderUPI_NewInput : Mes_BatchOrderUPI_NewBaseInput
- {
- /// <summary>
- /// 閮ㄤ欢鏉＄爜
- /// </summary>
- [Required(ErrorMessage = "閮ㄤ欢鏉＄爜涓嶈兘涓虹┖")]
- public override string UPI { get; set; }
-
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- [Required(ErrorMessage = "鎵规鍙蜂笉鑳戒负绌�")]
- public override string PlanNo { get; set; }
-
- /// <summary>
- /// 璁㈠崟鍙�
- /// </summary>
- [Required(ErrorMessage = "璁㈠崟鍙蜂笉鑳戒负绌�")]
- public override string OrderId { get; set; }
-
- /// <summary>
- /// 鏉挎枡鐘舵��
- /// </summary>
- [Required(ErrorMessage = "鏉挎枡鐘舵�佷笉鑳戒负绌�")]
- public override Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
-
- /// <summary>
- /// 閮ㄤ欢鍚嶇О
- /// </summary>
- [Required(ErrorMessage = "閮ㄤ欢鍚嶇О涓嶈兘涓虹┖")]
- public override string DetailName { get; set; }
-
- /// <summary>
- /// 闀�
- /// </summary>
- [Required(ErrorMessage = "闀夸笉鑳戒负绌�")]
- public override float Length { get; set; }
-
- /// <summary>
- /// 瀹�
- /// </summary>
- [Required(ErrorMessage = "瀹戒笉鑳戒负绌�")]
- public override float Width { get; set; }
-
- /// <summary>
- /// 鍘�
- /// </summary>
- [Required(ErrorMessage = "鍘氫笉鑳戒负绌�")]
- public override float Thk { get; set; }
-
- /// <summary>
- /// 鍖呰鍙�
- /// </summary>
- [Required(ErrorMessage = "鍖呰鍙蜂笉鑳戒负绌�")]
- public override string PackageCode { get; set; }
-
- /// <summary>
- /// 杞垹闄�
- /// </summary>
- [Required(ErrorMessage = "杞垹闄や笉鑳戒负绌�")]
- public override bool IsDelete { get; set; }
-
- }
+ public virtual string OrderId { get; set; }
/// <summary>
- /// 鎵规鏁版嵁鍒犻櫎杈撳叆鍙傛暟
+ /// 鐢熶骇鍗曞彿
/// </summary>
- public class DeleteMes_BatchOrderUPI_NewInput : BaseIdInput
- {
- }
+ public virtual string Info5 { get; set; }
/// <summary>
- /// 鎵规鏁版嵁鏇存柊杈撳叆鍙傛暟
+ /// 鎵�鍦ㄥ尯鍩�
/// </summary>
- public class UpdateMes_BatchOrderUPI_NewInput : AddMes_BatchOrderUPI_NewInput
- {
- /// <summary>
- /// 涓婚敭Id
- /// </summary>
- [Required(ErrorMessage = "涓婚敭Id涓嶈兘涓虹┖")]
- public long Id { get; set; }
-
- }
+ public virtual Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
/// <summary>
- /// 鎵规鏁版嵁涓婚敭鏌ヨ杈撳叆鍙傛暟
+ /// 鏉挎枡鐘舵��
/// </summary>
- public class QueryByIdMes_BatchOrderUPI_NewInput : DeleteMes_BatchOrderUPI_NewInput
- {
+ public virtual Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
- }
+ /// <summary>
+ /// 閮ㄤ欢鍚嶇О
+ /// </summary>
+ public virtual string DetailName { get; set; }
+
+ /// <summary>
+ /// 鏉愭枡
+ /// </summary>
+ [SugarColumn(ColumnName = "Info18", ColumnDescription = "鏉愭枡", Length = 60)]
+ public virtual string? Info18 { get; set; }
+
+ /// <summary>
+ /// 闀�
+ /// </summary>
+ public virtual float Length { get; set; }
+
+ /// <summary>
+ /// 瀹�
+ /// </summary>
+ public virtual float Width { get; set; }
+
+ /// <summary>
+ /// 鍘�
+ /// </summary>
+ public virtual float Thk { get; set; }
+
+ /// <summary>
+ /// 鏄惁浼樺寲鍖呰
+ /// </summary>
+ public virtual int? IsPA { get; set; }
+
+ /// <summary>
+ /// 鍖呰鍙�
+ /// </summary>
+ public virtual string PackageCode { get; set; }
+
+ /// <summary>
+ /// 鍖呰X鍧愭爣
+ /// </summary>
+ public virtual float? MachineXCenter { get; set; }
+
+ /// <summary>
+ /// 鍖呰Y鍧愭爣
+ /// </summary>
+ public virtual float? MachineYCenter { get; set; }
+
+ /// <summary>
+ /// 鍖呰Z鍧愭爣
+ /// </summary>
+ public virtual float? MachineZCenter { get; set; }
+
+ /// <summary>
+ /// 灞傛暟
+ /// </summary>
+ public virtual int? Sequence { get; set; }
+
+ /// <summary>
+ /// 娆″簭
+ /// </summary>
+ public virtual int? Shelf { get; set; }
+
+ /// <summary>
+ /// 绾哥闀�
+ /// </summary>
+ public virtual float? Info1 { get; set; }
+
+ /// <summary>
+ /// 绾哥瀹�
+ /// </summary>
+ public virtual float? Info2 { get; set; }
+
+ /// <summary>
+ /// 绾哥楂�
+ /// </summary>
+ public virtual float? Info3 { get; set; }
+
+ /// <summary>
+ /// 閿�鍞悎鍚屽崟鍙�
+ /// </summary>
+ public virtual string Info4 { 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 string Info17 { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public virtual DateTime? CreateTime { get; set; }
+
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public virtual DateTime? UpdateTime { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜篒d
+ /// </summary>
+ public virtual long? CreateUserId { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public virtual string CreateUserName { get; set; }
+
+ /// <summary>
+ /// 淇敼浜篒d
+ /// </summary>
+ public virtual long? UpdateUserId { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public virtual string UpdateUserName { get; set; }
+
+ /// <summary>
+ /// 杞垹闄�
+ /// </summary>
+ public virtual bool IsDelete { get; set; }
+
+ /// <summary>
+ /// 鏍囪
+ /// </summary>
+ public virtual Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
+
+}
+
+/// <summary>
+/// 鎵规鏁版嵁鍒嗛〉鏌ヨ杈撳叆鍙傛暟
+/// </summary>
+public class Mes_BatchOrderUPI_NewInput : BasePageInput
+{
+ /// <summary>
+ /// 鍏抽敭瀛楁煡璇�
+ /// </summary>
+ public string? SearchKey { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢鏉＄爜
+ /// </summary>
+ public string? UPI { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string? PlanNo { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鍙�
+ /// </summary>
+ public string? OrderId { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鍗曞彿
+ /// </summary>
+ 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>
+ /// 閮ㄤ欢鍚嶇О
+ /// </summary>
+ public string? DetailName { get; set; }
+
+ /// <summary>
+ /// 闀�
+ /// </summary>
+ public float? Length { get; set; }
+
+ /// <summary>
+ /// 瀹�
+ /// </summary>
+ public float? Width { get; set; }
+
+ /// <summary>
+ /// 鍘�
+ /// </summary>
+ public float? Thk { get; set; }
+
+ /// <summary>
+ /// 鏄惁浼樺寲鍖呰
+ /// </summary>
+ public int? IsPA { get; set; }
+
+ /// <summary>
+ /// 鍖呰鍙�
+ /// </summary>
+ public string? PackageCode { get; set; }
+
+ /// <summary>
+ /// 鍖呰X鍧愭爣
+ /// </summary>
+ public float? MachineXCenter { get; set; }
+
+ /// <summary>
+ /// 鍖呰Y鍧愭爣
+ /// </summary>
+ public float? MachineYCenter { get; set; }
+
+ /// <summary>
+ /// 鍖呰Z鍧愭爣
+ /// </summary>
+ public float? MachineZCenter { get; set; }
+
+ /// <summary>
+ /// 灞傛暟
+ /// </summary>
+ public int? Sequence { get; set; }
+
+ /// <summary>
+ /// 娆″簭
+ /// </summary>
+ public int? Shelf { get; set; }
+
+ /// <summary>
+ /// 绾哥闀�
+ /// </summary>
+ public float? Info1 { get; set; }
+
+ /// <summary>
+ /// 绾哥瀹�
+ /// </summary>
+ public float? Info2 { get; set; }
+
+ /// <summary>
+ /// 绾哥楂�
+ /// </summary>
+ public float? Info3 { get; set; }
+
+ /// <summary>
+ /// 閿�鍞悎鍚屽崟鍙�
+ /// </summary>
+ public string? Info4 { 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 string? Info17 { get; set; }
+
+ /// <summary>
+ /// 鏍囪
+ /// </summary>
+ public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
+
+}
+
+/// <summary>
+/// 鎵规鏁版嵁澧炲姞杈撳叆鍙傛暟
+/// </summary>
+public class AddMes_BatchOrderUPI_NewInput : Mes_BatchOrderUPI_NewBaseInput
+{
+ /// <summary>
+ /// 閮ㄤ欢鏉＄爜
+ /// </summary>
+ [Required(ErrorMessage = "閮ㄤ欢鏉＄爜涓嶈兘涓虹┖")]
+ public override string UPI { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ [Required(ErrorMessage = "鎵规鍙蜂笉鑳戒负绌�")]
+ public override string PlanNo { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鍙�
+ /// </summary>
+ [Required(ErrorMessage = "璁㈠崟鍙蜂笉鑳戒负绌�")]
+ public override string OrderId { get; set; }
+
+ /// <summary>
+ /// 鏉挎枡鐘舵��
+ /// </summary>
+ [Required(ErrorMessage = "鏉挎枡鐘舵�佷笉鑳戒负绌�")]
+ public override Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢鍚嶇О
+ /// </summary>
+ [Required(ErrorMessage = "閮ㄤ欢鍚嶇О涓嶈兘涓虹┖")]
+ public override string DetailName { get; set; }
+
+ /// <summary>
+ /// 鏉愭枡
+ /// </summary>
+ [SugarColumn(ColumnName = "Info18", ColumnDescription = "鏉愭枡", Length = 60)]
+ public override string? Info18 { get; set; }
+
+ /// <summary>
+ /// 闀�
+ /// </summary>
+ [Required(ErrorMessage = "闀夸笉鑳戒负绌�")]
+ public override float Length { get; set; }
+
+ /// <summary>
+ /// 瀹�
+ /// </summary>
+ [Required(ErrorMessage = "瀹戒笉鑳戒负绌�")]
+ public override float Width { get; set; }
+
+ /// <summary>
+ /// 鍘�
+ /// </summary>
+ [Required(ErrorMessage = "鍘氫笉鑳戒负绌�")]
+ public override float Thk { get; set; }
+
+ /// <summary>
+ /// 鍖呰鍙�
+ /// </summary>
+ [Required(ErrorMessage = "鍖呰鍙蜂笉鑳戒负绌�")]
+ public override string PackageCode { get; set; }
+
+ /// <summary>
+ /// 杞垹闄�
+ /// </summary>
+ [Required(ErrorMessage = "杞垹闄や笉鑳戒负绌�")]
+ public override bool IsDelete { get; set; }
+
+}
+
+/// <summary>
+/// 鎵规鏁版嵁鍒犻櫎杈撳叆鍙傛暟
+/// </summary>
+public class DeleteMes_BatchOrderUPI_NewInput : BaseIdInput
+{
+}
+
+/// <summary>
+/// 鎵规鏁版嵁鏇存柊杈撳叆鍙傛暟
+/// </summary>
+public class UpdateMes_BatchOrderUPI_NewInput : AddMes_BatchOrderUPI_NewInput
+{
+ /// <summary>
+ /// 涓婚敭Id
+ /// </summary>
+ [Required(ErrorMessage = "涓婚敭Id涓嶈兘涓虹┖")]
+ public long Id { get; set; }
+
+}
+
+/// <summary>
+/// 鎵规鏁版嵁涓婚敭鏌ヨ杈撳叆鍙傛暟
+/// </summary>
+public class QueryByIdMes_BatchOrderUPI_NewInput : DeleteMes_BatchOrderUPI_NewInput
+{
+
+}
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 31f7599..f2a9f79 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
@@ -44,7 +44,13 @@
/// 閮ㄤ欢鍚嶇О
/// </summary>
public string DetailName { get; set; }
-
+
+ /// <summary>
+ /// 鏉愭枡
+ /// </summary>
+ [SugarColumn(ColumnName = "Info18", ColumnDescription = "鏉愭枡", Length = 60)]
+ public string? Info18 { get; set; }
+
/// <summary>
/// 闀�
/// </summary>
@@ -155,10 +161,10 @@
/// </summary>
public string Info13 { get; set; }
- /// <summary>
- /// 閮ㄤ欢鍚嶇О
- /// </summary>
- public string Info14 { get; set; }
+ ///// <summary>
+ ///// 閮ㄤ欢鍚嶇О
+ ///// </summary>
+ //public string Info14 { get; set; }
/// <summary>
/// 閮ㄤ欢鏁伴噺
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 aca858e..864afe2 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
@@ -92,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();
}
@@ -115,7 +115,7 @@
#region 瀵煎叆
-
+
/// <summary>
/// Excel妯℃澘瀵煎叆鎵规鏁版嵁鍔熻兘
/// </summary>
@@ -125,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>
@@ -148,310 +148,310 @@
{
index++;
//瀵煎叆妯＄増瀹氬埗鍖栦唬鐮侊紙鏇挎崲妯＄増浣跨敤锛�
-
- 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 = "";//鏈烘鑷傛槸鍚︽棆杞�
- var _UpiFlag = "";//鏍囪
- #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() ;
- _UpiFlag = 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(_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(_Info4))
- {
- addItem.Info4 = (string)(_Info4.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());
- }
- if(!string.IsNullOrEmpty(_Info17))
- {
- addItem.Info17 = (string)(_Info17.Trim());
- }
- if(!string.IsNullOrEmpty(_UpiFlag))
- {
- Admin.NET.Application.UpiFlagEnum enumUpiFlag = default(Admin.NET.Application.UpiFlagEnum);
-
- if(!Enum.TryParse<Admin.NET.Application.UpiFlagEnum>(_UpiFlag, out enumUpiFlag)&&!string.IsNullOrEmpty(_UpiFlag))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏍囪]{_UpiFlag}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- addItem.UpiFlag = enumUpiFlag;
- }
-
- }
- #endregion
-
+
+ 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 = "";//鏈烘鑷傛槸鍚︽棆杞�
+ var _UpiFlag = "";//鏍囪
+ #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();
+ _UpiFlag = 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(_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(_Info4))
+ {
+ addItem.Info4 = (string)(_Info4.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());
+ }
+ if (!string.IsNullOrEmpty(_Info17))
+ {
+ addItem.Info17 = (string)(_Info17.Trim());
+ }
+ if (!string.IsNullOrEmpty(_UpiFlag))
+ {
+ Admin.NET.Application.UpiFlagEnum enumUpiFlag = default(Admin.NET.Application.UpiFlagEnum);
+
+ if (!Enum.TryParse<Admin.NET.Application.UpiFlagEnum>(_UpiFlag, out enumUpiFlag) && !string.IsNullOrEmpty(_UpiFlag))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏍囪]{_UpiFlag}鍊间笉姝ｇ‘锛�");
+ }
+ else
+ {
+ addItem.UpiFlag = enumUpiFlag;
+ }
+
+ }
+ #endregion
+
details.Add(addItem);
}
@@ -459,7 +459,7 @@
await CheckExisitForImport(details);
return details;
}
-
+
/// <summary>
/// 鏍规嵁鐗堟湰涓嬭浇鎵规鏁版嵁鐨凟xcel瀵煎叆妯℃澘
/// </summary>
@@ -473,7 +473,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 绉佹湁鏂规硶
@@ -502,7 +502,7 @@
|| u.Info11.Contains(input.SearchKey.Trim())
|| u.Info12.Contains(input.SearchKey.Trim())
|| u.Info13.Contains(input.SearchKey.Trim())
- || u.Info14.Contains(input.SearchKey.Trim())
+ //|| u.Info14.Contains(input.SearchKey.Trim())
|| u.Info16.Contains(input.SearchKey.Trim())
|| u.Info17.Contains(input.SearchKey.Trim())
|| u.CreateUserName.Contains(input.SearchKey.Trim())
@@ -515,10 +515,10 @@
.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(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(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()))
@@ -528,58 +528,58 @@
.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.Info14), u => u.Info14.Contains(input.Info14.Trim()))
+ .WhereIF(input.Info15 > 0, u => u.Info15 == input.Info15)
.WhereIF(!string.IsNullOrWhiteSpace(input.Info16), u => u.Info16.Contains(input.Info16.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Info17), u => u.Info17.Contains(input.Info17.Trim()))
.WhereIF(input.UpiFlag.HasValue, u => u.UpiFlag == input.UpiFlag)
.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="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="inputs"></param>
- /// <returns></returns>
- private async Task CheckExisitForImport(List<Mes_BatchOrderUPI_New> inputs)
- {
- if (inputs?.Count <= 0)
- {
- throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
- }
- //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
-
-
-
-
-
-
-
-
- //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
-
-
-
+ throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
}
- #endregion
+ //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
+
+
+
+
+
+ //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
+ }
+ #endregion
}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
index f6a8077..dc2ac79 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
@@ -275,10 +275,10 @@
/// </summary>
public string? Info13 { get; set; }
- /// <summary>
- /// 閮ㄤ欢鍚嶇О
- /// </summary>
- public string? Info14 { get; set; }
+ ///// <summary>
+ ///// 閮ㄤ欢鍚嶇О
+ ///// </summary>
+ //public string? Info14 { get; set; }
/// <summary>
/// 閮ㄤ欢鏁伴噺
/// </summary>
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
index a03800a..143cc39 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
@@ -456,7 +456,7 @@
Info11 = item.Info11,
Info12= item.Info12,
Info13 = item.Info13,
- Info14 = item.Info14,
+ //Info14 = item.Info14,
Info15 = item.Info15,
Info16 = item.Info16,
Length = item.Length,
--
Gitblit v1.9.3