From d8db1698c125618c1b5f62b009204ddc5d4eed5a Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 19 三月 2025 20:34:08 +0800
Subject: [PATCH] 成品代码更新....
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 643 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 542 insertions(+), 101 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 c15e44e..5bbabf2 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,7 +1,9 @@
锘縰sing AutoMapper;
+using MailKit.Search;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -14,9 +16,13 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.CodeConfigEnum;
+using WIDESEA_Core.DB;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
+using WIDESEA_Core.Seed;
using WIDESEA_Core.Utilities;
+using WIDESEA_DTO.Basic;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Outbound;
@@ -37,42 +43,261 @@
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}棰嗘枡鍗曞彿宸插瓨鍦�");
+ }
+ }
+ if (saveModel.DetailData.Count>0)
+ {
+ for (int i = 0; i < saveModel.DetailData.Count; i++)
+ {
+ saveModel.DetailData[i].Add("orderDetailStatus", OrderDetailStatusEnum.New.ObjToInt());
+ }
+ }
+ return base.AddData(saveModel);
+ }
+ 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> _OutboundOrders = new List<Dt_OutboundOrder>();
+ if (string.IsNullOrEmpty(orderNo))
+ {
+ _OutboundOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderStatus < OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
+ }
+ else
+ {
+ _OutboundOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
+ }
+ content.OK(data: _OutboundOrders);
+ }
+ 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
+ //鐢熶骇棰嗘枡,鐮斿彂棰嗘枡锛屾爣鍑嗛鏂欙紝鎺ㄩ�丒RP鍑哄簱
+ if (outboundOrder.OrderStatus == OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && outboundOrder.OrderType==OutOrderTypeEnum.Issue.ObjToInt())
+ _invokeERPService.InvokeOutStandardsApi(GetERPIssueModel(outboundOrder, warehouse.WarehouseCode));
+ #endregion
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+ public ERPIssueModel GetERPIssueModel(Dt_OutboundOrder outboundOrder, string WarehouseCode)
+ {
+ ERPIssueModel issueModel = new ERPIssueModel();
+ try
+ {
+ List<Dt_OutStockLockInfo> stockLockInfos = _outStockLockInfoService.OutStockLockInfos(outboundOrder.OrderNo);
+ List<ERPPickModel> eRPPickModels = new List<ERPPickModel>();
+ foreach (var item in stockLockInfos)
+ {
+ ERPPickItemModel pickItemModel = new ERPPickItemModel()
+ {
+ Lotno = item.BatchNo,
+ Qty = item.AssignQuantity.ToString(),
+ Location = 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 }
+ };
+ eRPPickModels.Add(pickModel);
+ }
+ ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
+ {
+ Pickcode = outboundOrder.UpperOrderNo,
+ PickList = eRPPickModels
+ };
+ string Createuser = "";
+ if (!string.IsNullOrEmpty(App.User.UserName)) Createuser = App.User.UserName;
+ else Createuser = stockLockInfos.FirstOrDefault().Creater;
+ issueModel = new ERPIssueModel()
+ {
+ UniqueTag = outboundOrder.Id.ToString(),
+ Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),
+ WarehouseCode = WarehouseCode,
+ Docremark = "",
+ Deptno = outboundOrder.DepartmentCode,
+ Deptname = outboundOrder.DepartmentName,
+ Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ Createuser = string.IsNullOrEmpty(Createuser) ? Createuser : "admin",
+ Issitem = new List<ERPIssueItemModel>() { issueItemModel },
+ };
+ //鏇存柊鍙戞枡鍗曞彿
+ outboundOrder.UpFLOrderNo = issueModel.Code;
+ BaseDal.UpdateData(outboundOrder);
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ return issueModel;
+ }
public WebResponseContent ReceiveOutOrder(ErpOutOrderDTO model)
{
try
{
+ Dt_OutboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == model.OrderNo && x.OrderStatus < OutOrderStatusEnum.鍏抽棴.ObjToInt()).Includes(x => x.Details).OrderBy(x => x.CreateDate).First();
Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == model.MCode);
+
if (materielInfo == null)
{
+ DelOutOrder(oldOutboundOrder);
return WebResponseContent.Instance.Error($"鏈壘鍒拌鐗╂枡淇℃伅");
}
Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == model.WaId);
if (warehouse == null)
{
+ DelOutOrder(oldOutboundOrder);
return WebResponseContent.Instance.Error($"鏈壘鍒拌浠撳簱淇℃伅");
}
-
- Dt_OutboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == model.OrderNo).Includes(x => x.Details).First();
if (model.Way == 1)
{
@@ -80,10 +305,12 @@
{
if (oldOutboundOrder.Details.FirstOrDefault(x => x.RowNo == Convert.ToInt32(model.RowNo)) != null)
{
+ DelOutOrder(oldOutboundOrder);
return WebResponseContent.Instance.Error($"璇ユ槑缁嗚鍙峰凡瀛樺湪");
}
if (oldOutboundOrder.WarehouseId != warehouse.WarehouseId)
{
+ DelOutOrder(oldOutboundOrder);
return WebResponseContent.Instance.Error($"浠撳簱涓嶄竴鑷�");
}
else
@@ -94,34 +321,12 @@
BatchNo = model.MLot,
MaterielCode = model.MCode,
MaterielName = materielInfo.MaterielName,
+ MaterielSpec=materielInfo.MaterielSpec,
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
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
@@ -131,11 +336,12 @@
RowNo = Convert.ToInt32(model.RowNo),
BatchNo = model.MLot,
MaterielCode = model.MCode,
+ MaterielSpec = materielInfo.MaterielSpec,
MaterielName = materielInfo.MaterielName,
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
OrderQuantity = model.Qty,
+ Unit = materielInfo.MaterielUnit
};
-
Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder()
{
UpperOrderNo = model.OrderNo,
@@ -143,33 +349,22 @@
OrderType = OutOrderTypeEnum.Issue.ObjToInt(),
CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
WarehouseId = warehouse.WarehouseId,
- Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
+ DepartmentCode = model.DepartmentCode,
+ DepartmentName = model.DepartmentName,
+ Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail },
+ Remark = model.Node
};
- List<Dt_StockInfo>? stockInfos = new List<Dt_StockInfo>();
- //ERP涓婁紶娴嬭瘯浠撻鏂欏崟鏇存柊瀵瑰簲搴撳瓨鐘舵��
- if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
+ outboundOrder.OrderType = model.OType switch
{
- 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($"娴嬭瘯鏋跺嚭搴撲笂鎶ュけ璐�");
- }
- }
+ 1 or 2 or 3=> OutOrderTypeEnum.Issue.ObjToInt(),
+ 4=>OutOrderTypeEnum.Quality.ObjToInt(),
+ 5=>OutOrderTypeEnum.Allocate.ObjToInt(),
+ 6=>OutOrderTypeEnum.MaintenanceIssue.ObjToInt(),
+ 7=>OutOrderTypeEnum.SaleOut.ObjToInt(),
+ 8=>OutOrderTypeEnum.Rework.ObjToInt(),
+ _=>0
+ };
Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
- _unitOfWorkManage.CommitTran();
-
}
}
else if (model.Way == 2)
@@ -192,9 +387,11 @@
RowNo = Convert.ToInt32(model.RowNo),
BatchNo = model.MLot,
MaterielCode = model.MCode,
+ MaterielSpec = materielInfo.MaterielSpec,
MaterielName = materielInfo.MaterielName,
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
OrderQuantity = model.Qty,
+ Unit = model.Unit,
};
_outboundOrderDetailRepository.UpdateData(outboundOrderDetail);
@@ -205,6 +402,10 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌鍑哄簱鍗�");
}
+ _unitOfWorkManage.BeginTran();
+ BaseDal.DeleteData(oldOutboundOrder);
+ _outboundOrderDetailRepository.DeleteData(oldOutboundOrder.Details);
+ _unitOfWorkManage.CommitTran();
}
return WebResponseContent.Instance.OK();
@@ -216,20 +417,258 @@
}
}
/// <summary>
+ /// 璇ュ崟鎹け璐ヨ繘琛屽垹闄�
+ /// </summary>
+ /// <returns></returns>
+ public void DelOutOrder(Dt_OutboundOrder outboundOrder)
+ {
+ try
+ {
+ if (outboundOrder != null && outboundOrder.Details.Count > 0)
+ {
+ _unitOfWorkManage.BeginTran();
+ _outboundOrderRepository.DeleteAndMoveIntoHty(outboundOrder, OperateTypeEnum.鑷姩鍒犻櫎);
+ _outboundOrderDetailRepository.DeleteAndMoveIntoHty(outboundOrder.Details, OperateTypeEnum.鑷姩鍒犻櫎);
+ _unitOfWorkManage.CommitTran();
+ }
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ throw new Exception(ex.Message);
+ }
+ }
+ //涓婃姤鍑哄簱瀹屾垚
+ 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_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 (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
+ {
+ List<ERPPickModel> eRPPicks = new List<ERPPickModel>();
+ foreach (var item in outboundOrder.Details)
+ {
+ if (item.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()) continue;
+ stockInfos = TestOutStocksUpdate(warehouse, item).Data as List<Dt_StockInfo> ?? null;
+ if (stockInfos == null) continue;
+ 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
+ };
+ eRPOutPick.Add(pickItemModel);
+ }
+
+ ERPPickModel pickModel = new ERPPickModel()
+ {
+ Rowindex = item.RowNo,
+ Material = item.MaterielCode,
+ Qty = (item.OrderQuantity.ObjToInt()).ToString(),
+ Dataitem = eRPOutPick
+ };
+ eRPPicks.Add(pickModel);
+ }
+ ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
+ {
+ Pickcode = outboundOrder.UpperOrderNo,
+ PickList = eRPPicks
+ };
+ issueModel = new ERPIssueModel()
+ {
+ UniqueTag = id.ToString(),
+ Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),
+ WarehouseCode = warehouse.WarehouseCode,
+ Docremark = "",
+ Deptno = outboundOrder.DepartmentCode,
+ Deptname = outboundOrder.DepartmentName,
+ Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ Createuser = outboundOrder.Creater,
+ Issitem = new List<ERPIssueItemModel>() { issueItemModel },
+ };
+ //鏇存柊鍙戞枡鍗曞彿
+ outboundOrder.UpFLOrderNo = issueModel.Code;
+ BaseDal.UpdateData(outboundOrder);
+ _invokeERPService.InvokeOutStandardsApi(issueModel);
+ }
+ else
+ {
+ #region MyRegion
+ foreach (var item in outStockLockInfos)
+ {
+ if (item.OrderQuantity == item.AssignQuantity)
+ {
+ item.Status = OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ }
+ _OutStockLockInfos.Add(item);
+ }
+ #endregion
+
+ #region MyRegion
+ //List<ERPPickModel> eRPPickModels = new List<ERPPickModel>();
+
+ ////鑾峰彇鍑哄簱璇︽儏鍗�
+ //foreach (var item in outStockLockInfos)
+ //{
+ // 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 = eRPPickModels
+ //};
+ //issueModel = new ERPIssueModel()
+ //{
+ // UniqueTag = id.ToString(),
+ // Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),
+ // WarehouseCode = warehouse.WarehouseCode,
+ // Docremark = "",
+ // Deptno = outboundOrder.DepartmentCode,
+ // Deptname = outboundOrder.DepartmentName,
+ // Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ // Createuser = outStockLockInfos.FirstOrDefault().Creater,
+ // Issitem = new List<ERPIssueItemModel>() { issueItemModel },
+ //};
+ #endregion
+ if (stockInfos.Count > 0)
+ {
+ _stockService.StockInfoService.Repository.UpdateData(stockInfos);
+ }
+ else
+ {
+ _outStockLockInfoService.Repository.UpdateData(_OutStockLockInfos);
+ }
+ //鍑哄簱瀹屾垚涓婃姤ERP 娴嬭瘯娉ㄩ噴
+ if (outboundOrder.OrderStatus == OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt())
+ {
+ issueModel = GetERPIssueModel(outboundOrder, warehouse.WarehouseCode);
+ _invokeERPService.InvokeOutStandardsApi(issueModel);
+ }
+ }
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ static object lock_code = new object();
+ public string CreateCodeByRule(string ruleCode)
+ {
+ lock (lock_code)
+ {
+
+ string code = string.Empty;
+ DateTime dateTime = DateTime.Now;
+ DateTime now = DateTime.Now;
+ try
+ {
+ if (string.IsNullOrEmpty(ruleCode))
+ throw new ArgumentNullException(nameof(ruleCode));
+ SqlSugarClient sugarClient = new SqlSugarClient(new ConnectionConfig
+ {
+ IsAutoCloseConnection = true,
+ DbType = DbType.SqlServer,
+ ConnectionString = DBContext.ConnectionString
+ });
+ Dt_CodeRuleConfig codeRuleConfig = sugarClient.Queryable<Dt_CodeRuleConfig>().Where(x => x.RuleCode == ruleCode).First();
+ if (codeRuleConfig == null)
+ throw new ArgumentNullException(nameof(codeRuleConfig));
+ if (codeRuleConfig.ModifyDate != null)
+ {
+ dateTime = Convert.ToDateTime(codeRuleConfig.ModifyDate);
+ }
+ else
+ {
+ dateTime = Convert.ToDateTime(codeRuleConfig.CreateDate);
+ }
+
+ if (now.Year == dateTime.Year && now.Month == dateTime.Month && now.Day == dateTime.Day)
+ {
+ now = dateTime;
+ codeRuleConfig.CurrentVal = Convert.ToInt32(codeRuleConfig.CurrentVal) + 1;
+ }
+ else
+ {
+ codeRuleConfig.CurrentVal = 1;
+ }
+ codeRuleConfig.ModifyDate = DateTime.Now;
+ code = codeRuleConfig.Format;
+ code = code.Replace($"[{CodeFormatTypeEnum.YYYY}]", now.Year.ToString().PadLeft(4, '0'));
+ code = code.Replace($"[{CodeFormatTypeEnum.MM}]", now.Month.ToString().PadLeft(2, '0'));
+ code = code.Replace($"[{CodeFormatTypeEnum.DD}]", now.Day.ToString().PadLeft(2, '0'));
+ code = code.Replace($"[{CodeFormatTypeEnum.ST}]", codeRuleConfig.StartStr?.ToString() ?? "");
+ code = code.Replace($"[{CodeFormatTypeEnum.NUM}]", codeRuleConfig.CurrentVal.ToString().PadLeft(codeRuleConfig.Length, '0'));
+ Dictionary<string, object> keyValuePairs = new Dictionary<string, object>() { { nameof(codeRuleConfig.CurrentVal), codeRuleConfig.CurrentVal }, { nameof(codeRuleConfig.Id), codeRuleConfig.Id }, { nameof(codeRuleConfig.ModifyDate), DateTime.Now } };
+ sugarClient.Updateable(keyValuePairs).AS(MainDb.CodeRuleConfig).WhereColumns(nameof(codeRuleConfig.Id)).ExecuteCommand();
+ sugarClient.Updateable(codeRuleConfig);
+
+ }
+ catch (Exception ex)
+ {
+
+ }
+ return code;
+ }
+ }
+ /// <summary>
/// 鏇存敼鍑哄簱鍗曞簱瀛樼姸鎬�
/// </summary>
/// <param name="warehouse"></param>
/// <param name="model"></param>
/// <returns></returns>
- public WebResponseContent TestOutStocksUpdate(Dt_Warehouse warehouse, ErpOutOrderDTO model)
+ public WebResponseContent TestOutStocksUpdate(Dt_Warehouse warehouse, Dt_OutboundOrderDetail outboundOrderDetails)
{
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();
- if (model.Qty > stockInfos.Count)
+ List<Dt_StockInfo> stockInfos = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).Where(x => x.Details.Any(j => j.MaterielCode == outboundOrderDetails.MaterielCode)).Take((int)outboundOrderDetails.OrderQuantity).ToList();
+ if (stockInfos.Count <= 0)
{
- return WebResponseContent.Instance.Error($"鐗╂枡:{model.MCode}搴撳瓨涓嶈冻");
+ return WebResponseContent.Instance.OK();
}
//鏇存敼鐘舵��
stockInfos.ForEach(x =>
@@ -243,58 +682,60 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
- ///鎺ㄩ�佹祴璇曟灦鍑哄簱
- public WebResponseContent TestOutBack(List<Dt_StockInfo> stockInfos,Dt_Warehouse warehouse, ErpOutOrderDTO model)
+ /// <summary>
+ /// 鏍规嵁鍑哄簱鍗曟帹閫丒RP绯荤粺
+ /// </summary>
+ /// <param name="outId"></param>
+ /// <param name="WarehouseCode"></param>
+ /// <returns></returns>
+ public WebResponseContent PushERPOutBound(int outId, string WarehouseCode)
{
+ WebResponseContent content=new WebResponseContent();
try
{
- //娴嬭瘯鏋跺簱缁橢RP涓婃姤鍑哄簱瀹屾垚
- List<ERPOutPickDetail> pickDetails = stockInfos.Select(x => new ERPOutPickDetail()
+ //鑾峰彇鍑哄簱鍗�
+ Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == outId).Includes(x => x.Details).First();
+ if (outboundOrder == null)
{
- 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);
+ return content.Error("鍑哄簱鍗曚笉瀛樺湪");
}
- else
+ if (outboundOrder.Details.Count!=(outboundOrder.Details.Where(x=>x.OrderDetailStatus==OrderDetailStatusEnum.Over.ObjToInt()).ToList().Count)||outboundOrder.OrderStatus!=OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt())
{
- return WebResponseContent.Instance.Error(requestContent.Data);
+ return content.Error("璇ュ嚭搴撳崟鏈畬鎴�");
}
+ ERPIssueModel issueModel = GetERPIssueModel(outboundOrder, WarehouseCode);
+ string response=_invokeERPService.InvokeOutStandardsApi(issueModel);
+ return content.OK(response);
}
catch (Exception ex)
{
- return WebResponseContent.Instance.Error(ex.Message);
+ content.Error(ex.Message);
}
+ return content;
}
-
- //public WebResponseContent FeedbackOutbondIssue(List<Dt_OutStockLockInfo> outStockLockInfos)
- //{
- // ERPPickItemModel
- //}
+ public WebResponseContent OutUpOrderGetFLOrder()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ //鑾峰彇鍑哄簱鍗�
+ List<Dt_OutboundOrder> outboundOrders = BaseDal.QueryData(x => x.OrderStatus == OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && x.UpFLOrderNo == null);
+ List<Sys_Log> logs = BaseDal.Db.Queryable<Sys_Log>().Where(x => x.RequestParam.Contains("棰嗘枡鍑哄簱閫氱煡鍗�") && x.Id > 14606).ToList();
+ foreach (var item in outboundOrders)
+ {
+ Sys_Log? log = logs.FirstOrDefault(x=>x.RequestParam.Contains(item.UpperOrderNo));
+ if (log == null) { continue; }
+ ERPBaseModel <ERPIssueModel> baseModel= log.RequestParam.DeserializeObject<ERPBaseModel<ERPIssueModel>>();
+ item.UpFLOrderNo = baseModel.Data.Code;
+ }
+ BaseDal.UpdateData(outboundOrders);
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3