From a0a0df2e824b6fe7e5a3c0afce78127fecf84fc9 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 03 十一月 2025 08:23:05 +0800
Subject: [PATCH] ERP接口代码更新，WCS代码优化，出入库分配优化
---
项目代码/WMS/WMSServices/WIDESEA_InboundService/InboundOrderService.cs | 129 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 129 insertions(+), 0 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/InboundOrderService.cs"
new file mode 100644
index 0000000..f4cc385
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/InboundOrderService.cs"
@@ -0,0 +1,129 @@
+锘縰sing AutoMapper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Common.MaterielEnum;
+using WIDESEA_Common.OrderEnum;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_Core;
+using WIDESEA_DTO.MES;
+using WIDESEA_IBasicRepository;
+using WIDESEA_IInboundRepository;
+using WIDESEA_IInboundService;
+using WIDESEA_Model.Models;
+using WIDESEA_DTO.ERP;
+using WIDESEA_Core.Helper;
+using System.Security.Cryptography;
+
+namespace WIDESEA_InboundService
+{
+ public class InboundOrderService : ServiceBase<Dt_InboundOrder, IInboundOrderRepository>, IInboundOrderService
+ {
+ public IInboundOrderRepository Repository => BaseDal;
+ private readonly IBasicRepository _basicRepository;
+ private readonly IMapper _mapper;
+ public InboundOrderService(IInboundOrderRepository BaseDal, IBasicRepository basicRepository, IMapper mapper) : base(BaseDal)
+ {
+ _basicRepository = basicRepository;
+ _mapper = mapper;
+ }
+ /// <summary>
+ /// 娣诲姞ERP鍏ュ簱鍗曚俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent ReceiveInbound(ERPInboundOrderDTO eRPInboundOrderDTO)
+ {
+ WebResponseContent content=new WebResponseContent();
+ try
+ {
+ if (eRPInboundOrderDTO == null)
+ {
+ return content.Error("鍏ュ簱淇℃伅涓嶈兘浼犲叆涓虹┖");
+ }
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == eRPInboundOrderDTO.WarehouseCode);
+ if (warehouse == null)
+ {
+ return content.Error($"浠撳簱淇℃伅涓嶅瓨鍦▄eRPInboundOrderDTO.WarehouseCode}");
+ }
+ //鑾峰彇鎵�鏈夌墿鏂�
+ List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.WarehouseId == warehouse.WarehouseId && x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt());
+ //鍒ゆ柇鏄惁瀛樺湪鐗╂枡
+ InboundDetailItem? inboundDetailItem = eRPInboundOrderDTO.InboundDetail.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialCode));
+ if (inboundDetailItem != null)
+ {
+ return content.Error($"鍏ュ簱鏉＄爜{nameof(inboundDetailItem.BarCode)}:{inboundDetailItem.BarCode}鐗╂枡:{inboundDetailItem.MaterialCode}涓嶅瓨鍦�");
+ }
+ //鑾峰彇鎵�鏈夐噰璐俊鎭�
+ List<Dt_InboundOrder> inboundOrdersOld = BaseDal.Db.Queryable<Dt_InboundOrder>().Includes(x => x.Details).ToList();
+
+ if (eRPInboundOrderDTO.OperateType == 1)
+ {
+ //鍒ゆ柇閲嶅鎻掑叆
+ Dt_InboundOrder? inboundOrderOld = inboundOrdersOld.FirstOrDefault(x => x.UpperOrderNo == eRPInboundOrderDTO.InboundCode);
+ if (inboundOrderOld != null)
+ {
+ return content.Error($"鍏ュ簱鍗曞崟鍙穥eRPInboundOrderDTO.InboundCode}淇℃伅宸插瓨鍦�");
+ }
+ List<Dt_InboundOrderDetail> inboundOrderDetails = eRPInboundOrderDTO.InboundDetail.Select(x => _mapper.Map<Dt_InboundOrderDetail>(x)).ToList();
+ Dt_InboundOrder inboundOrder = _mapper.Map<Dt_InboundOrder>(eRPInboundOrderDTO);
+ inboundOrderDetails.ForEach(x =>
+ {
+ Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
+ x.MaterialName = materielInfo?.MaterielName;
+ x.Unit = materielInfo?.MaterielUnit;
+ });
+ inboundOrder.Details = inboundOrderDetails;
+ inboundOrder.WarehouseId = warehouse.WarehouseId;
+ //鏂板
+ BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
+
+ }
+ //else if (eRPPurchaseOrderDTO.OperateType == 2)
+ //{
+ // //鍒ゆ柇鏄惁瀛樺湪
+ // Dt_UserInfo? userInfoOld = OlduserInfos.FirstOrDefault(x => x.Code == eRPUserInfoDTO.StaffCode);
+ // if (userInfoOld == null)
+ // {
+ // return content.Error($"鏇存柊宸ュ彿{eRPUserInfoDTO.StaffCode}锛屽憳宸eRPUserInfoDTO.StaffName}涓嶅瓨鍦�");
+ // }
+ // Dt_UserInfo userInfo = _mapper.Map<Dt_UserInfo>(eRPUserInfoDTO);
+ // userInfo.Id = userInfoOld.Id;
+ // Sys_User user = _userRepository.QueryFirst(x => x.UserName == userInfo.Code);
+ // if (userInfoOld == null)
+ // {
+ // return content.Error($"鏇存柊宸ュ彿{eRPUserInfoDTO.StaffCode}锛屽憳宸eRPUserInfoDTO.StaffName}锛學MS璐﹀彿涓嶅瓨鍦�");
+ // }
+ // user.Enable = (byte)userInfo.State;
+ // user.UserTrueName = userInfo.Name;
+ // //鏇存柊
+ // BaseDal.UpdateData(userInfo);
+ // _userRepository.UpdateData(user);
+ //}
+ //else if (eRPPurchaseOrderDTO.OperateType == 3)
+ //{
+ // //鍒ゆ柇鏄惁瀛樺湪
+ // Dt_UserInfo? userInfoOld = OlduserInfos.FirstOrDefault(x => x.Code == eRPUserInfoDTO.StaffCode);
+ // if (userInfoOld == null)
+ // {
+ // return content.Error($"鏇存柊宸ュ彿{eRPUserInfoDTO.StaffCode}锛屽憳宸eRPUserInfoDTO.StaffName}涓嶅瓨鍦�");
+ // }
+ // BaseDal.DeleteData(userInfoOld);
+ //}
+ else
+ {
+ return content.Error("鏈壘鍒版搷浣滅被鍨�");
+ }
+ //鏇存柊鏁版嵁
+ return content.OK("鎺ユ敹鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+ }
+
+}
--
Gitblit v1.9.3