From 6325280e2c389ba27146d2b7ece920f52963b7ae Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 20 12月 2024 19:26:52 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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 66c1fd6..35e06bc 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
@@ -256,7 +256,7 @@
var _QiTaoReuslt = "";
bool isNewOrder = false;
string _location = "BZ-33";
- var lastPackageUnline = await _mes_Package_UnLine_RecordRep.AsQueryable().Where(x => x.UpiFlag == UpiFlagEnum.姝ｅ父).OrderByDescending(x => x.Id).FirstAsync();
+ var lastPackageUnline = await _mes_Package_UnLine_RecordRep.AsQueryable().Where(x => x.UpiFlag == UpiFlagEnum.姝ｅ父 && x.Location != "浜哄伐").OrderByDescending(x => x.Id).FirstAsync();
if (lastPackageUnline == null)
{//璁や负鏄柊鐢熶骇璁㈠崟
isNewOrder = true;
@@ -559,6 +559,20 @@
await _wmsRecordPackageProcessRep.InsertAsync(wmsRecordPackage);
+ //鏂板涓嬬嚎璁板綍琛�
+ var all_upiList = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.Info5 == singlePackage.Info5).ToListAsync();
+ var all_unlineList = await _mes_Package_UnLine_RecordRep.AsQueryable().Where(x => x.Info5 == singlePackage.Info5).ToListAsync();
+ Mes_Package_UnLine_Record record = new Mes_Package_UnLine_Record();
+ record = singlePackage.Adapt<Mes_Package_UnLine_Record>();
+ record.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ record.Location = "浜哄伐";
+ record.AllPackageNum = all_upiList.GroupBy(x => x.PackageCode).Count();
+ record.CurUnlineIndexPackageNum = all_unlineList.GroupBy(x => x.PackageCode).Count() + 1;
+ record.CreateTime = DateTime.Now;
+ record.CreateUserName = _cretaorName;
+ await _mes_Package_UnLine_RecordRep.InsertAsync(record);
+
+
await _mesPackageGatherRep.UpdateAsync(singlePackage);
await _mesBatchOrderUpiRep.UpdateRangeAsync(upiList);
@@ -604,6 +618,15 @@
}
order.NoScanPackageArea = order.AllPackageArea - order.ScanPackageArea;
+
+ //鍒ゆ柇璇ヨ鍗曟槸鍚﹀凡涓嬬嚎
+ if (order.NoUnLinePackageNum == 0)
+ {
+ order.IsUnline = true;
+ order.UnlineTime = DateTime.Now;
+ //order.UnlinePerson = _UnlinePerson;
+ }
+
if (isAdd)
{
await _mesOrderGatherRep.InsertAsync(order);
--
Gitblit v1.9.3