From 896c08739dfa6526270755fe03bbe5963d8f9bf2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 29 11月 2024 15:55:27 +0800
Subject: [PATCH] 222
---
CC/iWareSql/WmsDBModel/mes_order_gather.cs | 10 +++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json | 2
CC/iWareSql/iWareSql.csproj | 1
CC/iWareCC_ASRS/ThreadService/05_BZ30(齐套验证)/DataProcess_ValidateQiTao.cs | 48 +++++++++++++++++++++--
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs | 34 ++++++++++-------
CC/iWareSql/WmsDBModel/WmsDBModel.cs | 12 ++++++
6 files changed, 87 insertions(+), 20 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs" "b/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs"
index d33b27f..76a29ee 100644
--- "a/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs"
@@ -80,11 +80,11 @@
//鏇存柊鍊�
bz30Config.Value = "";
- var gahter = wmsDB.mes_package_gather.Where(x => x.PackageCode == packageCode).FirstOrDefault();
- if (gahter != null)
+ var package = wmsDB.mes_package_gather.Where(x => x.PackageCode == packageCode).FirstOrDefault();
+ if (package != null)
{
- gahter.UpiStatus = (int)UpiStatusEnum.宸蹭笅绾�;
- gahter.AreaCode = (int)AreaCodeEnum.涓嬬嚎鍖哄煙;
+ package.UpiStatus = (int)UpiStatusEnum.宸蹭笅绾�;
+ package.AreaCode = (int)AreaCodeEnum.涓嬬嚎鍖哄煙;
}
var upiList = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == packageCode).ToList();
foreach (var item in upiList)
@@ -101,13 +101,51 @@
}
//鏂板涓嬬嚎璁板綍
mes_package_unline_record record = new mes_package_unline_record();
- record = ClassHelper.RotationMapping<mes_package_unline_record, mes_package_gather>(gahter);
+ record = ClassHelper.RotationMapping<mes_package_unline_record, mes_package_gather>(package);
record.Id = Yitter.IdGenerator.YitIdHelper.NextId();
record.CreateTime = DateTime.Now;
record.UpdateTime = DateTime.Now;
record.OpRemark = "涓嬬嚎";
wmsDB.mes_package_unline_record.Add(record);
+ //澶勭悊琛� mes_order_gather
+ var isAddOrder = false;
+ var packageList = wmsDB.mes_package_gather.Where(x => x.Info5 == package.Info5).ToList();
+ if (packageList == null || packageList?.Count == 0)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = $"娌℃湁鎵惧埌鐢熶骇鍗曞彿{package.Info5}鐨勬眹鎬绘暟鎹�";
+ continue;
+ }
+ var order = wmsDB.mes_order_gather.Where(x => x.Info5 == package.Info5).FirstOrDefault();
+ if (order != null)
+ {
+
+ }
+ else
+ {
+ order = new mes_order_gather()
+ {
+ Id = Yitter.IdGenerator.YitIdHelper.NextId(),
+ Info5 = package.Info5,
+ OrderId = package.OrderId,
+ PlanNo = package.PlanNo,
+ };
+ isAddOrder = true;
+ }
+ order.PackageNum = packageList.Count();
+ order.UnLinePackageNum = packageList.Where(x => x.UpiStatus == (int)UpiStatusEnum.宸蹭笅绾�).Count();
+ order.NoUnLinePackageNum = order.PackageNum - order.UnLinePackageNum;
+
+ order.AllPackageArea = packageList.Sum(x => Convert.ToDecimal(x.Info13));
+ order.ScanPackageArea = packageList.Where(x => x.UpiStatus == (int)UpiStatusEnum.宸蹭笅绾�).Sum(x => Convert.ToDecimal(x.Info13));
+ order.NoScanPackageArea = order.AllPackageArea - order.ScanPackageArea;
+ order.IsKitting = qitaoValue == "榻愬" ? true : false;
+
+ if (isAddOrder)
+ {
+ wmsDB.mes_order_gather.Add(order);
+ }
+
wmsDB.SaveChanges();
}
diff --git a/CC/iWareSql/WmsDBModel/WmsDBModel.cs b/CC/iWareSql/WmsDBModel/WmsDBModel.cs
index fca626a..4f6ce0e 100644
--- a/CC/iWareSql/WmsDBModel/WmsDBModel.cs
+++ b/CC/iWareSql/WmsDBModel/WmsDBModel.cs
@@ -97,6 +97,18 @@
protected override void OnModelCreating(DbModelBuilder modelBuilder)
{
+ modelBuilder.Entity<mes_order_gather>()
+ .Property(e => e.AllPackageArea)
+ .HasPrecision(18, 4);
+
+ modelBuilder.Entity<mes_order_gather>()
+ .Property(e => e.ScanPackageArea)
+ .HasPrecision(18, 4);
+
+ modelBuilder.Entity<mes_order_gather>()
+ .Property(e => e.NoScanPackageArea)
+ .HasPrecision(18, 4);
+
modelBuilder.Entity<test_place>()
.Property(e => e.Length)
.HasPrecision(10, 3);
diff --git a/CC/iWareSql/WmsDBModel/mes_order_gather.cs b/CC/iWareSql/WmsDBModel/mes_order_gather.cs
index 907212b..02f5aa2 100644
--- a/CC/iWareSql/WmsDBModel/mes_order_gather.cs
+++ b/CC/iWareSql/WmsDBModel/mes_order_gather.cs
@@ -26,6 +26,16 @@
public int PackageNum { get; set; }
+ public int UnLinePackageNum { get; set; }
+
+ public int NoUnLinePackageNum { get; set; }
+
+ public decimal AllPackageArea { get; set; }
+
+ public decimal ScanPackageArea { get; set; }
+
+ public decimal NoScanPackageArea { get; set; }
+
public DateTime? CreateTime { get; set; }
public DateTime? UpdateTime { get; set; }
diff --git a/CC/iWareSql/iWareSql.csproj b/CC/iWareSql/iWareSql.csproj
index fd8f79b..6792926 100644
--- a/CC/iWareSql/iWareSql.csproj
+++ b/CC/iWareSql/iWareSql.csproj
@@ -162,6 +162,7 @@
<Compile Include="WmsDBModel\GoViewPro.cs" />
<Compile Include="WmsDBModel\GoViewProData.cs" />
<Compile Include="WmsDBModel\mes_batchOrderUPI_new.cs" />
+ <Compile Include="WmsDBModel\mes_order_gather.cs" />
<Compile Include="WmsDBModel\mes_package_gather.cs" />
<Compile Include="WmsDBModel\mes_package_linequeue.cs" />
<Compile Include="WmsDBModel\mes_package_unline_record.cs" />
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json
index 2a5e9c1..b255125 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json
@@ -30,7 +30,7 @@
"EnableIncreTable": false // 鍚敤琛ㄥ閲忔洿鏂�-鐗规�IncreTable]
},
"SeedSettings": {
- "EnableInitSeed": true, // 鍚敤绉嶅瓙鍒濆鍖�
+ "EnableInitSeed": false, // 鍚敤绉嶅瓙鍒濆鍖�
"EnableIncreSeed": false // 鍚敤绉嶅瓙澧為噺鏇存柊-鐗规�IncreSeed]
}
}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
index 6ce3158..2e52b0f 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
@@ -92,15 +92,28 @@
{
throw Oops.Oh("鍙傛暟涓嶈兘涓虹┖");
}
- var singlePackage = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
- if (singlePackage == null)
+
+ var package = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
+ if (package == null)
{
throw Oops.Oh($"娌℃湁鎵惧埌鍖呭彿{input.PackageCode}鐨勬眹鎬绘暟鎹�");
}
+
+
+ var sysConfig = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.WmsBZ30_QiTao);
+ if (sysConfig == null)
+ {
+ throw Oops.Oh($"娌℃湁閰嶇疆 鍒ゆ柇榻愬 鍊�");
+ }
+ if (!string.IsNullOrEmpty(sysConfig.Value) && sysConfig.Value != "鏃�")
+ {
+ throw Oops.Oh($"鍒ゆ柇榻愬鍊煎凡缁忓瓨鍦ㄥ�納sysConfig.Value},涓嶅厑璁告搷浣�");
+ }
+
var setValue = "";
var _QiTaoReuslt = "";
- var other_orderList = await _mesPackageGatherRep.AsQueryable().Where(x => x.Info5 == singlePackage.Info5 && x.PackageCode != input.PackageCode).ToListAsync();
+ 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)
{
@@ -114,19 +127,12 @@
_QiTaoReuslt = "榻愬";
}
- var sysConfig = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.WmsBZ30_QiTao);
- if (sysConfig == null)
- {
- throw Oops.Oh($"娌℃湁閰嶇疆 鍒ゆ柇榻愬 鍊�");
- }
- if (!string.IsNullOrEmpty(sysConfig.Value) && sysConfig.Value != "鏃�")
- {
- throw Oops.Oh($"鍒ゆ柇榻愬鍊煎凡缁忓瓨鍦ㄥ�納sysConfig.Value},涓嶅厑璁告搷浣�");
- }
+
+
sysConfig.Value = setValue;
await _sysConfigRep.UpdateAsync(sysConfig);
- output = singlePackage.Adapt<ValidateQiTaoOutput>();
+ output = package.Adapt<ValidateQiTaoOutput>();
output.QiTaoReuslt = _QiTaoReuslt;
return output;
}
@@ -179,7 +185,7 @@
var list = await _mesOrderGatherRep.AsQueryable()
.WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
- .Where(x=>((DateTime)x.CreateTime).ToString("yyyyMMdd")==DateTime.Now.ToString("yyyyMMdd"))
+ .Where(x => ((DateTime)x.CreateTime).ToString("yyyyMMdd") == DateTime.Now.ToString("yyyyMMdd"))
.Where(x => x.IsKitting == false)
.OrderBy(g => g.Id)
.ToListAsync(); // 纭繚鑾峰彇缁撴灉涓� List
--
Gitblit v1.9.3