From bdad44974d9454941697d1a2ad5ac430cc47d9dc Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 13 一月 2025 19:40:17 +0800
Subject: [PATCH] 优化领料出库上报ERP
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs | 7 +++++--
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 2 +-
2 files changed, 6 insertions(+), 3 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 c08a1ca..8b7588d 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"
@@ -422,7 +422,7 @@
issueModel = new ERPIssueModel()
{
UniqueTag = id.ToString(),
- Code = outboundOrder.OrderNo,//娴嬭瘯
+ Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),//娴嬭瘯
WarehouseCode = warehouse.WarehouseCode,
Docremark = "",
Deptno = outboundOrder.DepartmentCode,
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
index 8bdc9d9..dcbc0ff 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
@@ -17,6 +17,7 @@
using WIDESEA_Common.LocationEnum;
using MailKit.Search;
using WIDESEA_External.Model;
+using WIDESEA_Core.CodeConfigEnum;
namespace WIDESEA_TaskInfoService
{
@@ -189,7 +190,7 @@
{
throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
}
- if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus >= OrderDetailStatusEnum.New.ObjToInt())!=null)
+ if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.New.ObjToInt() && x.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt()) != null)
{
throw new Exception("鎵�閫夊嚭搴撳崟鏄庣粏瀛樺湪鍑哄簱涓垨宸插畬鎴�");
}
@@ -267,6 +268,7 @@
{
try
{
+ #region MyRegion
Dt_OutboundOrderDetail OrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.Id == orderDetailId);
if (OrderDetail == null)
@@ -355,6 +357,7 @@
_stockRepository.StockInfoDetailRepository.UpdateData(upstockDetails);
_stockRepository.StockInfoDetailRepository.DeleteData(destockDetails);
_unitOfWorkManage.CommitTran();
+ #endregion
#region 涓婃姤ERP
List<ERPPickModel> eRPPickModels = new List<ERPPickModel>();
@@ -383,7 +386,7 @@
ERPIssueModel issueModel = new ERPIssueModel()
{
UniqueTag = outboundOrder.Id.ToString(),
- Code = outboundOrder.OrderNo,
+ Code =_outboundService.OutboundOrderService.CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),
WarehouseCode = warehouse.WarehouseCode,
Docremark = "",
Deptno = outboundOrder.DepartmentCode,
--
Gitblit v1.9.3