From bc83d59a8004d003f3c9948d6f850d2a146a6b72 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 09 12月 2024 10:30:52 +0800
Subject: [PATCH] 222

---
 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs |   70 ++++++++++++++++++++++++++++++++---
 1 files changed, 64 insertions(+), 6 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 db53342..e698432 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
@@ -25,6 +25,7 @@
     private readonly SqlSugarRepository<WmsRecordUpiProcess> _wmsRecordUpiProcessRep;
     private readonly SqlSugarRepository<WmsRecordPackageProcess> _wmsRecordPackageProcessRep;
     private readonly SqlSugarRepository<Mes_Upi_LineQueue> _mes_Upi_LineQueueRep;
+    private readonly SqlSugarRepository<WmsRecordUpiNg> _wmsRecordUpiNgRep;
 
     public WmsOperationTaskService(
         SqlSugarRepository<Mes_Upi_LineQueue> mes_Upi_LineQueueRep,
@@ -35,8 +36,10 @@
         , SqlSugarRepository<Mes_Order_Gather> mesOrderGatherRep
         , SqlSugarRepository<WmsRecordUpiProcess> wmsRecordUpiProcessRep
         , SqlSugarRepository<WmsRecordPackageProcess> wmsRecordPackageProcessRep
+        , SqlSugarRepository<WmsRecordUpiNg> wmsRecordUpiNgRep
         )
     {
+        _wmsRecordUpiNgRep = wmsRecordUpiNgRep;
         _sysConfigRep = sysConfigRep;
         _mesPackageGatherRep = mesPackageGatherRep;
         _rep = rep;
@@ -208,16 +211,22 @@
             throw Oops.Oh($"娌℃湁鎵惧埌鍖呭彿{input.PackageCode}鐨勬眹鎬绘暟鎹�");
         }
 
+        var _cretaorName = App.User.FindFirst(ClaimConst.RealName)?.Value;
+
         WmsRecordPackageProcess wmsRecordPackage = new WmsRecordPackageProcess();
         wmsRecordPackage = singlePackage.Adapt<WmsRecordPackageProcess>();
+        wmsRecordPackage.Id = Yitter.IdGenerator.YitIdHelper.NextId();
         wmsRecordPackage.CreateTime = DateTime.Now;
+        wmsRecordPackage.CreateUserName = _cretaorName;
         wmsRecordPackage.Location = "BZ29";
         wmsRecordPackage.OperRemark = "鏍稿鏍囩";
         await _wmsRecordPackageProcessRep.InsertAsync(wmsRecordPackage);
 
         WmsRecordUpiProcess wmsRecordUpi = new WmsRecordUpiProcess();
         wmsRecordUpi = singleUpi.Adapt<WmsRecordUpiProcess>();
+        wmsRecordUpi.Id = Yitter.IdGenerator.YitIdHelper.NextId();
         wmsRecordUpi.CreateTime = DateTime.Now;
+        wmsRecordUpi.CreateUserName = _cretaorName;
         wmsRecordUpi.Location = "BZ29";
         wmsRecordUpi.OperRemark = "鏍稿鏍囩";
         await _wmsRecordUpiProcessRep.InsertAsync(wmsRecordUpi);
@@ -245,10 +254,10 @@
         {
             throw Oops.Oh("鍖呭彿涓嶈兘涓虹┖");
         }
-        if (string.IsNullOrEmpty(input.Reason))
-        {
-            throw Oops.Oh("鍘熷洜涓嶈兘涓虹┖");
-        }
+        //if (string.IsNullOrEmpty(input.Reason))
+        //{
+        //    throw Oops.Oh("鍘熷洜涓嶈兘涓虹┖");
+        //}
 
         var singlePackage = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
         if (singlePackage == null)
@@ -272,6 +281,8 @@
         {
             throw Oops.Oh($"娌℃湁鎵惧埌鍖呭彿{input.PackageCode}鐨勬澘浠舵暟鎹�");
         }
+        var _cretaorName = App.User.FindFirst(ClaimConst.RealName)?.Value;
+
         foreach (var item in upiList)
         {
             item.UpiFlag = UpiFlagEnum.NG;
@@ -281,17 +292,32 @@
 
             WmsRecordUpiProcess wmsRecordUpi = new WmsRecordUpiProcess();
             wmsRecordUpi = item.Adapt<WmsRecordUpiProcess>();
+            wmsRecordUpi.Id = Yitter.IdGenerator.YitIdHelper.NextId();
             wmsRecordUpi.CreateTime = DateTime.Now;
+            wmsRecordUpi.CreateUserName = _cretaorName;
             wmsRecordUpi.Location = "";
             wmsRecordUpi.OperRemark = "NG涓嬬嚎";
             await _wmsRecordUpiProcessRep.InsertAsync(wmsRecordUpi);
+
+            WmsRecordUpiNg wmsRecordUpiNg = new WmsRecordUpiNg();
+            wmsRecordUpiNg = item.Adapt<WmsRecordUpiNg>();
+            wmsRecordUpiNg.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+            wmsRecordUpiNg.CreateTime = DateTime.Now;
+            wmsRecordUpiNg.CreateUserName = _cretaorName;
+            wmsRecordUpiNg.OperRemark = "NG涓嬬嚎";
+            await _wmsRecordUpiNgRep.InsertAsync(wmsRecordUpiNg);
+
+
         }
 
 
         WmsRecordPackageProcess wmsRecordPackage = new WmsRecordPackageProcess();
         wmsRecordPackage = singlePackage.Adapt<WmsRecordPackageProcess>();
