From 8fb64d646e4a8bf929fdfeb7382d15ed0e7900eb Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 30 11月 2024 13:43:38 +0800
Subject: [PATCH] 222
---
CC/iWareSql/WmsDBModel/mes_order_gather.cs | 2
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs | 28 ++++++++++++++
CC/iWareCC_ASRS/ThreadService/05_BZ30(齐套验证)/DataProcess_ValidateQiTao.cs | 38 ++++++++++++++----
3 files changed, 58 insertions(+), 10 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 07a6e5a..cbfcc0f 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"
@@ -100,14 +100,7 @@
{
wmsDB.mes_package_linequeue.Remove(lineQueue);
}
- //鏂板涓嬬嚎璁板綍
- mes_package_unline_record record = new mes_package_unline_record();
- 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;
@@ -141,8 +134,25 @@
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;
+
+ var order_unLine = false;
+ //鏌ヨ涓嬩竴涓寘鏄笉鏄睘浜庤璁㈠崟
+ var newLineQueue = wmsDB.mes_package_linequeue.OrderBy(x => x.Id).FirstOrDefault();
+ if (newLineQueue != null && newLineQueue.Info5 != order.Info5)
+ {
+ //琛ㄧず鏄� 鍒囨崲 鏂拌鍗曚簡锛岃璁㈠崟瑕佹洿鏂颁负 宸蹭笅绾裤��
+ order_unLine = true;
+ }
+ else
+ {
+ //鍒ゆ柇璇ヨ鍗曟槸鍚﹀凡涓嬬嚎
+ if (order.PackageNum == order.UnLinePackageNum)
+ {
+ order_unLine = true;
+ }
+ }
//鍒ゆ柇璇ヨ鍗曟槸鍚﹀凡涓嬬嚎
- if (order.PackageNum == order.UnLinePackageNum)
+ if (order_unLine)
{
order.IsUnline = true;
order.UnlineTime = DateTime.Now;
@@ -159,6 +169,16 @@
}
+ //鏂板涓嬬嚎璁板綍
+ mes_package_unline_record record = new mes_package_unline_record();
+ 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);
+
+
wmsDB.SaveChanges();
}
}
diff --git a/CC/iWareSql/WmsDBModel/mes_order_gather.cs b/CC/iWareSql/WmsDBModel/mes_order_gather.cs
index 280d1ce..97a68e7 100644
--- a/CC/iWareSql/WmsDBModel/mes_order_gather.cs
+++ b/CC/iWareSql/WmsDBModel/mes_order_gather.cs
@@ -28,7 +28,7 @@
public DateTime? UnlineTime { get; set; }
- public string? UnlinePerson { get; set; }
+ public string UnlinePerson { get; set; }
public int PackageNum { get; set; }
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
index 0359bb2..0739fe9 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
@@ -13,6 +13,7 @@
/// 閫氱敤鏌ヨ鏈嶅姟
/// </summary>
[ApiDescriptionSettings(ApplicationConst.WmsCommonnQueryGroupName, Order = 100)]
+[AllowAnonymous]
public class WmsCommonnQueryService : IDynamicApiController, ITransient
{
private readonly SqlSugarRepository<WmsRbLineTask> _rep;
@@ -57,5 +58,32 @@
return list; // 缁撴灉
}
+
+
+ /// <summary>
+ /// 鏌ヨ 鍘嗗彶鐢熶骇璁㈠崟璁板綍 锛堝ぇ灞忎娇鐢級
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "QueryHistoryOrderList")]
+ [Description("WmsCommonnQuery/QueryHistoryOrderList")]
+ public async Task<List<Mes_Order_Gather>> QueryHistoryOrderList()
+ {
+ //鑾峰彇涓婄彮鏃堕棿銆�
+ var sysConfig_wms_unline_time = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_time);
+ if (sysConfig_wms_unline_time == null || sysConfig_wms_unline_time.Value == "鏃�")
+ {
+ throw Oops.Oh($"娌℃湁閰嶇疆 鍖呰涓嬬嚎鐧婚檰鏃堕棿 鍊�");
+ }
+ var unLineTime = Convert.ToDateTime(sysConfig_wms_unline_time.Value);
+
+ var list = await _mesOrderGatherRep.AsQueryable()
+ .Where(x => x.UnlineTime >= unLineTime)
+ .Where(x => x.IsUnline == true)
+ .OrderByDescending(g => g.Id)
+ .ToListAsync(); // 纭繚鑾峰彇缁撴灉涓� List
+
+ return list; // 缁撴灉
+ }
}
--
Gitblit v1.9.3