From b47a2f210d940eff8c7de4185305bc4e0184c590 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 17 十二月 2025 23:26:10 +0800
Subject: [PATCH] 新增空箱与回库功能，优化打印样式与逻辑printView1.vue**: 修复数据绑定拼写错误，优化打印逻辑与样式，调整二维码布局与大小。outboundOrder.js移除无用代码，清理gridBody` 和 `rowId`。 - **outPicking.vue**: 引入 `stationManager`，在 API 参数中增加 `station` 字段，优化样式。 - **ReturnToWarehouseDTO.cs**: 新增 DTO，支持 `palletCode`、`orderNo` 和 `station`。 - **IOutboundService.cs**: 定义 `EmptyBox` 和 `ReturnToWarehouse` 接口。 - **Dt_StockInfo_Hty.cs**: 修改继承关系，新增字段与导航属性。 - **OutboundService.cs**: 实现 `EmptyBox` 和 `ReturnToWarehouse` 方法，使用 `Mapster` 进行实体转换。 - **WIDESEA_OutboundService.csproj**: 引入 `Mapster` 依赖。 - **OutboundController.cs**: 新增 `EmptyBox` 和 `ReturnToWarehouse` 的 API 路由。
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 07c7c45..eb77ed2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -714,7 +714,7 @@
_logger.LogInformation($"InPickTaskCompleted AddLocationStatusChangeRecord : {ex.Message} ");
}
- _logger.LogInformation($"鎵樼洏鍥炲簱瀹屾垚澶勭悊鎴愬姛 - 浠诲姟鍙�: {task.TaskNum}, 鎵樼洏: {task.PalletCode}, 璁㈠崟: {task.OrderNo}");
+ _logger.LogInformation($"鎵樼洏鍥炲簱瀹屾垚澶勭悊鎴愬姛 - 浠诲姟鍙�: {task.TaskNum}, 鎵樼洏: {task.PalletCode}, 璁㈠崟: {task.OrderNo} 璐т綅鐘舵�侊細{locationInfo.LocationStatus}");
_ = Task.Run(async () =>
{
try
@@ -1135,11 +1135,12 @@
allocatefeedmodel.Details.Add(detailModel);
- }
+ }
var groupedResult = allocatefeedmodel.Details
.GroupBy(item => new { item.WarehouseCode, item.MaterialCode, item.Unit, item.LineNo })
- .Select(group => {
-
+ .Select(group =>
+ {
+
var deduplicatedBarcodes = group.SelectMany(x => x.Barcodes)
.GroupBy(b => b.Barcode)
.Select(b => new BarcodeInfo
@@ -1149,20 +1150,20 @@
SupplyCode = b.First().SupplyCode,
Qty = b.Max(x => x.Qty),
Unit = b.First().Unit
- }).ToList();
+ }).ToList();
return new AllocateDtoDetail
{
WarehouseCode = group.Key.WarehouseCode,
MaterialCode = group.Key.MaterialCode,
LineNo = group.Key.LineNo,
- Qty = deduplicatedBarcodes.Sum(b => b.Qty),
+ Qty = deduplicatedBarcodes.Sum(b => b.Qty),
Unit = group.Key.Unit,
Barcodes = deduplicatedBarcodes
};
}).ToList();
allocatefeedmodel.Details = groupedResult;
-
+
var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
if (result != null && result.code == 200)
@@ -1177,6 +1178,19 @@
ReturnToMESStatus = 1,
}).Where(x => x.OrderNo == orderNo).ExecuteCommandAsync();
}
+ else
+ {
+ await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
+ .SetColumns(x => x.ReturnToMESStatus == 2)
+ .Where(x => x.OrderId == outboundOrder.Id)
+ .ExecuteCommandAsync();
+
+ await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
+ .SetColumns(it => new Dt_OutboundOrder { ReturnToMESStatus = 2, Remark = result.message })
+ .Where(x => x.OrderNo == orderNo)
+ .ExecuteCommandAsync();
+ }
+
}
}
else if (outboundOrder.OrderType == OutOrderTypeEnum.ReCheck.ObjToInt())
@@ -1249,13 +1263,14 @@
}
feedmodel.details.Add(detailModel);
}
-
+
var groupedResult = feedmodel.details
.GroupBy(item => new { item.warehouseCode, item.materialCode, item.unit, item.lineNo })
- .Select(group => {
+ .Select(group =>
+ {
var deduplicatedBarcodes = group.SelectMany(x => x.barcodes)
.GroupBy(b => b.barcode)
- .Select(b =>new WIDESEA_DTO.Outbound.BarcodesModel
+ .Select(b => new WIDESEA_DTO.Outbound.BarcodesModel
{
barcode = b.Key,
batchNo = b.First().batchNo,
--
Gitblit v1.9.3