From b489f865bab00bedfce5e8f772095600b8034ac0 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 23 九月 2025 03:03:20 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs"
index 6c21a1a..04c3cb0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs"
@@ -285,39 +285,39 @@
_takeStockOrderDetailRepository.UpdateData(takeStockOrderDetail);
BaseDal.UpdateData(takeStockOrder);
//鎻愪氦ERP閫昏緫
- //if (takeStockOrder.TakeStockStatus== TakeStockStatusEnum.鐩樼偣瀹屾垚.ObjToInt())
- //{
- // ERPTakeStockModel eRPTakeStock = new ERPTakeStockModel()
- // {
- // Way = 1,
- // UniqueTag = takeStockOrder.Id.ToString(),
- // Code = takeStockOrder.OrderNo,
- // FiscalPeriotime = takeStockOrder.CreateDate.ToString("yyyy-MM-dd"),
- // Name=takeStockOrder.OrderNo,
- // WarehouseCode= warehouse.WarehouseCode,
- // Createuser=takeStockOrder.Creater,
- // Createtime= takeStockOrder.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
- // Details=new List<TakeDetailsItem>()
- // };
- // foreach (var item in takeStockOrderDetails)
- // {
- // TakeDetailsItem takeDetailsItem = new TakeDetailsItem()
- // {
- // MaterialsCode=item.MaterielCode,
- // LocationCode=item.LocationCode,
- // Lotno=item.BatchNo,
- // Sysqty=item.SysQty.ObjToDecimal(),
- // Qty=item.Qty.ObjToDecimal()
- // };
- // eRPTakeStock.Details.Add(takeDetailsItem);
- // }
- // string response = _invokeERPService.InvokeTakeStockApi(eRPTakeStock);
- // ErpRequestContent erpRequestContent = response.DeserializeObject<ErpRequestContent>();
- // if (erpRequestContent.res != 1)
- // {
- // throw new Exception("鍚屾ERP澶辫触,閿欒淇℃伅:" + erpRequestContent.Data);
- // }
- //}
+ if (takeStockOrder.TakeStockStatus == TakeStockStatusEnum.鐩樼偣瀹屾垚.ObjToInt())
+ {
+ ERPTakeStockModel eRPTakeStock = new ERPTakeStockModel()
+ {
+ Way = 1,
+ UniqueTag = takeStockOrder.Id.ToString(),
+ Code = takeStockOrder.OrderNo,
+ FiscalPeriotime = takeStockOrder.CreateDate.ToString("yyyy-MM-dd"),
+ Name = takeStockOrder.OrderNo,
+ WarehouseCode = warehouse.WarehouseCode,
+ Createuser = takeStockOrder.Creater,
+ Createtime = takeStockOrder.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
+ Details = new List<TakeDetailsItem>()
+ };
+ foreach (var item in takeStockOrderDetails)
+ {
+ TakeDetailsItem takeDetailsItem = new TakeDetailsItem()
+ {
+ MaterialsCode = item.MaterielCode,
+ LocationCode = item.LocationCode,
+ Lotno = item.BatchNo,
+ Sysqty = item.SysQty.ObjToDecimal(),
+ Qty = item.Qty.ObjToDecimal()
+ };
+ eRPTakeStock.Details.Add(takeDetailsItem);
+ }
+ string response = _invokeERPService.InvokeTakeStockApi(eRPTakeStock);
+ ErpRequestContent erpRequestContent = response.DeserializeObject<ErpRequestContent>();
+ if (erpRequestContent.res != 1)
+ {
+ throw new Exception("鍚屾ERP澶辫触,閿欒淇℃伅:" + erpRequestContent.Data);
+ }
+ }
_unitOfWorkManage.CommitTran();
content.OK("鐩樼偣鎴愬姛");
}
--
Gitblit v1.9.3