From e974c93c984188524f15964529203db25ede3170 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 15 三月 2025 16:07:58 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 84 ++++++++++++++++++++++++++++++++---------
1 files changed, 65 insertions(+), 19 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
index 8cb1176..b6057e6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
@@ -210,7 +210,8 @@
_unitOfWorkManage.CommitTran();
#region 鍑哄簱瀹屾垚涓婃姤ERP
- if (outboundOrder.OrderStatus == OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt())
+ //鐢熶骇棰嗘枡,鐮斿彂棰嗘枡锛屾爣鍑嗛鏂欙紝鎺ㄩ�丒RP鍑哄簱
+ if (outboundOrder.OrderStatus == OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && outboundOrder.OrderType==OutOrderTypeEnum.Issue.ObjToInt())
_invokeERPService.InvokeOutStandardsApi(GetERPIssueModel(outboundOrder, warehouse.WarehouseCode));
#endregion
content.OK();
@@ -234,7 +235,7 @@
ERPPickItemModel pickItemModel = new ERPPickItemModel()
{
Lotno = item.BatchNo,
- Qty = item.AssignQuantity.ObjToInt().ToString(),
+ Qty = item.AssignQuantity.ToString(),
Location = WarehouseCode
};
//鑾峰彇鍑哄簱鍗曟槑缁�
@@ -268,6 +269,9 @@
Createuser = string.IsNullOrEmpty(Createuser) ? Createuser : "admin",
Issitem = new List<ERPIssueItemModel>() { issueItemModel },
};
+ //鏇存柊鍙戞枡鍗曞彿
+ outboundOrder.UpFLOrderNo = issueModel.Code;
+ BaseDal.UpdateData(outboundOrder);
}
catch (Exception ex)
{
@@ -313,6 +317,7 @@
BatchNo = model.MLot,
MaterielCode = model.MCode,
MaterielName = materielInfo.MaterielName,
+ MaterielSpec=materielInfo.MaterielSpec,
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
OrderQuantity = model.Qty,
OrderId = oldOutboundOrder.Id
@@ -327,6 +332,7 @@
RowNo = Convert.ToInt32(model.RowNo),
BatchNo = model.MLot,
MaterielCode = model.MCode,
+ MaterielSpec = materielInfo.MaterielSpec,
MaterielName = materielInfo.MaterielName,
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
OrderQuantity = model.Qty,
@@ -343,7 +349,16 @@
DepartmentName = model.DepartmentName,
Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail },
Remark = model.Node
-
+ };
+ outboundOrder.OrderType = model.OType switch
+ {
+ 1 or 2 or 3=> OutOrderTypeEnum.Issue.ObjToInt(),
+ 4=>OutOrderTypeEnum.Quality.ObjToInt(),
+ 5=>OutOrderTypeEnum.Allocate.ObjToInt(),
+ 6=>OutOrderTypeEnum.MaintenanceIssue.ObjToInt(),
+ 7=>OutOrderTypeEnum.SaleOut.ObjToInt(),
+ 8=>OutOrderTypeEnum.Rework.ObjToInt(),
+ _=>0
};
Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
}
@@ -368,6 +383,7 @@
RowNo = Convert.ToInt32(model.RowNo),
BatchNo = model.MLot,
MaterielCode = model.MCode,
+ MaterielSpec = materielInfo.MaterielSpec,
MaterielName = materielInfo.MaterielName,
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
OrderQuantity = model.Qty,
@@ -382,6 +398,10 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌鍑哄簱鍗�");
}
+ _unitOfWorkManage.BeginTran();
+ BaseDal.DeleteData(oldOutboundOrder);
+ _outboundOrderDetailRepository.DeleteData(oldOutboundOrder.Details);
+ _unitOfWorkManage.CommitTran();
}
return WebResponseContent.Instance.OK();
@@ -454,7 +474,7 @@
issueModel = new ERPIssueModel()
{
UniqueTag = id.ToString(),
- Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),//娴嬭瘯
+ Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),
WarehouseCode = warehouse.WarehouseCode,
Docremark = "",
Deptno = outboundOrder.DepartmentCode,
@@ -463,6 +483,9 @@
Createuser = outboundOrder.Creater,
Issitem = new List<ERPIssueItemModel>() { issueItemModel },
};
+ //鏇存柊鍙戞枡鍗曞彿
+ outboundOrder.UpFLOrderNo = issueModel.Code;
+ BaseDal.UpdateData(outboundOrder);
_invokeERPService.InvokeOutStandardsApi(issueModel);
}
else
@@ -524,21 +547,20 @@
// Issitem = new List<ERPIssueItemModel>() { issueItemModel },
//};
#endregion
- }
-
- if (stockInfos.Count > 0)
- {
- _stockService.StockInfoService.Repository.UpdateData(stockInfos);
- }
- else
- {
- _outStockLockInfoService.Repository.UpdateData(_OutStockLockInfos);
- }
- //鍑哄簱瀹屾垚涓婃姤ERP 娴嬭瘯娉ㄩ噴
- if (outboundOrder.OrderStatus == OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt())
- {
- issueModel = GetERPIssueModel(outboundOrder, warehouse.WarehouseCode);
- _invokeERPService.InvokeOutStandardsApi(issueModel);
+ if (stockInfos.Count > 0)
+ {
+ _stockService.StockInfoService.Repository.UpdateData(stockInfos);
+ }
+ else
+ {
+ _outStockLockInfoService.Repository.UpdateData(_OutStockLockInfos);
+ }
+ //鍑哄簱瀹屾垚涓婃姤ERP 娴嬭瘯娉ㄩ噴
+ if (outboundOrder.OrderStatus == OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt())
+ {
+ issueModel = GetERPIssueModel(outboundOrder, warehouse.WarehouseCode);
+ _invokeERPService.InvokeOutStandardsApi(issueModel);
+ }
}
return WebResponseContent.Instance.OK();
}
@@ -665,5 +687,29 @@
}
return content;
}
+ public WebResponseContent OutUpOrderGetFLOrder()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ //鑾峰彇鍑哄簱鍗�
+ List<Dt_OutboundOrder> outboundOrders = BaseDal.QueryData(x => x.OrderStatus == OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && x.UpFLOrderNo == null);
+ List<Sys_Log> logs = BaseDal.Db.Queryable<Sys_Log>().Where(x => x.RequestParam.Contains("棰嗘枡鍑哄簱閫氱煡鍗�") && x.Id > 14606).ToList();
+ foreach (var item in outboundOrders)
+ {
+ Sys_Log? log = logs.FirstOrDefault(x=>x.RequestParam.Contains(item.UpperOrderNo));
+ if (log == null) { continue; }
+ ERPBaseModel <ERPIssueModel> baseModel= log.RequestParam.DeserializeObject<ERPBaseModel<ERPIssueModel>>();
+ item.UpFLOrderNo = baseModel.Data.Code;
+ }
+ BaseDal.UpdateData(outboundOrders);
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3