From 3386c4e2a11ed345986a0b4af28e4a8630f84b41 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期二, 13 一月 2026 18:41:35 +0800
Subject: [PATCH] 重检，盘点优化
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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_InboundService/InboundOrderService.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_InboundService/InboundOrderService.cs"
index 1e5d637..babba31 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_InboundService/InboundOrderService.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_InboundService/InboundOrderService.cs"
@@ -106,9 +106,10 @@
foreach (var item in model.Details)
{
+ Dt_MaterielInfo materielInfo = materielInfos.First(x => x.MaterielCode == item.MaterielCode);
//var purchaseToStockResult = await _materialUnitService.ConvertPurchaseToStockAsync(item.MaterielCode, item.BarcodeQty);
- UnitConvertResultDTO totalResult = _basicService.UnitQuantityConvert(item.MaterielCode, item.Unit, item.BarcodeUnit, item.OrderQuantity);
+ UnitConvertResultDTO totalResult = _basicService.UnitQuantityConvert(item.MaterielCode, item.Unit, materielInfo.inventoryUOM, item.OrderQuantity);
item.Unit = totalResult.ToUnit;
item.OrderQuantity = totalResult.ToQuantity;
if (materielInfos.Any())
@@ -966,5 +967,27 @@
return content.OK(data: details);
}
+
+ public WebResponseContent HandCloseOrder(List<int> orderIds)
+ {
+ try
+ {
+ foreach (int id in orderIds)
+ {
+ var inbound = _inboundOrderRepository.QueryFirst(x => x.Id == id);
+ if(inbound.OrderStatus !=(int)InOrderStatusEnum.鏈紑濮� && inbound.OrderStatus != (int)InOrderStatusEnum.鍏ュ簱涓�)
+ {
+ return WebResponseContent.Instance.Error($"璇ュ崟鎹姸鎬佷笉鍙互鍏抽棴");
+ }
+ inbound.OrderStatus = (int)InOrderStatusEnum.鎵嬪姩鍏抽棴;
+ _inboundOrderRepository.UpdateData(inbound);
+ }
+ return WebResponseContent.Instance.OK($"鍗曟嵁鍏抽棴鎴愬姛");
+ }
+ catch (Exception e)
+ {
+ return WebResponseContent.Instance.Error(e.Message);
+ }
+ }
}
}
--
Gitblit v1.9.3