From 011380fa88a9bd5614355e56da28972be5047902 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 15 12月 2024 13:46:34 +0800
Subject: [PATCH] 2222
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs | 158 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 148 insertions(+), 10 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
index e698432..2173d2f 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
@@ -8,6 +8,8 @@
using Microsoft.CodeAnalysis.Operations;
using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
using Furion.DatabaseAccessor;
+using Admin.NET.Application.Service.WmsCommonnQuery.Dto;
+using Admin.NET.Application.CommonHelper;
namespace Admin.NET.Application;
/// <summary>
@@ -26,6 +28,7 @@
private readonly SqlSugarRepository<WmsRecordPackageProcess> _wmsRecordPackageProcessRep;
private readonly SqlSugarRepository<Mes_Upi_LineQueue> _mes_Upi_LineQueueRep;
private readonly SqlSugarRepository<WmsRecordUpiNg> _wmsRecordUpiNgRep;
+ private readonly WmsCommonnQueryService _wmsCommonnQueryService;
public WmsOperationTaskService(
SqlSugarRepository<Mes_Upi_LineQueue> mes_Upi_LineQueueRep,
@@ -37,8 +40,10 @@
, SqlSugarRepository<WmsRecordUpiProcess> wmsRecordUpiProcessRep
, SqlSugarRepository<WmsRecordPackageProcess> wmsRecordPackageProcessRep
, SqlSugarRepository<WmsRecordUpiNg> wmsRecordUpiNgRep
+ , WmsCommonnQueryService wmsCommonnQueryService
)
{
+ _wmsCommonnQueryService = wmsCommonnQueryService;
_wmsRecordUpiNgRep = wmsRecordUpiNgRep;
_sysConfigRep = sysConfigRep;
_mesPackageGatherRep = mesPackageGatherRep;
@@ -68,25 +73,119 @@
{
throw Oops.Oh("鍙傛暟涓嶈兘涓虹┖");
}
+ //楠岃瘉浼犻�掔殑鍖呮槸鍚﹂兘鍦ㄩ綈鍖呬箣鍐呫��
+ List<WmsPackListOutput> packList = await _wmsCommonnQueryService.PackList(new Service.WmsCommonnQuery.Dto.PackListInput() { IsPack = false });
+
List<WmsStockQuan> updateQuanList = new List<WmsStockQuan>();
foreach (var item in input.PackageCodeList)
{
+ var isExistCount = packList.Where(x => x.PackageCode == item).Count();
+ if (isExistCount == 0)
+ {
+ throw Oops.Oh($"鍖厈item}涓嶆槸缂哄寘鐘舵�侊紝璇锋鏌ワ紒");
+ }
+
var quanList = await _wmsStockQuanRep.AsQueryable().Where(x => x.PackageCode == item).ToListAsync();
- var isExist = quanList.Where(x => x.StockStatus == StockStatusEnum.榻愬寘寰呭嚭搴�).Count();
+ var isExist = quanList.Where(x => x.StockStatus == StockStatusEnum.榻愬寘寰呭嚭搴� || x.StockStatus == StockStatusEnum.浜哄伐榻愬寘鍑哄簱浠诲姟宸插垱寤�).Count();
if (isExist > 0)
{
- throw Oops.Oh($"鍖厈item}涓叾涓湁鏉跨姸鎬佹槸'{StockStatusEnum.榻愬寘寰呭嚭搴�.ToString()}'锛屼笉鍏佽寮哄埗鍑哄簱");
+ throw Oops.Oh($"鍖厈item}涓叾涓湁鏉跨姸鎬佹槸'{StockStatusEnum.榻愬寘寰呭嚭搴�.ToString()}' 鎴�'{StockStatusEnum.浜哄伐榻愬寘鍑哄簱浠诲姟宸插垱寤�.ToString()}'锛屼笉鍏佽寮哄埗鍑哄簱");
}
//鏇存柊鐘舵��
foreach (var quan in quanList)
{
+ if (quan.StockStatus != StockStatusEnum.鍦ㄥ簱 && quan.StockStatus != StockStatusEnum.宸插喕缁�)
+ {
+ throw Oops.Oh($"閮ㄤ欢鏉＄爜{quan.Upi}鐨勫簱瀛樼姸鎬佷笉鏄�'{StockStatusEnum.鍦ㄥ簱.ToString()}鎴杮StockStatusEnum.宸插喕缁�.ToString()}'鐘舵��");
+ }
+
quan.StockStatus = StockStatusEnum.浜哄伐寮哄埗寰呭嚭搴�;
quan.StockStatusName = StockStatusEnum.浜哄伐寮哄埗寰呭嚭搴�.ToString();
quan.UpdateTime = DateTime.Now;
quan.OperReason = "浜哄伐寮哄埗寰呭嚭搴�";
}
updateQuanList.AddRange(quanList);
+
+ var packageObj = await _mesPackageGatherRep.GetFirstAsync(x => x.PackageCode == item);
+ packageObj.UpiFlag = UpiFlagEnum.NG;
+ packageObj.UpiStatus = UpiStatusEnum.宸蹭笅绾�;
+ await _mesPackageGatherRep.UpdateAsync(packageObj);
+ }
+
+ //妯″紡鍒ゆ柇
+ var client = await WCFServiceHelper.GetWCFService_SAPCC_Client(_sysConfigRep);
+ var res = await client.ValidateModeAsync(1);
+ if (res.result == false)
+ {
+ throw Oops.Oh(res.resMsg);
+ }
+
+ await _wmsStockQuanRep.UpdateRangeAsync(updateQuanList);
+
+ }
+
+
+ /// <summary>
+ /// 浜哄伐榻愬寘鍑哄簱
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "PersonOutbound")]
+ [Description("WmsOperationTask/PersonOutbound")]
+ [UnitOfWork]
+ public async Task PersonOutbound(PersonOutboundInput input)
+ {
+ if (input == null || input.PackageCodeList?.Count == 0)
+ {
+ throw Oops.Oh("鍙傛暟涓嶈兘涓虹┖");
+ }
+ //楠岃瘉浼犻�掔殑鍖呮槸鍚﹂兘鍦ㄩ綈鍖呬箣鍐呫��
+ List<WmsPackListOutput> packList = await _wmsCommonnQueryService.PackList(new Service.WmsCommonnQuery.Dto.PackListInput() { IsPack = true });
+
+ List<WmsStockQuan> updateQuanList = new List<WmsStockQuan>();
+ foreach (var item in input.PackageCodeList)
+ {
+ var isExistCount = packList.Where(x => x.PackageCode == item).Count();
+ if (isExistCount == 0)
+ {
+ throw Oops.Oh($"鍖厈item}涓嶆槸榻愬寘鐘舵�侊紝璇锋鏌ワ紒");
+ }
+
+ var quanList = await _wmsStockQuanRep.AsQueryable().Where(x => x.PackageCode == item).ToListAsync();
+ var isExist = quanList.Where(x => x.StockStatus == StockStatusEnum.浜哄伐寮哄埗寰呭嚭搴� || x.StockStatus == StockStatusEnum.浜哄伐寮哄埗浠诲姟宸插垱寤�).Count();
+ if (isExist > 0)
+ {
+ throw Oops.Oh($"鍖厈item}涓叾涓湁鏉跨姸鎬佹槸'{StockStatusEnum.浜哄伐寮哄埗寰呭嚭搴�.ToString()}'鎴�'{StockStatusEnum.浜哄伐寮哄埗浠诲姟宸插垱寤�.ToString()}'锛屼笉鍏佽浜哄伐榻愬寘鍑哄簱");
+ }
+
+ //鏇存柊鐘舵��
+ foreach (var quan in quanList)
+ {
+ if (quan.StockStatus != StockStatusEnum.鍦ㄥ簱 && quan.StockStatus != StockStatusEnum.宸插喕缁�)
+ {
+ throw Oops.Oh($"閮ㄤ欢鏉＄爜{quan.Upi}鐨勫簱瀛樼姸鎬佷笉鏄�'{StockStatusEnum.鍦ㄥ簱.ToString()}鎴杮StockStatusEnum.宸插喕缁�.ToString()}'鐘舵��");
+ }
+ quan.StockStatus = StockStatusEnum.榻愬寘寰呭嚭搴�;
+ quan.StockStatusName = StockStatusEnum.榻愬寘寰呭嚭搴�.ToString();
+ quan.UpdateTime = DateTime.Now;
+ quan.OperReason = "浜哄伐榻愬寘鍑哄簱";
+ }
+ updateQuanList.AddRange(quanList);
+
+ var packageObj = await _mesPackageGatherRep.GetFirstAsync(x => x.PackageCode == item);
+ packageObj.UpiStatus = UpiStatusEnum.宸查綈鍖�;
+ packageObj.IsQiBao = true;
+ await _mesPackageGatherRep.UpdateAsync(packageObj);
+ }
+
+ //妯″紡鍒ゆ柇
+ var client = await WCFServiceHelper.GetWCFService_SAPCC_Client(_sysConfigRep);
+ var res = await client.ValidateModeAsync(2);
+ if (res.result == false)
+ {
+ throw Oops.Oh(res.resMsg);
}
await _wmsStockQuanRep.UpdateRangeAsync(updateQuanList);
@@ -133,18 +232,57 @@
var setValue = "";
var _QiTaoReuslt = "";
- var other_orderList = await _mesPackageGatherRep.AsQueryable().Where(x => x.Info5 == package.Info5 && x.PackageCode != input.PackageCode).ToListAsync();
- var num = other_orderList.Where(x => x.UpiStatus == UpiStatusEnum.鍒濆 || x.UpiStatus == UpiStatusEnum.涓嶉綈鍖�).Count();
- if (num > 0)
+
+ bool isNeedQueryQiTao = true;
+ var order = await _mesOrderGatherRep.AsQueryable().Where(x => x.Info5 == package.Info5).FirstAsync();
+ if (order == null)
{
- //涓嶉綈濂�
- setValue = $"{input.PackageCode}|涓嶉綈濂梶" + curUserName;
- _QiTaoReuslt = "涓嶉綈濂�";
+
}
else
{
- setValue = $"{input.PackageCode}|榻愬|" + curUserName;
- _QiTaoReuslt = "榻愬";
+ if (order.IsKitting != null)
+ {
+ _QiTaoReuslt = (bool)order.IsKitting ? "榻愬" : "涓嶉綈濂�";
+ isNeedQueryQiTao = false;
+ }
+ }
+ if (isNeedQueryQiTao)
+ {
+ var other_orderList = await _mesPackageGatherRep.AsQueryable().Where(x => x.Info5 == package.Info5 && x.PackageCode != input.PackageCode).ToListAsync();
+ var num = other_orderList.Where(x => x.UpiStatus == UpiStatusEnum.鍒濆).Count();
+ if (num > 0)
+ {
+ //涓嶉綈濂�
+ _QiTaoReuslt = "涓嶉綈濂�";
+ }
+ else
+ {
+ _QiTaoReuslt = "榻愬";
+ }
+ }
+ setValue = $"{input.PackageCode}|{_QiTaoReuslt}|" + curUserName;
+
+ if (package.UpiStatus == UpiStatusEnum.宸蹭笅绾�)
+ {
+ throw Oops.Oh($"鍖呭凡涓嬬嚎,榻愬缁撴灉[{_QiTaoReuslt}]");
+ }
+
+ if (order == null)
+ {
+ Mes_Order_Gather newOrder = new Mes_Order_Gather()
+ {
+ Info5 = package.Info5,
+ IsKitting = _QiTaoReuslt == "榻愬" ? true : false,
+ PlanNo = package.PlanNo,
+ OrderId = package.OrderId
+ };
+ await _mesOrderGatherRep.InsertAsync(newOrder);
+ }
+ else
+ {
+ order.IsKitting = _QiTaoReuslt == "榻愬" ? true : false;
+ await _mesOrderGatherRep.UpdateAsync(order);
}
--
Gitblit v1.9.3