From 7af31afc6df4ca90c4d6e5c561313b9758ccc4aa Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期四, 22 一月 2026 09:31:23 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 170c786..1e5a5e8 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -3317,7 +3317,7 @@
// 鏌ユ壘鑱旀兂鎵撳嵃鏈�
foreach (string printer in allPrinters)
{
- if (printer.Contains("M7605D", StringComparison.OrdinalIgnoreCase));
+ if (printer.Contains("M7605D", StringComparison.OrdinalIgnoreCase))
{
Console.WriteLine($"鉁� 鎵惧埌鑱旀兂鎵撳嵃鏈�: {printer}");
return printer;
@@ -3506,7 +3506,12 @@
try
{
//鑾峰彇瀵瑰簲鐩樼偣鍗�
- Dt_TakeStockOrderCP takeStockOrder = _inboundRepository.TakeStockOrderRepository.Db.Queryable<Dt_TakeStockOrderCP>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details).First();
+ Dt_TakeStockOrderDetailCP takeStockOrderDetailCP = _takeStockOrderDetailCPRepository.QueryFirst(x => x.TakePalletCode == task.PalletCode);
+ if (takeStockOrderDetailCP == null)
+ {
+ return content.Error($"鐩樼偣鍗曪紝鎵樼洏鍙穥takeStockOrderDetailCP.TakePalletCode}涓嶅瓨鍦�");
+ }
+ Dt_TakeStockOrderCP takeStockOrder = _inboundRepository.TakeStockOrderRepository.Db.Queryable<Dt_TakeStockOrderCP>().Where(x => x.Id == takeStockOrderDetailCP.TakeStockId).Includes(x => x.Details).First();
if (takeStockOrder == null)
{
return content.Error($"鐩樼偣鍗晎task.OrderNo}涓嶅瓨鍦�");
@@ -3533,7 +3538,10 @@
{
return content.Error($"{stockInfo.PalletCode}鐩樼偣鏄庣粏鐘舵�佷笉姝ｇ‘");
}
- takeStockOrderDetail.TakeDetalStatus = TakeStockDetailStatusEnum.鐩樼偣鍑哄簱瀹屾垚.ObjToInt();
+ takeStockOrder.Details.ForEach(x =>
+ {
+ x.TakeDetalStatus = TakeStockDetailStatusEnum.鐩樼偣鍑哄簱瀹屾垚.ObjToInt();
+ });
stockInfo.StockStatus = StockStatusEmun.鐩樼偣鍑哄簱瀹屾垚.ObjToInt();
stockInfo.Details.ForEach(x =>
{
@@ -3565,7 +3573,7 @@
_basicService.LocationInfoService.UpdateData(locationInfo);
_returnOrderRepository.AddData(returnOrder);
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, LocationStatusEnum.Lock.ObjToInt(), LocationChangeType.OutboundCompleted.ObjToInt(), takeStockOrder?.OrderNo ?? "", task.TaskNum);
- _takeStockOrderDetailCPRepository.UpdateData(takeStockOrderDetail);
+ _takeStockOrderCPRepository.UpdateData(takeStockOrder);
_stockRepository.StockInfoRepository.UpdateData(stockInfo);
_stockRepository.StockInfoDetailRepository.UpdateData(stockInfo.Details);
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
--
Gitblit v1.9.3