From d4b0b578752a1478f6c11b352fbb8d2bad1f9e1d Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 22 十月 2025 17:18:49 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs"
index b6c1b44..2e84e57 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs"
@@ -61,16 +61,15 @@
var printCheckList = _inboundOrderRepository.QueryData(x => true);
List<Dt_InboundOrder> inboundOrderAdd = new List<Dt_InboundOrder>();
List<Dt_InboundOrder> inboundOrderUpdate = new List<Dt_InboundOrder>();
- if (ERPPrintChecklist != null) return;
foreach (var item in ERPPrintChecklist)
{
- var x = printCheckList.Where(x => x.MaterialNo == item.鏂欏彿 && x.OrderNo == item.鍗曞彿 && x.WarehouseName == item.鍏ュ簱浠撳簱鍚嶇О).FirstOrDefault();
+ var x = printCheckList.Where(x => x.MaterialNo == item.鏂欏彿 && x.UpperOrderNo == item.鍗曞彿 && x.WarehouseName == item.鍏ュ簱浠撳簱鍚嶇О).FirstOrDefault();
if (x == null)
{
Dt_InboundOrder Print = new Dt_InboundOrder()
{
- PrintCode = GetOrderPintCode(),
- OrderNo = item.鍗曞彿,
+ OrderNo = GetOrderPintCode(),
+ UpperOrderNo = item.鍗曞彿,
DemandClassification = item.闇�姹傚垎绫�,
OrderType = item.鍗曟嵁绫诲瀷,
WarehouseName = item.鍏ュ簱浠撳簱鍚嶇О,
@@ -91,10 +90,10 @@
}
else
{
- if (x.PrintCode == null || x.PrintCode == "")
+ if (x.OrderNo == null || x.OrderNo == "")
{
- x.PrintCode = GetOrderPintCode();
- x.OrderNo = item.鍗曞彿;
+ x.OrderNo = GetOrderPintCode();
+ x.UpperOrderNo = item.鍗曞彿;
x.DemandClassification = item.闇�姹傚垎绫�;
x.OrderType = item.鍗曟嵁绫诲瀷;
x.WarehouseName = item.鍏ュ簱浠撳簱鍚嶇О;
@@ -142,7 +141,7 @@
{
PrintSetting.Spare1 = DateTime.Now.ToString("yyyyMMdd");
PrintSetting.PrintNo = 2;
- PrintCode = PrintSetting.PrintCode + PrintSetting.Spare1 + 1.ToString().PadLeft(PrintSetting.Spare2, '0');
+ PrintCode = PrintSetting.Spare1 + 1.ToString().PadLeft(PrintSetting.Spare2, '0');
}
SqlSugarHelper.DbWMS.Updateable(PrintSetting).ExecuteCommand();
return PrintCode;
--
Gitblit v1.9.3