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/PurchaseOrderService.cs | 671 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 496 insertions(+), 175 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs"
index 2eb5da7..60b96be 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs"
@@ -1,17 +1,23 @@
-锘縰sing System;
+锘縰sing AutoMapper;
+using SqlSugar;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_BasicRepository;
+using WIDESEA_Common.MaterielEnum;
using WIDESEA_Common.OrderEnum;
+using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Const;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO;
using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.ERP;
using WIDESEA_IBasicRepository;
using WIDESEA_IInboundRepository;
using WIDESEA_IInboundService;
@@ -27,255 +33,570 @@
private readonly IBasicRepository _basicRepository;
private readonly ISupplierInfoRepository _supplierInfoRepository;
private readonly IMaterielInfoRepository _materielInfoRepository;
+ private readonly IMapper _mapper;
- public PurchaseOrderService(IPurchaseOrderRepository BaseDal, IPurchaseOrderDetailRepository purchaseOrderDetailRepository, IUnitOfWorkManage unitOfWorkManage, IBasicRepository basicRepository, ISupplierInfoRepository supplierInfoRepository, IMaterielInfoRepository materielInfoRepository) : base(BaseDal)
+ public PurchaseOrderService(IPurchaseOrderRepository BaseDal, IPurchaseOrderDetailRepository purchaseOrderDetailRepository, IUnitOfWorkManage unitOfWorkManage, IBasicRepository basicRepository, ISupplierInfoRepository supplierInfoRepository, IMaterielInfoRepository materielInfoRepository,IMapper mapper) : base(BaseDal)
{
_purchaseOrderDetailRepository = purchaseOrderDetailRepository;
_unitOfWorkManage = unitOfWorkManage;
_basicRepository = basicRepository;
_supplierInfoRepository = supplierInfoRepository;
_materielInfoRepository = materielInfoRepository;
+ _mapper = mapper;
}
- public WebResponseContent GetPurchaseOrderInfo(string purchaseOrderNo)
+
+ //public override PageGridData<Dt_PurchaseOrder> GetPageData(PageDataOptions options)
+ //{
+ // PageGridData<Dt_PurchaseOrder> pageGridData = base.GetPageData(options);
+
+ // ISugarQueryable<Dt_PurchaseOrder> sugarQueryable1 = BaseDal.Db.Queryable<Dt_PurchaseOrder>().Includes(x => x.Details);
+ // if (!string.IsNullOrEmpty(options.Wheres))
+ // {
+
+ // List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
+ // int totalCount = 0;
+ // if (searchParametersList.Count > 0)
+ // {
+ // {
+ // SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_PurchaseOrderDetail.MaterielCode).FirstLetterToLower());
+ // if (searchParameters != null)
+ // {
+ // sugarQueryable1 = sugarQueryable1.Where(x => x.Details.Any(v => v.MaterielCode.Contains(searchParameters.Value)));
+ // List<Dt_PurchaseOrder> dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
+ // return new PageGridData<Dt_PurchaseOrder>(totalCount, dataList);
+ // }
+ // }
+
+ // {
+ // SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_PurchaseOrderDetail.WarehouseId).FirstLetterToLower());
+ // if (searchParameters != null && int.TryParse(searchParameters.Value, out int warehouseId))
+ // {
+ // sugarQueryable1 = sugarQueryable1.Where(x =>x.Details.Any(v => v.WarehouseId == warehouseId));
+ // List<Dt_PurchaseOrder> dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
+ // return new PageGridData<Dt_PurchaseOrder>(totalCount, dataList);
+ // }
+ // }
+ // }
+ // }
+ // return pageGridData;
+ //}
+ /// <summary>
+ /// 鎺ユ敹ERP閲囪喘鍏ュ簱淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent ReceivePurchaseOrder(ERPPurchaseOrderDTO eRPPurchaseOrderDTO)
{
+ WebResponseContent content=new WebResponseContent();
try
{
- Dt_PurchaseOrder purchaseOrder = BaseDal.Db.Queryable<Dt_PurchaseOrder>().Where(x => x.PurchaseOrderNo == purchaseOrderNo).Includes(x => x.Details).First();
- List<string> MaterielCodes = purchaseOrder.Details.Where(x => x.PurchaseDetailStatus != PurchaseOrderDetailStatusEnum.Received.ObjToInt()).Select(x => x.MaterielCode).ToList();
- return WebResponseContent.Instance.OK(data: MaterielCodes);
+ if (eRPPurchaseOrderDTO == null)
+ {
+ return content.Error("閲囪喘淇℃伅涓嶈兘浼犲叆涓虹┖");
+ }
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseCode==eRPPurchaseOrderDTO.WarehouseCode);
+ if (warehouse==null)
+ {
+ return content.Error($"浠撳簱淇℃伅涓嶅瓨鍦▄eRPPurchaseOrderDTO.WarehouseCode}");
+ }
+ //鑾峰彇鎵�鏈夌墿鏂�
+ List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.WarehouseId == warehouse.WarehouseId && x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt() );
+ //鑾峰彇鎵�鏈変緵搴斿晢
+ List<Dt_SupplierInfo> supplierInfos = _basicRepository.SupplierInfoRepository.QueryData(x => x.InvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt());
+ //鍒ゆ柇渚涘簲鍟�
+ Dt_SupplierInfo? supplierInfo = supplierInfos.FirstOrDefault(x => x.SupplierCode==eRPPurchaseOrderDTO.SupplierCode);
+ if (supplierInfo == null)
+ {
+ return content.Error($"閲囪喘{nameof(ERPPurchaseOrderDTO.PurchaseInCode)}:{eRPPurchaseOrderDTO.PurchaseInCode}渚涘簲鍟�:{eRPPurchaseOrderDTO.SupplierCode}涓嶅瓨鍦�");
+ }
+ //鍒ゆ柇鏄惁瀛樺湪鐗╂枡
+ PurchaseInDetailItem? purchaseInDetailItem = eRPPurchaseOrderDTO.PurchaseInDetail.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialCode));
+ if (purchaseInDetailItem != null)
+ {
+ return content.Error($"閲囪喘鏉＄爜{nameof(purchaseInDetailItem.Barcode)}:{purchaseInDetailItem.Barcode}鐗╂枡:{purchaseInDetailItem.MaterialCode}涓嶅瓨鍦�");
+ }
+ //鑾峰彇鎵�鏈夐噰璐俊鎭�
+ List<Dt_PurchaseOrder> purchaseOrdersOld = BaseDal.Db.Queryable<Dt_PurchaseOrder>().Includes(x=>x.Details).ToList();
+
+ if (eRPPurchaseOrderDTO.OperateType == 1)
+ {
+ //鍒ゆ柇閲嶅鎻掑叆
+ Dt_PurchaseOrder? purchaseOrderOld = purchaseOrdersOld.FirstOrDefault(x => x.PurchaseOrderNo == eRPPurchaseOrderDTO.PurchaseInCode);
+ if (purchaseOrderOld != null)
+ {
+ return content.Error($"閲囪喘鍗曞崟鍙穥purchaseOrderOld.PurchaseOrderNo}淇℃伅宸插瓨鍦�");
+ }
+ List<Dt_PurchaseOrderDetail> purchaseOrderDetails = eRPPurchaseOrderDTO.PurchaseInDetail.Select(x => _mapper.Map<Dt_PurchaseOrderDetail>(x)).ToList();
+ Dt_PurchaseOrder purchaseOrder = _mapper.Map<Dt_PurchaseOrder>(eRPPurchaseOrderDTO);
+ purchaseOrderDetails.ForEach(x =>
+ {
+ Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
+ x.MaterielName = materielInfo?.MaterielName;
+ x.Unit = materielInfo?.MaterielUnit;
+ x.MaterielSpec= materielInfo?.MaterielSpec;
+ });
+ purchaseOrder.Details = purchaseOrderDetails;
+ purchaseOrder.WarehouseId = warehouse.WarehouseId;
+ //鏂板
+ BaseDal.Db.InsertNav(purchaseOrder).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)
{
- return WebResponseContent.Instance.Error(ex.Message);
+ content.Error(ex.Message);
}
+ return content;
}
- public WebResponseContent ReceivePurchaseOrder(PurchaseOrderModel model)
+ /// <summary>
+ /// 鎺ユ敹ERP閲囪喘閫�璐т俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent ReceivePurchaseReturn(ERPReturnOrderDTO eRPReturnOrderDTO)
{
+ WebResponseContent content = new WebResponseContent();
try
{
- return model.Way switch
+ if (eRPReturnOrderDTO == null)
{
- 1 => AddPurchaseOrder(model),
- 2 => UpdatePurchaseOrder(model),
- 3 => DeletePurchaseOrder(model),
- 4 => ClosePurchaseOrder(model),
- _ => WebResponseContent.Instance.OK(),
- };
+ return content.Error("閫�鏂欎俊鎭笉鑳戒负绌�");
+ }
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == eRPReturnOrderDTO.WarehouseCode);
+ if (warehouse == null)
+ {
+ return content.Error($"浠撳簱淇℃伅涓嶅瓨鍦▄eRPReturnOrderDTO.WarehouseCode}");
+ }
+ //鑾峰彇鎵�鏈夌墿鏂�
+ List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.WarehouseId == warehouse.WarehouseId && x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt());
+ //鍒ゆ柇鏄惁瀛樺湪鐗╂枡
+ ReturnDetailItem? returnDetailItem = eRPReturnOrderDTO.ReturnDetail.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialCode));
+ if (returnDetailItem != null)
+ {
+ return content.Error($"閲囪喘鏉＄爜{nameof(returnDetailItem.BarCode)}:{returnDetailItem.BarCode}鐗╂枡:{returnDetailItem.MaterialCode}涓嶅瓨鍦�");
+ }
+ //鑾峰彇鎵�鏈夐��璐т俊鎭�
+ List<Dt_ReturnOutOrder> returnOutOrdersOld = BaseDal.Db.Queryable<Dt_ReturnOutOrder>().Includes(x => x.Details).ToList();
+
+ if (eRPReturnOrderDTO.OperateType == 1)
+ {
+ //鍒ゆ柇閲嶅鎻掑叆
+ Dt_ReturnOutOrder? returnOutOrderOld = returnOutOrdersOld.FirstOrDefault(x => x.ReturnNo == eRPReturnOrderDTO.ReturnCode);
+ if (returnOutOrderOld != null)
+ {
+ return content.Error($"閫�璐� 鍗曞彿{returnOutOrderOld.ReturnNo}淇℃伅宸插瓨鍦�");
+ }
+ List<Dt_ReturnOutOrderDetail> returnOutOrderDetails = eRPReturnOrderDTO.ReturnDetail.Select(x => _mapper.Map<Dt_ReturnOutOrderDetail>(x)).ToList();
+ Dt_ReturnOutOrder returnOutOrderAdd = _mapper.Map<Dt_ReturnOutOrder>(eRPReturnOrderDTO);
+ returnOutOrderDetails.ForEach(x =>
+ {
+ Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
+ x.MaterielName = materielInfo?.MaterielName;
+ x.Unit = materielInfo?.MaterielUnit;
+ });
+ returnOutOrderAdd.Details = returnOutOrderDetails;
+ returnOutOrderAdd.WarehouseId = warehouse.WarehouseId;
+ //鏂板
+ BaseDal.Db.InsertNav(returnOutOrderAdd).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)
{
- return WebResponseContent.Instance.Error(ex.Message);
+ content.Error(ex.Message);
}
+ return content;
}
-
- public WebResponseContent AddPurchaseOrder(PurchaseOrderModel model)
+ /// <summary>
+ /// 鎺ユ敹ERP鎴愬搧閿�鍞嚭搴撲俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent ReceiveProDeliveryOrder(ERPProDeliveryDTO eRPProDeliveryDTO)
{
+ WebResponseContent content = new WebResponseContent();
try
{
- if (BaseDal.QueryFirst(x => x.PurchaseOrderNo == model.OrderNo) != null)
+ if (eRPProDeliveryDTO == null)
{
- return WebResponseContent.Instance.Error($"閲囪喘鍗曞彿閲嶅");
+ return content.Error("閿�鍞嚭搴撲俊鎭笉鑳戒负绌�");
}
- if (_supplierInfoRepository.QueryFirst(x => x.SupplierCode == model.SCode) == null)
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == eRPProDeliveryDTO.WarehouseCode);
+ if (warehouse == null)
{
- return WebResponseContent.Instance.Error($"鏈壘鍒颁緵搴斿晢缂栫爜銆恵model.SCode}銆戠殑淇℃伅");
+ return content.Error($"浠撳簱淇℃伅涓嶅瓨鍦▄eRPProDeliveryDTO.WarehouseCode}");
}
- List<Dt_Warehouse> warehouses = _basicRepository.WarehouseRepository.QueryData();
- List<Dt_MaterielInfo> materielInfos = _materielInfoRepository.QueryData();
- List<Dt_PurchaseOrderDetail> purchaseOrderDetails = new List<Dt_PurchaseOrderDetail>();
- foreach (var item in model.MList)
+ //鑾峰彇鎵�鏈夌墿鏂�
+ List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.WarehouseId == warehouse.WarehouseId && x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt());
+
+ //鑾峰彇鎵�鏈夊鎴�
+ List<Dt_CustomerInfo> customerInfos = _basicRepository.CustomerInfoRepository.QueryData();
+
+ //鍒ゆ柇鏄惁瀛樺湪鐗╂枡
+ DeliveryDetailItem? deliveryDetailItem = eRPProDeliveryDTO.DeliveryDetail.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialCode));
+ if (deliveryDetailItem != null)
{
- Dt_Warehouse? warehouse = warehouses.FirstOrDefault(x => x.WarehouseCode == item.WaId);
- if (warehouse == null)
+ return content.Error($"鐗╂枡淇℃伅{deliveryDetailItem.MaterialCode}涓嶅瓨鍦�");
+ }
+
+ //鍒ゆ柇鏄惁瀛樺湪瀹㈡埛
+ DeliveryDetailItem? deliveryDetailCustom = eRPProDeliveryDTO.DeliveryDetail.FirstOrDefault(x => !customerInfos.Select(x => x.CustomerCode).Contains(x.Customer));
+
+ if (deliveryDetailCustom != null)
+ {
+ return content.Error($"瀹㈡埛淇℃伅{deliveryDetailCustom.Customer}涓嶅瓨鍦�");
+ }
+
+ //鑾峰彇鎵�鏈夐攢鍞嚭搴撲俊鎭�
+ List<Dt_ProDeliveryOrder> proDeliveryOrdersOld = BaseDal.Db.Queryable<Dt_ProDeliveryOrder>().Includes(x => x.Details).ToList();
+
+ if (eRPProDeliveryDTO.OperateType == 1)
+ {
+ //鍒ゆ柇閲嶅鎻掑叆
+ Dt_ProDeliveryOrder? proDeliveryOrderOld = proDeliveryOrdersOld.FirstOrDefault(x => x.DeliveryCode == eRPProDeliveryDTO.DeliveryCode);
+ if (proDeliveryOrderOld != null)
{
- return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
+ return content.Error($"閿�鍞嚭搴撳崟鍙穥proDeliveryOrderOld.DeliveryCode}淇℃伅宸插瓨鍦�");
}
- Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MCode);
- if (materielInfo == null)
+ List<Dt_ProDeliveryOrderDetail> proDeliveryOrderDetails = eRPProDeliveryDTO.DeliveryDetail.Select(x => _mapper.Map<Dt_ProDeliveryOrderDetail>(x)).ToList();
+ Dt_ProDeliveryOrder proDeliveryOrderAdd = _mapper.Map<Dt_ProDeliveryOrder>(eRPProDeliveryDTO);
+ proDeliveryOrderDetails.ForEach(x =>
{
- return WebResponseContent.Instance.Error($"鏈壘鍒扮墿鏂欑紪鐮併�恵item.MCode}銆戠殑淇℃伅");
- }
- Dt_PurchaseOrderDetail purchaseOrderDetail = new Dt_PurchaseOrderDetail()
- {
- MaterielCode = item.MCode,
- MaterielName = materielInfo.MaterielName,
- MaterielSpec = materielInfo.MaterielSpec,
- PurchaseDetailQuantity = item.Qty,
- PurchaseDetailReceiveQty = 0,
- PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt(),
- Unit = item.Unit,
- WarehouseId = warehouse.WarehouseId,
- RowNo = item.RowId,
- };
- purchaseOrderDetails.Add(purchaseOrderDetail);
+ Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
+ x.MaterielName = materielInfo?.MaterielName;
+ x.Unit = materielInfo?.MaterielUnit;
+ });
+ proDeliveryOrderAdd.Details = proDeliveryOrderDetails;
+ proDeliveryOrderAdd.WarehouseId = warehouse.WarehouseId;
+ //鏂板
+ BaseDal.Db.InsertNav(proDeliveryOrderAdd).Include(x => x.Details).ExecuteCommand();
+
}
-
- Dt_PurchaseOrder purchaseOrder = new Dt_PurchaseOrder()
+ //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
{
- OrderQuantity = model.Amount,
- OrderDate = model.OrderDate,
- PurchaseOrderNo = model.OrderNo,
- PurchaseOrderStatus = PurchaseOrderStatusEnum.NotReceived.ObjToInt(),
- PurchaseOrderType = model.Type,
- SupplierCode = model.SCode,
- Details = purchaseOrderDetails
- };
-
- Db.InsertNav(purchaseOrder).Include(x => x.Details).ExecuteCommand();
-
- return WebResponseContent.Instance.OK();
+ return content.Error("鏈壘鍒版搷浣滅被鍨�");
+ }
+ //鏇存柊鏁版嵁
+ return content.OK("鎺ユ敹鎴愬姛");
}
catch (Exception ex)
{
- return WebResponseContent.Instance.Error(ex.Message);
+ content.Error(ex.Message);
}
+ return content;
}
-
- public WebResponseContent UpdatePurchaseOrder(PurchaseOrderModel model)
+ /// <summary>
+ /// 鎺ユ敹ERP闈炵敓浜ч鏂欎俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent ReceiveOutOrder(ERPPickOutOrderDTO eRPPickOutOrderDTO)
{
+ WebResponseContent content = new WebResponseContent();
try
{
- Dt_PurchaseOrder purchaseOrder = Db.Queryable<Dt_PurchaseOrder>().Where(x => x.PurchaseOrderNo == model.OrderNo).Includes(x => x.Details).First();
- if (purchaseOrder == null)
+ if (eRPPickOutOrderDTO == null)
{
- return WebResponseContent.Instance.Error($"鏈壘鍒伴噰璐崟淇℃伅");
+ return content.Error("鍑哄簱淇℃伅涓嶈兘涓虹┖");
}
- if (purchaseOrder.Details == null || purchaseOrder.Details.Count == 0)
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == eRPPickOutOrderDTO.WarehouseCode);
+ if (warehouse == null)
{
- return WebResponseContent.Instance.Error($"鏈壘鍒伴噰璐崟鏄庣粏淇℃伅");
+ return content.Error($"浠撳簱淇℃伅涓嶅瓨鍦▄eRPPickOutOrderDTO.WarehouseCode}");
}
- if (_supplierInfoRepository.QueryFirst(x => x.SupplierCode == model.SCode) == null)
+ //鑾峰彇鎵�鏈夌墿鏂�
+ List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.WarehouseId == warehouse.WarehouseId && x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt());
+
+ //鍒ゆ柇鏄惁瀛樺湪鐗╂枡
+ PickDetailItem? deliveryDetailItem = eRPPickOutOrderDTO.PickDetail.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialCode));
+ if (deliveryDetailItem != null)
{
- return WebResponseContent.Instance.Error($"鏈壘鍒颁緵搴斿晢缂栫爜銆恵model.SCode}銆戠殑淇℃伅");
+ return content.Error($"鐗╂枡淇℃伅{deliveryDetailItem.MaterialCode}涓嶅瓨鍦�");
}
- List<Dt_Warehouse> warehouses = _basicRepository.WarehouseRepository.QueryData();
- List<Dt_MaterielInfo> materielInfos = _materielInfoRepository.QueryData();
- List<Dt_PurchaseOrderDetail> purchaseOrderDetails = new List<Dt_PurchaseOrderDetail>();
- List<Dt_PurchaseOrderDetail> updatePurchaseOrderDetails = new List<Dt_PurchaseOrderDetail>();
- List<int> detailIds = new List<int>();
- foreach (var item in model.MList)
+
+ //鑾峰彇鎵�鏈変俊鎭�
+ List<Dt_PickOutOrder> outOrders = BaseDal.Db.Queryable<Dt_PickOutOrder>().Includes(x => x.Details).ToList();
+
+ if (eRPPickOutOrderDTO.OperateType == 1)
{
- Dt_Warehouse? warehouse = warehouses.FirstOrDefault(x => x.WarehouseCode == item.WaId);
- if (warehouse == null)
+ //鍒ゆ柇閲嶅鎻掑叆
+ Dt_PickOutOrder? pickOutOrderOld = outOrders.FirstOrDefault(x => x.PickCode == eRPPickOutOrderDTO.PickCode);
+ if (pickOutOrderOld != null)
{
- return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
+ return content.Error($"鍗曞彿{pickOutOrderOld.PickCode}淇℃伅宸插瓨鍦�");
}
- Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MCode);
- if (materielInfo == null)
+ List<Dt_PickOutOrderDetail> pickOutOrderDetails = eRPPickOutOrderDTO.PickDetail.Select(x => _mapper.Map<Dt_PickOutOrderDetail>(x)).ToList();
+ Dt_PickOutOrder pickOutOrderAdd = _mapper.Map<Dt_PickOutOrder>(eRPPickOutOrderDTO);
+ pickOutOrderDetails.ForEach(x =>
{
- return WebResponseContent.Instance.Error($"鏈壘鍒扮墿鏂欑紪鐮併�恵item.MCode}銆戠殑淇℃伅");
- }
- Dt_PurchaseOrderDetail? purchaseOrderDetail = purchaseOrder.Details.FirstOrDefault(x => x.RowNo == item.RowId);
- if (purchaseOrderDetail == null)
- {
- purchaseOrderDetail = new Dt_PurchaseOrderDetail()
- {
- MaterielCode = item.MCode,
- PurchaseDetailQuantity = item.Qty,
- PurchaseDetailReceiveQty = 0,
- PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt(),
- Unit = item.Unit,
- WarehouseId = warehouse.WarehouseId,
- RowNo = item.RowId,
- };
- purchaseOrderDetails.Add(purchaseOrderDetail);
- }
- else
- {
- purchaseOrderDetail.MaterielCode = item.MCode;
- purchaseOrderDetail.PurchaseDetailQuantity = item.Qty;
- purchaseOrderDetail.PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt();
- purchaseOrderDetail.Unit = item.Unit;
- purchaseOrderDetail.WarehouseId = warehouse.WarehouseId;
- purchaseOrderDetail.RowNo = item.RowId;
- updatePurchaseOrderDetails.Add(purchaseOrderDetail);
- detailIds.Add(purchaseOrderDetail.Id);
- }
+ Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
+ x.MaterielName = materielInfo?.MaterielName;
+ x.Unit = materielInfo?.MaterielUnit;
+ });
+ pickOutOrderAdd.Details = pickOutOrderDetails;
+ pickOutOrderAdd.WarehouseId = warehouse.WarehouseId;
+ //鏂板
+ BaseDal.Db.InsertNav(pickOutOrderAdd).Include(x => x.Details).ExecuteCommand();
+
}
-
- purchaseOrder.OrderQuantity = model.Amount;
- purchaseOrder.OrderDate = model.OrderDate;
- purchaseOrder.PurchaseOrderNo = model.OrderNo;
- purchaseOrder.PurchaseOrderStatus = PurchaseOrderStatusEnum.NotReceived.ObjToInt();
- purchaseOrder.PurchaseOrderType = model.Type;
- purchaseOrder.SupplierCode = model.SCode;
-
- List<Dt_PurchaseOrderDetail> deletePurchaseOrderDetails = purchaseOrder.Details.Where(x => !detailIds.Contains(x.Id)).ToList();
-
- _unitOfWorkManage.BeginTran();
- foreach (var item in deletePurchaseOrderDetails)
+ //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
{
- _purchaseOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.浜哄伐鍒犻櫎);
+ return content.Error("鏈壘鍒版搷浣滅被鍨�");
}
-
- _purchaseOrderDetailRepository.UpdateData(updatePurchaseOrderDetails);
- _purchaseOrderDetailRepository.AddData(purchaseOrderDetails);
-
- BaseDal.UpdateData(purchaseOrder);
- _unitOfWorkManage.CommitTran();
-
- return WebResponseContent.Instance.OK();
+ //鏇存柊鏁版嵁
+ return content.OK("鎺ユ敹鎴愬姛");
}
catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
+ content.Error(ex.Message);
}
+ return content;
}
-
- public WebResponseContent DeletePurchaseOrder(PurchaseOrderModel model)
+ /// <summary>
+ /// 鎺ユ敹ERP鎴愬搧閿�鍞��璐т俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent ReceiveProDeliveryBackOrder(ERPProDeliverBackDTO eRPProDeliverBackDTO)
{
+ WebResponseContent content = new WebResponseContent();
try
{
- Dt_PurchaseOrder purchaseOrder = Db.Queryable<Dt_PurchaseOrder>().Where(x => x.PurchaseOrderNo == model.OrderNo).Includes(x => x.Details).First();
- if (purchaseOrder == null)
+ if (eRPProDeliverBackDTO == null)
{
- return WebResponseContent.Instance.Error($"鏈壘鍒伴噰璐崟淇℃伅");
+ return content.Error("閿�鍞��璐т俊鎭笉鑳戒负绌�");
}
- if (purchaseOrder.Details == null || purchaseOrder.Details.Count == 0)
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == eRPProDeliverBackDTO.WarehouseCode);
+ if (warehouse == null)
{
- return WebResponseContent.Instance.Error($"鏈壘鍒伴噰璐崟鏄庣粏淇℃伅");
+ return content.Error($"浠撳簱淇℃伅涓嶅瓨鍦▄eRPProDeliverBackDTO.WarehouseCode}");
}
- Db.DeleteNav(purchaseOrder).Include(x => x.Details).ExecuteCommand();
- return WebResponseContent.Instance.OK();
+ //鑾峰彇鎵�鏈夌墿鏂�
+ List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.WarehouseId == warehouse.WarehouseId && x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt());
+
+ //鍒ゆ柇鏄惁瀛樺湪鐗╂枡
+ DeliveryBackDetailItem? deliveryBackDetailItem = eRPProDeliverBackDTO.DeliveryBackDetail.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialCode));
+ if (deliveryBackDetailItem != null)
+ {
+ return content.Error($"鐗╂枡淇℃伅{deliveryBackDetailItem.MaterialCode}涓嶅瓨鍦�");
+ }
+
+ //鑾峰彇鎵�鏈夊鎴�
+ List<Dt_CustomerInfo> customerInfos = _basicRepository.CustomerInfoRepository.QueryData();
+ //鍒ゆ柇鏄惁瀛樺湪瀹㈡埛
+ DeliveryBackDetailItem? CheckCustomerCode = eRPProDeliverBackDTO.DeliveryBackDetail.FirstOrDefault(x => !customerInfos.Select(x => x.CustomerCode).Contains(x.Customer));
+
+ if (CheckCustomerCode != null)
+ {
+ return content.Error($"瀹㈡埛淇℃伅{CheckCustomerCode.Customer}涓嶅瓨鍦�");
+ }
+ //鑾峰彇鎵�鏈夐攢鍞嚭搴撲俊鎭�
+ List<Dt_ProDeliveryOrder> proDeliveryOrdersOld = BaseDal.Db.Queryable<Dt_ProDeliveryOrder>().Includes(x => x.Details).ToList();
+ //鍒ゆ柇鏄惁瀛樺湪閿�鍞彂璐у崟鍙�
+ DeliveryBackDetailItem? CheckDeliveryCode = eRPProDeliverBackDTO.DeliveryBackDetail.FirstOrDefault(x => !customerInfos.Select(x => x.CustomerCode).Contains(x.Customer));
+ if (CheckDeliveryCode != null)
+ {
+ return content.Error($"瀹㈡埛淇℃伅{CheckDeliveryCode.DeliveryCode}涓嶅瓨鍦�");
+ }
+ //鑾峰彇鎵�鏈変俊鎭�
+ List<Dt_ProDeliverBackOrder> outOrders = BaseDal.Db.Queryable<Dt_ProDeliverBackOrder>().Includes(x => x.Details).ToList();
+
+ if (eRPProDeliverBackDTO.OperateType == 1)
+ {
+ //鍒ゆ柇閲嶅鎻掑叆
+ Dt_ProDeliverBackOrder? proDeliverBackOrderOld = outOrders.FirstOrDefault(x => x.DeliveryBackCode == eRPProDeliverBackDTO.DeliveryBackCode);
+ if (proDeliverBackOrderOld != null)
+ {
+ return content.Error($"鍗曞彿{proDeliverBackOrderOld.DeliveryBackCode}淇℃伅宸插瓨鍦�");
+ }
+ List<Dt_ProDeliverBackOrderDetail> proDeliverBackOrderDetails = eRPProDeliverBackDTO.DeliveryBackDetail.Select(x => _mapper.Map<Dt_ProDeliverBackOrderDetail>(x)).ToList();
+ Dt_ProDeliverBackOrder proDeliverBackOrderAdd = _mapper.Map<Dt_ProDeliverBackOrder>(eRPProDeliverBackDTO);
+ proDeliverBackOrderDetails.ForEach(x =>
+ {
+ Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
+ x.MaterielName = materielInfo?.MaterielName;
+ x.Unit = materielInfo?.MaterielUnit;
+ });
+ proDeliverBackOrderAdd.Details = proDeliverBackOrderDetails;
+ proDeliverBackOrderAdd.WarehouseId = warehouse.WarehouseId;
+ //鏂板
+ BaseDal.Db.InsertNav(proDeliverBackOrderAdd).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)
{
- return WebResponseContent.Instance.Error(ex.Message);
+ content.Error(ex.Message);
}
- }
-
- public WebResponseContent ClosePurchaseOrder(PurchaseOrderModel model)
- {
- try
- {
- Dt_PurchaseOrder purchaseOrder = Db.Queryable<Dt_PurchaseOrder>().Where(x=>x.PurchaseOrderNo== model.OrderNo).Includes(x=>x.Details).First();
- if (purchaseOrder == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒伴噰璐崟淇℃伅");
- }
- if (purchaseOrder.Details == null || purchaseOrder.Details.Count == 0)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒伴噰璐崟鏄庣粏淇℃伅");
- }
- purchaseOrder.PurchaseOrderStatus = PurchaseOrderStatusEnum.Closed.ObjToInt();
- _unitOfWorkManage.BeginTran();
- BaseDal.UpdateData(purchaseOrder);
- //BaseDal.DeleteAndMoveIntoHty(purchaseOrder, OperateTypeEnum.鍏抽棴);
- foreach (var item in purchaseOrder.Details)
- {
- item.PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.Closed.ObjToInt();
- //_purchaseOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鍏抽棴);
- _purchaseOrderDetailRepository.UpdateData(item);
- }
- _unitOfWorkManage.CommitTran();
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
+ return content;
}
}
}
--
Gitblit v1.9.3