From 6d834630986b0ba3fa8b95d4a6b0fab54708c3ec Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期日, 12 一月 2025 00:15:43 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 304 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 261 insertions(+), 43 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 e9161c0..a197ccc 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"
@@ -15,9 +15,11 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_Core.Utilities;
+using WIDESEA_DTO.Basic;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Outbound;
@@ -38,23 +40,214 @@
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IBasicService _basicService;
private readonly IOutboundOrderDetailRepository _outboundOrderDetailRepository;
- private readonly IStockInfoService _stockInfoService;
- private readonly IStockInfoRepository _stockInfoRepository;
+ private readonly IStockService _stockService;
public IOutboundOrderRepository Repository => BaseDal;
private readonly IInvokeERPService _invokeERPService;
private readonly IOutStockLockInfoService _outStockLockInfoService;
+ private readonly IOutboundOrderRepository _outboundOrderRepository;
- public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper,IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IStockInfoService stockInfoService,
- IStockInfoRepository stockInfoRepository, IInvokeERPService invokeERPService, IOutStockLockInfoService outStockLockInfoService) : base(BaseDal)
+ public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IStockService stockService, IInvokeERPService invokeERPService, IOutStockLockInfoService outStockLockInfoService,
+ IOutboundOrderRepository outboundOrderRepository) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
_basicService = basicService;
_outboundOrderDetailRepository = outboundOrderDetailRepository;
- _stockInfoService = stockInfoService;
- _stockInfoRepository = stockInfoRepository;
+ _stockService = stockService;
_invokeERPService = invokeERPService;
_outStockLockInfoService = outStockLockInfoService;
+ _outboundOrderRepository = outboundOrderRepository;
+ }
+ public override WebResponseContent AddData(SaveModel saveModel)
+ {
+ if (saveModel.MainData.TryGetValue(nameof(Dt_OutboundOrder.UpperOrderNo).FirstLetterToLower(), out object? upperOrderNo) && upperOrderNo != null && !string.IsNullOrEmpty(upperOrderNo.ToString()))
+ {
+ Dt_OutboundOrder outboundOrder = BaseDal.QueryFirst(x => x.UpperOrderNo == upperOrderNo.ToString() && x.WarehouseId == Convert.ToInt32(saveModel.MainData[nameof(Dt_OutboundOrder.WarehouseId).FirstLetterToLower()]));
+ if (outboundOrder != null)
+ {
+ return WebResponseContent.Instance.Error($"{upperOrderNo}棰嗘枡鍗曞彿宸插瓨鍦�");
+ }
+ }
+ saveModel.DetailData[0].Add("orderDetailStatus", OrderDetailStatusEnum.New.ObjToInt());
+ return base.AddData(saveModel);
+ }
+ /// <summary>
+ /// 鑾峰彇鍑哄簱鍗曚俊鎭�
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ public WebResponseContent GetOutboundOrders(SaveModel saveModel)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ int pageNo = saveModel.MainData["pageNo"].ObjToInt();
+ string? orderNo = saveModel.MainData["orderNo"].ToString();
+ int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
+ List<Dt_OutboundOrder> dt_ReceiveOrders = new List<Dt_OutboundOrder>();
+ if (string.IsNullOrEmpty(orderNo))
+ {
+ dt_ReceiveOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderStatus < OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);
+ }
+ else
+ {
+ dt_ReceiveOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);
+ }
+
+ content.OK(data: dt_ReceiveOrders);
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+ public WebResponseContent outpinku(SaveModel saveModel)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var orderNo = saveModel.MainData["orderNo"].ToString();
+ var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
+ var serNum = saveModel.MainData["sn"].ToString();
+ Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
+ if (warehouse == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌浠撳簱淇℃伅");
+ }
+
+ Dt_OutboundOrder outboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderNo == orderNo && x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).First();
+ if (outboundOrder == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撳崟淇℃伅");
+ }
+ if (outboundOrder.Details == null || outboundOrder.Details.Count <= 0)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
+ }
+
+ MatSerNumAnalysisModel model = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serNum);
+ Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == model.MaterielCode);
+ if (materielInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌鐗╂枡鐨勪俊鎭�");
+ }
+ if (materielInfo.WarehouseId != outboundOrder.WarehouseId)
+ {
+ return WebResponseContent.Instance.Error($"璇ョ墿鏂欎笉灞炰簬鏈粨");
+ }
+
+ Dt_OutboundOrderDetail outboundOrderDetail = outboundOrder.Details.FirstOrDefault(x => x.MaterielCode == model.MaterielCode);
+ if (outboundOrderDetail == null) return WebResponseContent.Instance.Error($"璇ョ墿鏂欎笉灞炰簬鏈嚭搴撳崟");
+ if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt())
+ return WebResponseContent.Instance.Error($"鏈嚭搴撳崟褰撳墠鐗╂枡宸插嚭搴撳畬鎴�");
+
+ if (outboundOrderDetail.OrderQuantity - outboundOrderDetail.OverOutQuantity < model.Quantity)
+ return WebResponseContent.Instance.Error($"鍑哄簱鏁伴噺瓒呭嚭鍑哄簱鍗�");
+
+ Dt_StockInfoDetail stockInfoDetail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.MaterielCode == model.MaterielCode && x.BatchNo == model.LotNo);
+
+ if (stockInfoDetail == null) return WebResponseContent.Instance.Error($"鏈壘鍒板簱瀛�");
+ if (stockInfoDetail.StockQuantity < model.Quantity) return WebResponseContent.Instance.Error($"搴撳瓨涓嶈冻");
+ Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.Id == stockInfoDetail.StockId);
+ if (stockInfo == null) return WebResponseContent.Instance.Error($"鏈壘鍒板簱瀛樹富琛�");
+ if (stockInfo.LocationCode != "骞冲簱浣�") return WebResponseContent.Instance.Error($"搴撳瓨涓嶅睘浜庡钩搴撲綅");
+
+ Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
+ {
+ PalletCode = stockInfo.PalletCode,
+ AssignQuantity = model.Quantity,
+ MaterielCode = model.MaterielCode,
+ BatchNo = model.LotNo,
+ LocationCode = stockInfo.LocationCode,
+ MaterielName = materielInfo.MaterielName,
+ OrderDetailId = outboundOrderDetail.Id,
+ OrderNo = outboundOrder.OrderNo,
+ OrderType = outboundOrder.OrderType,
+ OriginalQuantity = stockInfoDetail.StockQuantity,
+ Status = OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt(),
+ StockId = stockInfo.Id,
+ TaskNum = 0,
+ OrderQuantity = outboundOrderDetail.OrderQuantity,
+ Unit = outboundOrderDetail.Unit
+ };
+
+ #region 淇敼鍑哄簱鍗�
+ outboundOrderDetail.OverOutQuantity += outStockLockInfo.AssignQuantity;
+ if (outboundOrderDetail.OrderQuantity > outboundOrderDetail.OverOutQuantity)
+ outboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
+ else
+ outboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ int overCount = outboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
+ if (outboundOrder.Details.Count == overCount)
+ outboundOrder.OrderStatus = OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ else
+ outboundOrder.OrderStatus = OutOrderStatusEnum.鍑哄簱涓�.ObjToInt();
+ #endregion
+
+ #region 淇敼搴撳瓨
+ stockInfoDetail.StockQuantity -= stockInfoDetail.StockQuantity - outStockLockInfo.AssignQuantity;
+ #endregion
+
+
+ _unitOfWorkManage.BeginTran();
+ _outStockLockInfoService.Repository.AddData(outStockLockInfo);
+ BaseDal.UpdateData(outboundOrder);
+ _outboundOrderDetailRepository.UpdateData(outboundOrderDetail);
+ if (stockInfoDetail.StockQuantity > 0)
+ {
+ _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
+ }
+ else
+ {
+ _stockService.StockInfoDetailService.Repository.DeleteData(stockInfoDetail);
+ if (stockInfo.Details.Count <= 1) _stockService.StockInfoService.Repository.DeleteData(stockInfo);
+ }
+ _unitOfWorkManage.CommitTran();
+
+ #region 鍑哄簱瀹屾垚涓婃姤ERP
+ ERPPickItemModel pickItemModel = new ERPPickItemModel()
+ {
+ Lotno = model.LotNo,
+ Qty = model.Quantity.ToString(),
+ Location = warehouse.WarehouseCode
+ };
+ ERPPickModel pickModel = new ERPPickModel()
+ {
+ Rowindex = outboundOrderDetail.RowNo,
+ Material = outboundOrderDetail.MaterielCode,
+ Qty = pickItemModel.Qty,
+ Dataitem = new List<ERPPickItemModel> { pickItemModel }
+ };
+ List<ERPPickModel> eRPPickModels = new List<ERPPickModel>() { pickModel };
+ ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
+ {
+ Pickcode = outboundOrder.UpperOrderNo,
+ PickList = eRPPickModels
+ };
+ ERPIssueModel issueModel = new ERPIssueModel()
+ {
+ UniqueTag = outboundOrderDetail.OrderId.ToString(),
+ Code = outboundOrder.OrderNo,
+ WarehouseCode = warehouse.WarehouseCode,
+ Docremark = "",
+ Deptno = outboundOrder.DepartmentCode,
+ Deptname = outboundOrder.DepartmentName,
+ Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ Createuser = App.User.UserName,
+ Issitem = new List<ERPIssueItemModel>() { issueItemModel },
+ };
+ _invokeERPService.InvokeOutStandardsApi(issueModel);
+ #endregion
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
}
public WebResponseContent ReceiveOutOrder(ErpOutOrderDTO model)
@@ -112,10 +305,11 @@
MaterielName = materielInfo.MaterielName,
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
OrderQuantity = model.Qty,
+ Unit = materielInfo.MaterielUnit
};
Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder()
{
- OrderNo=model.OrderNo,
+ OrderNo = model.OrderNo,
UpperOrderNo = model.OrderNo,
OrderStatus = OutOrderStatusEnum.鏈紑濮�.ObjToInt(),
OrderType = OutOrderTypeEnum.Issue.ObjToInt(),
@@ -172,30 +366,45 @@
}
}
//涓婃姤鍑哄簱瀹屾垚
- public WebResponseContent TestOutUpload(int id,Dt_StockInfo stockInfo)
+ public WebResponseContent TestOutUpload(int id, List<Dt_OutStockLockInfo>? outStockLockInfos)
{
try
{
- Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x=>x.Id==id).Includes(x=>x.Details).First();
+ Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == id).Includes(x => x.Details).First();
Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == outboundOrder.WarehouseId);
ERPIssueModel issueModel = new ERPIssueModel();
List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
+ List<Dt_OutStockLockInfo> _OutStockLockInfos = new List<Dt_OutStockLockInfo>();
+ int overCount = outboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
+ if (outboundOrder.Details.Count == overCount)
+ {
+ outboundOrder.OrderStatus = OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ _outboundOrderRepository.UpdateData(outboundOrder);
+ }
+ if (outboundOrder == null)
+ {
+ return WebResponseContent.Instance.Error("鍑哄簱鍗曚笉瀛樺湪");
+ }
+ if (outboundOrder.CreateType == OrderCreateTypeEnum.CreateInSystem.ObjToInt())
+ {
+ return WebResponseContent.Instance.OK();
+ }
//娴嬭瘯鏋跺簱缁橢RP涓婃姤鍑哄簱瀹屾垚
- if (stockInfo==null)
+ if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
{
stockInfos = TestOutStocksUpdate(warehouse).Data as List<Dt_StockInfo> ?? new List<Dt_StockInfo>();
- List<ERPPickItemModel> eRPOutPick =new List<ERPPickItemModel>();
+ List<ERPPickItemModel> eRPOutPick = new List<ERPPickItemModel>();
for (int i = 0; i < stockInfos.Count; i++)
{
ERPPickItemModel pickItemModel = new ERPPickItemModel()
{
- Lotno= stockInfos[i].Details[0].BatchNo,
- Qty= stockInfos[i].Details[0].StockQuantity.ObjToInt().ToString(),
- Location= warehouse.WarehouseCode
+ Lotno = stockInfos[i].Details[0].BatchNo,
+ Qty = stockInfos[i].Details[0].StockQuantity.ObjToInt().ToString(),
+ Location = warehouse.WarehouseCode
};
eRPOutPick.Add(pickItemModel);
}
-
+
ERPPickModel pickModel = new ERPPickModel()
{
Rowindex = outboundOrder.Details[0].RowNo,
@@ -224,25 +433,37 @@
}
else
{
- Dt_OutboundOrderDetail orderDetail = outboundOrder.Details.FirstOrDefault(x => x.MaterielCode == stockInfo.Details[0].MaterielCode);
-
- ERPPickItemModel pickItemModel = new ERPPickItemModel()
+ List<ERPPickModel> eRPPickModels = new List<ERPPickModel>();
+
+ //鑾峰彇鍑哄簱璇︽儏鍗�
+ foreach (var item in outStockLockInfos)
{
- Lotno = stockInfo.Details[0].BatchNo,
- Qty = stockInfo.Details[0].StockQuantity.ObjToInt().ToString(),
- Location = stockInfo.LocationCode
- };
- ERPPickModel pickModel = new ERPPickModel()
- {
- Rowindex = outboundOrder.Details[0].RowNo,
- Material = outboundOrder.Details[0].MaterielCode,
- Qty = (outboundOrder.Details[0].OrderQuantity.ObjToInt()).ToString(),
- Dataitem = new List<ERPPickItemModel> { pickItemModel }
- };
+ ERPPickItemModel pickItemModel = new ERPPickItemModel()
+ {
+ Lotno = item.BatchNo,
+ Qty = item.AssignQuantity.ObjToInt().ToString(),
+ Location = warehouse.WarehouseCode
+ };
+ //鑾峰彇鍑哄簱鍗曟槑缁�
+ Dt_OutboundOrderDetail outboundOrderDetail = outboundOrder.Details.FirstOrDefault(x => x.Id == item.OrderDetailId);
+ ERPPickModel pickModel = new ERPPickModel()
+ {
+ Rowindex = outboundOrderDetail.RowNo,
+ Material = outboundOrderDetail.MaterielCode,
+ Qty = pickItemModel.Qty,
+ Dataitem = new List<ERPPickItemModel> { pickItemModel }
+ };
+ if (item.OrderQuantity == item.AssignQuantity)
+ {
+ item.Status = OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ }
+ eRPPickModels.Add(pickModel);
+ _OutStockLockInfos.Add(item);
+ }
ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
{
Pickcode = outboundOrder.UpperOrderNo,
- PickList = new List<ERPPickModel>() { pickModel }
+ PickList = eRPPickModels
};
issueModel = new ERPIssueModel()
{
@@ -253,25 +474,22 @@
Deptno = outboundOrder.DepartmentCode,
Deptname = outboundOrder.DepartmentName,
Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- Createuser = outboundOrder.Creater,
+ Createuser = outStockLockInfos.FirstOrDefault().Creater,
Issitem = new List<ERPIssueItemModel>() { issueItemModel },
};
}
-
- string response = _invokeERPService.InvokeOutStandardsApi(issueModel);
- ErpRequestContent requestContent = response.DeserializeObject<ErpRequestContent>();
- if (requestContent.res == 1)
+
+ if (stockInfos.Count > 0)
{
- if (stockInfos.Count>0)
- {
- _stockInfoRepository.UpdateData(stockInfos);
- }
- return WebResponseContent.Instance.OK(requestContent.Data);
+ _stockService.StockInfoService.Repository.UpdateData(stockInfos);
}
else
{
- return WebResponseContent.Instance.Error(requestContent.Data);
+ _outStockLockInfoService.Repository.UpdateData(_OutStockLockInfos);
}
+ //鍑哄簱瀹屾垚涓婃姤ERP 娴嬭瘯娉ㄩ噴
+ _invokeERPService.InvokeOutStandardsApi(issueModel);
+ return WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
@@ -289,8 +507,8 @@
try
{
//鑾峰彇鍑哄簱鍗曞簱瀛�
- List<Dt_StockInfo> stockInfos = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).ToList();
- if (stockInfos.Count<=0)
+ List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.Repository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).ToList();
+ if (stockInfos.Count <= 0)
{
return WebResponseContent.Instance.Error($"搴撳瓨涓嶈冻");
}
--
Gitblit v1.9.3