From f4e01fb44b5428e61780e63d272df1d03f7281f3 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期六, 28 十二月 2024 13:49:32 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 185 +++++++++++++++++++++------------------------
1 files changed, 87 insertions(+), 98 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 0769450..026f877 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"
@@ -1,4 +1,5 @@
锘縰sing AutoMapper;
+using MailKit.Search;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
@@ -41,17 +42,19 @@
private readonly IStockInfoRepository _stockInfoRepository;
public IOutboundOrderRepository Repository => BaseDal;
private readonly IInvokeERPService _invokeERPService;
+ private readonly IOutStockLockInfoService _outStockLockInfoService;
public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper,IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IStockInfoService stockInfoService,
- IStockInfoRepository stockInfoRepository, IInvokeERPService invokeERPService) : base(BaseDal)
+ IStockInfoRepository stockInfoRepository, IInvokeERPService invokeERPService, IOutStockLockInfoService outStockLockInfoService) : base(BaseDal)
{
_mapper = mapper;
- _unitOfWorkManage=unitOfWorkManage;
+ _unitOfWorkManage = unitOfWorkManage;
_basicService = basicService;
_outboundOrderDetailRepository = outboundOrderDetailRepository;
_stockInfoService = stockInfoService;
_stockInfoRepository = stockInfoRepository;
_invokeERPService = invokeERPService;
+ _outStockLockInfoService = outStockLockInfoService;
}
public WebResponseContent ReceiveOutOrder(ErpOutOrderDTO model)
@@ -96,30 +99,7 @@
OrderQuantity = model.Qty,
OrderId = oldOutboundOrder.Id
};
- List<Dt_StockInfo>? stockInfos = new List<Dt_StockInfo>();
- //ERP涓婁紶娴嬭瘯浠撻鏂欏崟鏇存柊瀵瑰簲搴撳瓨鐘舵��
- if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
- {
- WebResponseContent responseContent = TestOutStocksUpdate(warehouse, model);
- if (!responseContent.Status)
- {
- return responseContent;
- }
- stockInfos = responseContent.Data as List<Dt_StockInfo>;
- }
- _unitOfWorkManage.BeginTran();
- if (stockInfos.Count>0)
- {
- _stockInfoRepository.UpdateData(stockInfos);
- //娴嬭瘯鏋跺簱缁橢RP涓婃姤鍑哄簱瀹屾垚
- if (!TestOutBack(stockInfos, warehouse, model).Status)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error($"娴嬭瘯鏋跺嚭搴撲笂鎶ュけ璐�");
- }
- }
_outboundOrderDetailRepository.AddData(outboundOrderDetail);
- _unitOfWorkManage.CommitTran();
}
}
else
@@ -133,41 +113,19 @@
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
OrderQuantity = model.Qty,
};
-
Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder()
{
+ OrderNo=model.OrderNo,
UpperOrderNo = model.OrderNo,
OrderStatus = OutOrderStatusEnum.鏈紑濮�.ObjToInt(),
OrderType = OutOrderTypeEnum.Issue.ObjToInt(),
CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
WarehouseId = warehouse.WarehouseId,
+ DepartmentCode = model.DepartmentCode,
+ DepartmentName = model.DepartmentName,
Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
};
- List<Dt_StockInfo>? stockInfos = new List<Dt_StockInfo>();
- //ERP涓婁紶娴嬭瘯浠撻鏂欏崟鏇存柊瀵瑰簲搴撳瓨鐘舵��
- if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
- {
- WebResponseContent responseContent = TestOutStocksUpdate(warehouse, model);
- if (!responseContent.Status)
- {
- return responseContent;
- }
- stockInfos = responseContent.Data as List<Dt_StockInfo>;
- }
- _unitOfWorkManage.BeginTran();
- if (stockInfos.Count > 0)
- {
- _stockInfoRepository.UpdateData(stockInfos);
- //娴嬭瘯鏋跺簱缁橢RP涓婃姤鍑哄簱瀹屾垚
- if (!TestOutBack(stockInfos, warehouse, model).Status)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error($"娴嬭瘯鏋跺嚭搴撲笂鎶ュけ璐�");
- }
- }
Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
- _unitOfWorkManage.CommitTran();
-
}
}
else if (model.Way == 2)
@@ -213,6 +171,62 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+ //涓婃姤鍑哄簱瀹屾垚 娴嬭瘯鏋�
+ public WebResponseContent TestOutUpload(int id)
+ {
+ try
+ {
+ 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);
+ //娴嬭瘯鏋跺簱缁橢RP涓婃姤鍑哄簱瀹屾垚
+ ERPPickItemModel eRPOutPick = new ERPPickItemModel()
+ {
+ Lotno = "20241227001",
+ Qty = "1",
+ Location = warehouse.WarehouseCode
+ };
+ 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> { eRPOutPick }
+ };
+
+ ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
+ {
+ Pickcode = outboundOrder.UpperOrderNo,
+ PickList = new List<ERPPickModel>() { pickModel }
+ };
+ ERPIssueModel issueModel = new ERPIssueModel()
+ {
+ UniqueTag = id.ToString(),
+ Code = "FL20241227001",//娴嬭瘯
+ WarehouseCode = warehouse.WarehouseCode,
+ Docremark = "",
+ Deptno = outboundOrder.DepartmentCode,
+ Deptname = outboundOrder.DepartmentName,
+ Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ Createuser = "TC20082",
+ Issitem = new List<ERPIssueItemModel>() { issueItemModel },
+ };
+ string response = _invokeERPService.InvokeOutStandardsApi(issueModel);
+ ErpRequestContent requestContent = response.DeserializeObject<ErpRequestContent>();
+ if (requestContent.res == 1)
+ {
+
+ return WebResponseContent.Instance.OK(requestContent.Data);
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error(requestContent.Data);
+ }
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
/// <summary>
/// 鏇存敼鍑哄簱鍗曞簱瀛樼姸鎬�
/// </summary>
@@ -224,7 +238,7 @@
try
{
//鑾峰彇鍑哄簱鍗曞簱瀛�
- List<Dt_StockInfo> stockInfos = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).OrderBy(x => x.CreateDate).Includes(x => x.Details).Where(x => x.Details.Any(x => x.MaterielCode == model.MCode)).Take((int)(model.Qty)).ToList();
+ List<Dt_StockInfo> stockInfos = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).ToList();
if (model.Qty > stockInfos.Count)
{
return WebResponseContent.Instance.Error($"鐗╂枡:{model.MCode}搴撳瓨涓嶈冻");
@@ -242,53 +256,28 @@
}
}
///鎺ㄩ�佹祴璇曟灦鍑哄簱
- public WebResponseContent TestOutBack(List<Dt_StockInfo> stockInfos,Dt_Warehouse warehouse, ErpOutOrderDTO model)
- {
- try
- {
- //娴嬭瘯鏋跺簱缁橢RP涓婃姤鍑哄簱瀹屾垚
- List<ERPOutPickDetail> pickDetails = stockInfos.Select(x => new ERPOutPickDetail()
- {
- Lotno = x.Details[0].BatchNo,
- Qty = x.Details[0].StockQuantity
- }).ToList();
- ERPOutPick outPick = new ERPOutPick()
- {
- Rowindex = model.RowNo,
- Material = model.MCode,
- Qty = model.Qty,
- Dataitem = pickDetails
- };
- ERPOutboundModel inboundModel = new ERPOutboundModel()
- {
- Way = 1,
- UniqueTag = model.OrderNo,
- Code = model.OrderNo,
- WarehouseCode = warehouse.WarehouseCode,
- Docremark = "",
- Deptno = model.DepartmentCode,
- DeptName = model.DepartmentName,
- Createtime = DateTime.Now,
- Createuser = "WMS",
- Picklist = new List<ERPOutPick>() { outPick },
- };
- string response = _invokeERPService.InvokeOutboundOrderApi(inboundModel);
- ErpRequestContent requestContent=response.DeserializeObject<ErpRequestContent>();
- if (requestContent.res==1)
- {
-
- return WebResponseContent.Instance.OK(requestContent.Data);
- }
- else
- {
- return WebResponseContent.Instance.Error(requestContent.Data);
- }
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
+ //public WebResponseContent TestOutBack(int id,List<string> locationIds)
+ //{
+ // try
+ // {
+
+ // string response = _invokeERPService.InvokeOutStandardsApi(issueModel);
+ // ErpRequestContent requestContent = response.DeserializeObject<ErpRequestContent>();
+ // if (requestContent.res == 1)
+ // {
+
+ // return WebResponseContent.Instance.OK(requestContent.Data);
+ // }
+ // else
+ // {
+ // return WebResponseContent.Instance.Error(requestContent.Data);
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // return WebResponseContent.Instance.Error(ex.Message);
+ // }
+ //}
//public WebResponseContent FeedbackOutbondIssue(List<Dt_OutStockLockInfo> outStockLockInfos)
//{
--
Gitblit v1.9.3