From ce40df5daffae0d17b4e9fa7cb6d677afaa4d66f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 17 十月 2025 11:20:30 +0800
Subject: [PATCH] 更新最新程序，ERP代码，MES代码等
---
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs | 90 +++++++++++++++++++++++----------------------
1 files changed, 46 insertions(+), 44 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs"
index f39c371..e4416b0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs"
@@ -19,6 +19,7 @@
using WIDESEA_Common.MaterielEnum;
using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core.Helper;
+using System.Reflection;
namespace WIDESEA_OutboundService
{
@@ -41,58 +42,59 @@
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
}
-
+
public WebResponseContent AddOutSGOrder(List<SGOutOrderDTO> outOrderDTOs)
{
- WebResponseContent content = new WebResponseContent();
- try
- {
- //鑾峰彇鎵�鏈夋帓绋嬪崟
- List<Dt_OutSGOrder> outSGOrders=BaseDal.Db.Queryable<Dt_OutSGOrder>().Includes(x => x.Details).ToList();
- //鍒ゆ柇鍗曟嵁
- Dt_OutSGOrder? ExistAddOutOrder = outSGOrders.FirstOrDefault(x => outOrderDTOs.Select(x => x.OrderId).Distinct().Contains(x.OrderId));
- if (ExistAddOutOrder != null)
+
+ WebResponseContent content = new WebResponseContent();
+ try
{
- return content.Error($"鍑哄簱鎺掔▼鍗曞彿{nameof(SGOutOrderDTO.OrderId)}:{ExistAddOutOrder.OrderId}宸插瓨鍦�");
- }
- //鑾峰彇鎵�鏈夌墿鏂�
- List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt() && x.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && x.MaterialSourceId != 0);
- SGOutOrderDTO? sGOutOrderDTO = outOrderDTOs.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialNo));
- if (sGOutOrderDTO != null)
- {
- return content.Error($"鐢熶骇鎺掔▼{sGOutOrderDTO.OrderId}鐗╂枡:{sGOutOrderDTO.MaterialNo}涓嶅瓨鍦�");
- }
- List<Dt_OutSGOrder> AddOutSGOrders = new List<Dt_OutSGOrder>();
- foreach (var item in outOrderDTOs)
- {
- //鑾峰彇宸ュ崟
- Dt_OutSGOrder? ExistOutSGOrder = AddOutSGOrders.FirstOrDefault(x=>x.OrderId== item.OrderId);
- //鑾峰彇鐗╂枡
- Dt_MaterielInfo materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterialNo);
- //鏄庣粏鎻愬墠杞崲
- Dt_OutSGOrderDetail outSGOrderDetail = _mapper.Map<Dt_OutSGOrderDetail>(item);
- outSGOrderDetail.MaterialName = materielInfo.MaterielName;
- //鍒ゆ柇宸ュ崟鏄惁宸茬粡瀛樺湪
- if (ExistOutSGOrder!=null)
+ //鑾峰彇鎵�鏈夋帓绋嬪崟
+ List<Dt_OutSGOrder> outSGOrders = BaseDal.Db.Queryable<Dt_OutSGOrder>().Includes(x => x.Details).ToList();
+ //鍒ゆ柇鍗曟嵁
+ Dt_OutSGOrder? ExistAddOutOrder = outSGOrders.FirstOrDefault(x => outOrderDTOs.Select(x => x.OrderId).Distinct().Contains(x.OrderId));
+ if (ExistAddOutOrder != null)
{
- ExistOutSGOrder.Details.Add(outSGOrderDetail);
+ return content.Error($"鍑哄簱鎺掔▼鍗曞彿{nameof(SGOutOrderDTO.OrderId)}:{ExistAddOutOrder.OrderId}宸插瓨鍦�");
}
- else
+ //鑾峰彇鎵�鏈夌墿鏂�
+ List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt() && x.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && x.MaterialSourceId != 0);
+ SGOutOrderDTO? sGOutOrderDTO = outOrderDTOs.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialNo));
+ if (sGOutOrderDTO != null)
{
-
- Dt_OutSGOrder outSGOrder=_mapper.Map<Dt_OutSGOrder>(item);
- outSGOrder.Details=new List<Dt_OutSGOrderDetail>() { outSGOrderDetail };
- AddOutSGOrders.Add(outSGOrder);
+ return content.Error($"鐢熶骇鎺掔▼{sGOutOrderDTO.OrderId}鐗╂枡:{sGOutOrderDTO.MaterialNo}涓嶅瓨鍦�");
}
+ List<Dt_OutSGOrder> AddOutSGOrders = new List<Dt_OutSGOrder>();
+ foreach (var item in outOrderDTOs)
+ {
+ //鑾峰彇宸ュ崟
+ Dt_OutSGOrder? ExistOutSGOrder = AddOutSGOrders.FirstOrDefault(x => x.OrderId == item.OrderId);
+ //鑾峰彇鐗╂枡
+ Dt_MaterielInfo materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterialNo);
+ //鏄庣粏鎻愬墠杞崲
+ Dt_OutSGOrderDetail outSGOrderDetail = _mapper.Map<Dt_OutSGOrderDetail>(item);
+ outSGOrderDetail.MaterialName = materielInfo.MaterielName;
+ //鍒ゆ柇宸ュ崟鏄惁宸茬粡瀛樺湪
+ if (ExistOutSGOrder != null)
+ {
+ ExistOutSGOrder.Details.Add(outSGOrderDetail);
+ }
+ else
+ {
+
+ Dt_OutSGOrder outSGOrder = _mapper.Map<Dt_OutSGOrder>(item);
+ outSGOrder.Details = new List<Dt_OutSGOrderDetail>() { outSGOrderDetail };
+ AddOutSGOrders.Add(outSGOrder);
+ }
+ }
+ BaseDal.Db.InsertNav(AddOutSGOrders).Include(x => x.Details).ExecuteCommand();
+ content.OK("鎺ユ敹鎺掔▼鎴愬姛");
}
- BaseDal.Db.InsertNav(AddOutSGOrders).Include(x => x.Details).ExecuteCommand();
- content.OK("鎺ユ敹鎺掔▼鎴愬姛");
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
}
}
}
--
Gitblit v1.9.3