From 67f5edce916d4cb8b13a0aafa637af1ad0c7161f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 03 12月 2024 14:55:37 +0800
Subject: [PATCH] 2
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs | 97 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 93 insertions(+), 4 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 f4a625a..ad0330a 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
@@ -7,6 +7,7 @@
using DocumentFormat.OpenXml.Office.CustomUI;
using Microsoft.CodeAnalysis.Operations;
using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
+using Furion.DatabaseAccessor;
namespace Admin.NET.Application;
/// <summary>
@@ -21,12 +22,16 @@
private readonly SqlSugarRepository<SysConfig> _sysConfigRep;
private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _mesBatchOrderUpiRep;
private readonly SqlSugarRepository<Mes_Order_Gather> _mesOrderGatherRep;
+ private readonly SqlSugarRepository<WmsRecordUpiProcess> _wmsRecordUpiProcessRep;
+ private readonly SqlSugarRepository<WmsRecordPackageProcess> _wmsRecordPackageProcessRep;
public WmsOperationTaskService(SqlSugarRepository<WmsRbLineTask> rep, SqlSugarRepository<WmsStockQuan> wmsStockQuanRep
, SqlSugarRepository<Mes_Package_Gather> mesPackageGatherRep
, SqlSugarRepository<SysConfig> sysConfigRep
, SqlSugarRepository<Mes_BatchOrderUPI_New> mesBatchOrderUpiRep
, SqlSugarRepository<Mes_Order_Gather> mesOrderGatherRep
+ , SqlSugarRepository<WmsRecordUpiProcess> wmsRecordUpiProcessRep
+ , SqlSugarRepository<WmsRecordPackageProcess> wmsRecordPackageProcessRep
)
{
_sysConfigRep = sysConfigRep;
@@ -35,6 +40,8 @@
_wmsStockQuanRep = wmsStockQuanRep;
_mesBatchOrderUpiRep = mesBatchOrderUpiRep;
_mesOrderGatherRep = mesOrderGatherRep;
+ _wmsRecordUpiProcessRep = wmsRecordUpiProcessRep;
+ _wmsRecordPackageProcessRep = wmsRecordPackageProcessRep;
}
@@ -85,6 +92,7 @@
[HttpPost]
[ApiDescriptionSettings(Name = "ValdateQiTao")]
[Description("WmsOperationTask/ValdateQiTao")]
+ [UnitOfWork]
public async Task<ValidateQiTaoOutput> ValdateQiTao(ValidateQiTaoInput input)
{
ValidateQiTaoOutput output = new ValidateQiTaoOutput();
@@ -111,6 +119,9 @@
throw Oops.Oh($"鍒ゆ柇榻愬鍊煎凡缁忓瓨鍦ㄥ�納sysConfig.Value},涓嶅厑璁告搷浣�");
}
+ //璁板綍宸ヤ綔鏃堕棿鍜屽伐浣滀汉
+ var curUserName = App.User.FindFirst(ClaimConst.RealName)?.Value;
+
var setValue = "";
var _QiTaoReuslt = "";
var other_orderList = await _mesPackageGatherRep.AsQueryable().Where(x => x.Info5 == package.Info5 && x.PackageCode != input.PackageCode).ToListAsync();
@@ -118,12 +129,12 @@
if (num > 0)
{
//涓嶉綈濂�
- setValue = $"{input.PackageCode}|涓嶉綈濂�";
+ setValue = $"{input.PackageCode}|涓嶉綈濂梶" + curUserName;
_QiTaoReuslt = "涓嶉綈濂�";
}
else
{
- setValue = $"{input.PackageCode}|榻愬";
+ setValue = $"{input.PackageCode}|榻愬|" + curUserName;
_QiTaoReuslt = "榻愬";
}
@@ -132,7 +143,25 @@
sysConfig.Value = setValue;
await _sysConfigRep.UpdateAsync(sysConfig);
- //璁板綍宸ヤ綔鏃堕棿鍜屽伐浣滀汉
+
+ var sysConfig_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_oper);
+ if (sysConfig_wms_unline_oper == null)
+ {
+ throw Oops.Oh($"娌℃湁閰嶇疆 鍖呰涓嬬嚎鎿嶄綔浜� 鍊�");
+ }
+ if (sysConfig_wms_unline_oper.Value != curUserName)
+ {
+ sysConfig_wms_unline_oper.Value = curUserName;
+ await _sysConfigRep.UpdateAsync(sysConfig_wms_unline_oper);
+
+ var sysConfig_wms_unline_time = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_time);
+ if (sysConfig_wms_unline_time == null)
+ {
+ throw Oops.Oh($"娌℃湁閰嶇疆 鍖呰涓嬬嚎鐧婚檰鏃堕棿 鍊�");
+ }
+ sysConfig_wms_unline_time.Value = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ await _sysConfigRep.UpdateAsync(sysConfig_wms_unline_time);
+ }
output = package.Adapt<ValidateQiTaoOutput>();
@@ -171,10 +200,70 @@
{
throw Oops.Oh($"娌℃湁鎵惧埌鍖呭彿{input.PackageCode}鐨勬眹鎬绘暟鎹�");
}
+
+ WmsRecordPackageProcess wmsRecordPackage = new WmsRecordPackageProcess();
+ wmsRecordPackage = singlePackage.Adapt<WmsRecordPackageProcess>();
+ wmsRecordPackage.CreateTime = DateTime.Now;
+ wmsRecordPackage.Location = "BZ29";
+ wmsRecordPackage.OperRemark = "鏍稿鏍囩";
+ await _wmsRecordPackageProcessRep.InsertAsync(wmsRecordPackage);
+
+ WmsRecordUpiProcess wmsRecordUpi = new WmsRecordUpiProcess();
+ wmsRecordUpi = singleUpi.Adapt<WmsRecordUpiProcess>();
+ wmsRecordUpi.CreateTime = DateTime.Now;
+ wmsRecordUpi.Location = "BZ29";
+ wmsRecordUpi.OperRemark = "鏍稿鏍囩";
+ await _wmsRecordUpiProcessRep.InsertAsync(wmsRecordUpi);
+
return singlePackage;
}
-
+ /// <summary>
+ /// NG鍖呬笅绾�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "UnlineForNGPackage")]
+ [Description("WmsOperationTask/UnlineForNGPackage")]
+ public async Task UnlineForNGPackage(UnlineForNGPackageInput input)
+ {
+ //if (input == null)
+ //{
+ // throw Oops.Oh("鍙傛暟涓嶈兘涓虹┖");
+ //}
+ //if (string.IsNullOrEmpty(input.PackageCode))
+ //{
+ // throw Oops.Oh("鍖呭彿涓嶈兘涓虹┖");
+ //}
+ //if (string.IsNullOrEmpty(input.Reason))
+ //{
+ // throw Oops.Oh("鍘熷洜涓嶈兘涓虹┖");
+ //}
+ //List<WmsStockQuan> updateQuanList = new List<WmsStockQuan>();
+ //foreach (var item in input.PackageCodeList)
+ //{
+ // var quanList = await _wmsStockQuanRep.AsQueryable().Where(x => x.PackageCode == item).ToListAsync();
+ // var isExist = quanList.Where(x => x.StockStatus == StockStatusEnum.榻愬寘寰呭嚭搴�).Count();
+ // if (isExist > 0)
+ // {
+ // throw Oops.Oh($"鍖厈item}涓叾涓湁鏉跨姸鎬佹槸'{StockStatusEnum.榻愬寘寰呭嚭搴�.ToString()}'锛屼笉鍏佽寮哄埗鍑哄簱");
+ // }
+
+ // 鏇存柊鐘舵��
+ // foreach (var quan in quanList)
+ // {
+ // quan.StockStatus = StockStatusEnum.浜哄伐寮哄埗寰呭嚭搴�;
+ // quan.UpdateTime = DateTime.Now;
+ // quan.OperReason = "浜哄伐寮哄埗寰呭嚭搴�";
+ // }
+ // updateQuanList.AddRange(quanList);
+ //}
+
+ //await _wmsStockQuanRep.UpdateRangeAsync(updateQuanList);
+
+ }
+
}
--
Gitblit v1.9.3