+        wmsRecordPackage.Id = Yitter.IdGenerator.YitIdHelper.NextId();
         wmsRecordPackage.Location = "";
         wmsRecordPackage.OperRemark = "NG涓嬬嚎";
+        wmsRecordPackage.CreateTime = DateTime.Now;
+        wmsRecordPackage.CreateUserName = _cretaorName;
         await _wmsRecordPackageProcessRep.InsertAsync(wmsRecordPackage);
 
 
@@ -336,9 +362,11 @@
             throw Oops.Oh($"娌℃湁鎵惧埌鍖呭彿{packageCode}鐨勬眹鎬绘暟鎹�");
         }
 
+        var _cretaorName = App.User.FindFirst(ClaimConst.RealName)?.Value;
+
         singlePackage.UpiFlag = UpiFlagEnum.NG;
         singlePackage.UpdateTime = DateTime.Now;
-
+        singlePackage.UpdateUserName = _cretaorName;
 
         var upiList = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.PackageCode == packageCode).ToListAsync();
         if (upiList == null)
@@ -349,20 +377,34 @@
         {
             item.UpiFlag = UpiFlagEnum.NG;
             item.UpdateTime = DateTime.Now;
+            item.UpdateUserName = _cretaorName;
 
             WmsRecordUpiProcess wmsRecordUpi = new WmsRecordUpiProcess();
             wmsRecordUpi = item.Adapt<WmsRecordUpiProcess>();
+            wmsRecordUpi.Id = Yitter.IdGenerator.YitIdHelper.NextId();
             wmsRecordUpi.CreateTime = DateTime.Now;
+            wmsRecordUpi.CreateUserName = _cretaorName;
             wmsRecordUpi.Location = "";
             wmsRecordUpi.OperRemark = "鏍囪NG";
             await _wmsRecordUpiProcessRep.InsertAsync(wmsRecordUpi);
+
+            WmsRecordUpiNg wmsRecordUpiNg = new WmsRecordUpiNg();
+            wmsRecordUpiNg = item.Adapt<WmsRecordUpiNg>();
+            wmsRecordUpiNg.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+            wmsRecordUpiNg.CreateTime = DateTime.Now;
+            wmsRecordUpiNg.CreateUserName = _cretaorName;
+            wmsRecordUpiNg.OperRemark = "鏍囪NG";
+            await _wmsRecordUpiNgRep.InsertAsync(wmsRecordUpiNg);
         }
 
 
         WmsRecordPackageProcess wmsRecordPackage = new WmsRecordPackageProcess();
         wmsRecordPackage = singlePackage.Adapt<WmsRecordPackageProcess>();
+        wmsRecordPackage.Id = Yitter.IdGenerator.YitIdHelper.NextId();
         wmsRecordPackage.Location = "";
         wmsRecordPackage.OperRemark = "鏍囪NG";
+        wmsRecordPackage.CreateTime = DateTime.Now;
+        wmsRecordPackage.CreateUserName = _cretaorName;
         await _wmsRecordPackageProcessRep.InsertAsync(wmsRecordPackage);
 
 
@@ -408,9 +450,11 @@
             throw Oops.Oh($"娌℃湁鎵惧埌鍖呭彿{packageCode}鐨勬眹鎬绘暟鎹�");
         }
 
+        var _cretaorName = App.User.FindFirst(ClaimConst.RealName)?.Value;
+
         singlePackage.UpiFlag = UpiFlagEnum.姝e父;
         singlePackage.UpdateTime = DateTime.Now;
-
+        singlePackage.UpdateUserName = _cretaorName;
 
         var upiList = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.PackageCode == packageCode).ToListAsync();
         if (upiList == null)
@@ -421,20 +465,34 @@
         {
             item.UpiFlag = UpiFlagEnum.姝e父;
             item.UpdateTime = DateTime.Now;
+            item.UpdateUserName = _cretaorName;
 
             WmsRecordUpiProcess wmsRecordUpi = new WmsRecordUpiProcess();
             wmsRecordUpi = item.Adapt<WmsRecordUpiProcess>();
+            wmsRecordUpi.Id = Yitter.IdGenerator.YitIdHelper.NextId();
             wmsRecordUpi.CreateTime = DateTime.Now;
+            wmsRecordUpi.CreateUserName = _cretaorName;
             wmsRecordUpi.Location = "";
             wmsRecordUpi.OperRemark = "鍙栨秷NG";
             await _wmsRecordUpiProcessRep.InsertAsync(wmsRecordUpi);
+
+            WmsRecordUpiNg wmsRecordUpiNg = new WmsRecordUpiNg();
+            wmsRecordUpiNg = item.Adapt<WmsRecordUpiNg>();
+            wmsRecordUpiNg.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+            wmsRecordUpiNg.CreateTime = DateTime.Now;
+            wmsRecordUpiNg.CreateUserName = _cretaorName;
+            wmsRecordUpiNg.OperRemark = "鍙栨秷NG";
+            await _wmsRecordUpiNgRep.InsertAsync(wmsRecordUpiNg);
         }
 
 
         WmsRecordPackageProcess wmsRecordPackage = new WmsRecordPackageProcess();
         wmsRecordPackage = singlePackage.Adapt<WmsRecordPackageProcess>();
+        wmsRecordPackage.Id = Yitter.IdGenerator.YitIdHelper.NextId();
         wmsRecordPackage.Location = "";
         wmsRecordPackage.OperRemark = "鍙栨秷NG";
+        wmsRecordPackage.CreateTime = DateTime.Now;
+        wmsRecordPackage.CreateUserName = _cretaorName;
         await _wmsRecordPackageProcessRep.InsertAsync(wmsRecordPackage);
 
 

--
Gitblit v1.9.3