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 | 304 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 273 insertions(+), 31 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 1f00b00..35e06bc 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
@@ -27,7 +27,9 @@
private readonly SqlSugarRepository<WmsRecordUpiProcess> _wmsRecordUpiProcessRep;
private readonly SqlSugarRepository<WmsRecordPackageProcess> _wmsRecordPackageProcessRep;
private readonly SqlSugarRepository<Mes_Upi_LineQueue> _mes_Upi_LineQueueRep;
+ private readonly SqlSugarRepository<Mes_Package_LineQueue> _mes_Package_LineQueueRep;
private readonly SqlSugarRepository<WmsRecordUpiNg> _wmsRecordUpiNgRep;
+ private readonly SqlSugarRepository<Mes_Package_UnLine_Record> _mes_Package_UnLine_RecordRep;
private readonly WmsCommonnQueryService _wmsCommonnQueryService;
public WmsOperationTaskService(
@@ -41,8 +43,11 @@
, SqlSugarRepository<WmsRecordPackageProcess> wmsRecordPackageProcessRep
, SqlSugarRepository<WmsRecordUpiNg> wmsRecordUpiNgRep
, WmsCommonnQueryService wmsCommonnQueryService
+ , SqlSugarRepository<Mes_Package_LineQueue> mes_Package_LineQueueRep
+ , SqlSugarRepository<Mes_Package_UnLine_Record> mes_Package_UnLine_RecordRep
)
{
+ _mes_Package_LineQueueRep = mes_Package_LineQueueRep;
_wmsCommonnQueryService = wmsCommonnQueryService;
_wmsRecordUpiNgRep = wmsRecordUpiNgRep;
_sysConfigRep = sysConfigRep;
@@ -54,6 +59,7 @@
_wmsRecordUpiProcessRep = wmsRecordUpiProcessRep;
_wmsRecordPackageProcessRep = wmsRecordPackageProcessRep;
_mes_Upi_LineQueueRep = mes_Upi_LineQueueRep;
+ _mes_Package_UnLine_RecordRep = mes_Package_UnLine_RecordRep;
}
@@ -106,6 +112,31 @@
quan.OperReason = "浜哄伐寮哄埗寰呭嚭搴�";
}
updateQuanList.AddRange(quanList);
+
+ var packageObj = await _mesPackageGatherRep.GetFirstAsync(x => x.PackageCode == item);
+ packageObj.UpiFlag = UpiFlagEnum.NG;
+ packageObj.UpiStatus = UpiStatusEnum.宸蹭笅绾�;
+ await _mesPackageGatherRep.UpdateAsync(packageObj);
+
+
+ //涓嬬嚎鏇存柊 璁㈠崟琛ㄦ暟鎹� _mesOrderGatherRep
+ await UpdateOrderGather(packageObj, true);
+
+ foreach (var quan in quanList)
+ {
+ //娓呯悊 闃熷垪琛�
+ var removeUpiList = await _mes_Upi_LineQueueRep.AsQueryable().Where(x => x.Upi == quan.Upi).ToListAsync();
+ if (removeUpiList?.Count > 0)
+ {
+ await _mes_Upi_LineQueueRep.DeleteAsync(removeUpiList);
+ }
+
+ var removePackageList = await _mes_Package_LineQueueRep.AsQueryable().Where(x => x.PackageCode == quan.PackageCode).ToListAsync();
+ if (removePackageList?.Count > 0)
+ {
+ await _mes_Package_LineQueueRep.DeleteAsync(removePackageList);
+ }
+ }
}
//妯″紡鍒ゆ柇
@@ -168,6 +199,11 @@
quan.OperReason = "浜哄伐榻愬寘鍑哄簱";
}
updateQuanList.AddRange(quanList);
+
+ var packageObj = await _mesPackageGatherRep.GetFirstAsync(x => x.PackageCode == item);
+ packageObj.UpiStatus = UpiStatusEnum.宸查綈鍖�;
+ packageObj.IsQiBao = true;
+ await _mesPackageGatherRep.UpdateAsync(packageObj);
}
//妯″紡鍒ゆ柇
@@ -183,7 +219,7 @@
}
/// <summary>
- /// 鍒ゆ柇榻愬
+ /// 涓嬬嚎鏀捐
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -205,42 +241,55 @@
throw Oops.Oh($"娌℃湁鎵惧埌鍖呭彿{input.PackageCode}鐨勬眹鎬绘暟鎹�");
}
-
-
- var sysConfig = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.WmsBZ30_QiTao);
- if (sysConfig == null)
+ if (package.UpiStatus == UpiStatusEnum.宸蹭笅绾�)
{
- throw Oops.Oh($"娌℃湁閰嶇疆 鍒ゆ柇榻愬 鍊�");
- }
- if (!string.IsNullOrEmpty(sysConfig.Value) && sysConfig.Value.Trim() != "鏃�")
- {
- throw Oops.Oh($"鍒ゆ柇榻愬鍊煎凡缁忓瓨鍦ㄥ�納sysConfig.Value},涓嶅厑璁告搷浣�");
+ throw Oops.Oh($"鍖厈input.PackageCode}宸蹭笅绾�");
}
- //璁板綍宸ヤ綔鏃堕棿鍜屽伐浣滀汉
- var curUserName = App.User.FindFirst(ClaimConst.RealName)?.Value;
+ var unlineObj = await _mes_Package_UnLine_RecordRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
+ if (unlineObj != null)
+ {
+ throw Oops.Oh($"鍖呭彿{input.PackageCode}宸茬粡涓嬬嚎");
+ }
- var setValue = "";
+ //鍒ゆ柇鏄惁鏄柊鐢熶骇璁㈠崟
var _QiTaoReuslt = "";
- 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)
- {
- //涓嶉綈濂�
- setValue = $"{input.PackageCode}|涓嶉綈濂梶" + curUserName;
- _QiTaoReuslt = "涓嶉綈濂�";
+ bool isNewOrder = false;
+ string _location = "BZ-33";
+ 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;
}
else
{
- setValue = $"{input.PackageCode}|榻愬|" + curUserName;
- _QiTaoReuslt = "榻愬";
+ if (lastPackageUnline.Info5 != package.Info5)
+ {//璁や负鏄柊鐢熶骇璁㈠崟
+ isNewOrder = true;
+ if (lastPackageUnline.Location == "BZ-33")
+ {
+ _location = "BZ-32";
+ }
+ else
+ {
+ _location = "BZ-33";
+ }
+ }
+ else
+ {
+ _location = lastPackageUnline.Location;
+ }
+ }
+ if (string.IsNullOrEmpty(_location))
+ {//榛樿
+ _location = "BZ-33";
}
+ _QiTaoReuslt = (bool)isNewOrder ? "鏂拌鍗�" : "褰撳墠璁㈠崟";
- sysConfig.Value = setValue;
- await _sysConfigRep.UpdateAsync(sysConfig);
- //*/
+ //璁板綍宸ヤ綔鏃堕棿鍜屽伐浣滀汉
+ var curUserName = App.User.FindFirst(ClaimConst.RealName)?.Value;
var sysConfig_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_oper);
if (sysConfig_wms_unline_oper == null)
@@ -262,8 +311,78 @@
}
+
+ //璇锋眰PLC
+ //鍒ゆ柇鏂瑰悜
+ bool myLocation = false;
+ if (_location == "BZ-33")
+ {
+ myLocation = false;
+ }
+ else
+ {
+ myLocation = true;
+ }
+ var client = await WCFServiceHelper.GetWCFService_SAPCC_Client(_sysConfigRep);
+ var res = await client.WriteQiTaoInfoAsync(myLocation);
+ if (res.result == false)
+ {
+ throw Oops.Oh(res.resMsg);
+ }
+
+
+ //鏇存柊鏁版嵁
+ package.UpiStatus = UpiStatusEnum.宸蹭笅绾�;
+ package.AreaCode = AreaCodeEnum.涓嬬嚎鍖哄煙;
+ await _mesPackageGatherRep.UpdateAsync(package);
+
+ var upiList = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).ToListAsync();
+ foreach (var item in upiList)
+ {
+ item.UpiStatus = UpiStatusEnum.宸蹭笅绾�;
+ item.AreaCode = AreaCodeEnum.涓嬬嚎鍖哄煙;
+ item.UpdateTime = DateTime.Now;
+ }
+ await _mesBatchOrderUpiRep.UpdateRangeAsync(upiList);
+ //鍒犻櫎闃熷垪淇℃伅
+ var lineQueue = await _mes_Package_LineQueueRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
+ if (lineQueue != null)
+ {
+ await _mes_Package_LineQueueRep.DeleteAsync(lineQueue);
+ }
+ //澶勭悊琛� mes_order_gather
+ await UpdateOrderGather(package, false);
+
+ var _cretaorName = App.User.FindFirst(ClaimConst.RealName)?.Value;
+
+ //鏂板涓嬬嚎璁板綍琛�
+ var all_upiList = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.Info5 == package.Info5).ToListAsync();
+ var all_unlineList = await _mes_Package_UnLine_RecordRep.AsQueryable().Where(x => x.Info5 == package.Info5).ToListAsync();
+ Mes_Package_UnLine_Record record = new Mes_Package_UnLine_Record();
+ record = package.Adapt<Mes_Package_UnLine_Record>();
+ record.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ record.Location = _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);
+
+ //璁板綍鍖呭饱鍘�
+ WmsRecordPackageProcess wmsRecordPackage = new WmsRecordPackageProcess();
+ wmsRecordPackage = package.Adapt<WmsRecordPackageProcess>();
+ wmsRecordPackage.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ wmsRecordPackage.Location = "";
+ wmsRecordPackage.OperRemark = "姝ｅ父涓嬬嚎";
+ wmsRecordPackage.CreateTime = DateTime.Now;
+ wmsRecordPackage.CreateUserName = _cretaorName;
+ await _wmsRecordPackageProcessRep.InsertAsync(wmsRecordPackage);
+
+
output = package.Adapt<ValidateQiTaoOutput>();
- output.QiTaoReuslt = _QiTaoReuslt;
+ output.QiTaoReuslt = _QiTaoReuslt + $",绗瑊record.CurUnlineIndexPackageNum}鍖呬笅绾�,鍏眥record.AllPackageNum}鍖�";
+ output.IsNewOrder = isNewOrder;
+ //output.IsNewOrder = false;
return output;
}
@@ -325,7 +444,7 @@
/// <summary>
- /// NG鍖呬笅绾�-鎵弿鍖呭彿
+ /// NG鍖呬笅绾挎垨 姝ｅ父鍖� 涓嬬嚎 -鎵弿鍖呭彿
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -347,6 +466,13 @@
//{
// throw Oops.Oh("鍘熷洜涓嶈兘涓虹┖");
//}
+ string _OperRemark = "姝ｅ父浜哄伐涓嬬嚎";
+ UpiFlagEnum upiFlagEnum = UpiFlagEnum.姝ｅ父;
+ if (input.IsNG)
+ {
+ upiFlagEnum = UpiFlagEnum.NG;
+ _OperRemark = "NG涓嬬嚎";
+ }
var singlePackage = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
if (singlePackage == null)
@@ -354,7 +480,12 @@
throw Oops.Oh($"娌℃湁鎵惧埌鍖呭彿{input.PackageCode}鐨勬眹鎬绘暟鎹�");
}
- singlePackage.UpiFlag = UpiFlagEnum.NG;
+ if (singlePackage.UpiStatus == UpiStatusEnum.宸蹭笅绾�)
+ {
+ throw Oops.Oh($"鍖呭彿{input.PackageCode}宸茬粡涓嬬嚎");
+ }
+
+ singlePackage.UpiFlag = upiFlagEnum;
singlePackage.UpdateTime = DateTime.Now;
singlePackage.UpiStatus = UpiStatusEnum.宸蹭笅绾�;
singlePackage.AreaCode = AreaCodeEnum.涓嬬嚎鍖哄煙;
@@ -385,7 +516,7 @@
wmsRecordUpi.CreateTime = DateTime.Now;
wmsRecordUpi.CreateUserName = _cretaorName;
wmsRecordUpi.Location = "";
- wmsRecordUpi.OperRemark = "NG涓嬬嚎";
+ wmsRecordUpi.OperRemark = _OperRemark;
await _wmsRecordUpiProcessRep.InsertAsync(wmsRecordUpi);
WmsRecordUpiNg wmsRecordUpiNg = new WmsRecordUpiNg();
@@ -393,26 +524,117 @@
wmsRecordUpiNg.Id = Yitter.IdGenerator.YitIdHelper.NextId();
wmsRecordUpiNg.CreateTime = DateTime.Now;
wmsRecordUpiNg.CreateUserName = _cretaorName;
- wmsRecordUpiNg.OperRemark = "NG涓嬬嚎";
+ wmsRecordUpiNg.OperRemark = _OperRemark;
await _wmsRecordUpiNgRep.InsertAsync(wmsRecordUpiNg);
+
+ //娓呯悊 闃熷垪琛�
+ var removeUpiList = await _mes_Upi_LineQueueRep.AsQueryable().Where(x => x.Upi == item.UPI).ToListAsync();
+ if (removeUpiList?.Count > 0)
+ {
+ await _mes_Upi_LineQueueRep.DeleteAsync(removeUpiList);
+ }
+
+ var removePackageList = await _mes_Package_LineQueueRep.AsQueryable().Where(x => x.PackageCode == item.PackageCode).ToListAsync();
+ if (removePackageList?.Count > 0)
+ {
+ await _mes_Package_LineQueueRep.DeleteAsync(removePackageList);
+ }
+
+
}
+
+ //涓嬬嚎鏇存柊 璁㈠崟琛ㄦ暟鎹� _mesOrderGatherRep
+ await UpdateOrderGather(singlePackage, input.IsNG);
WmsRecordPackageProcess wmsRecordPackage = new WmsRecordPackageProcess();
wmsRecordPackage = singlePackage.Adapt<WmsRecordPackageProcess>();
wmsRecordPackage.Id = Yitter.IdGenerator.YitIdHelper.NextId();
wmsRecordPackage.Location = "";
- wmsRecordPackage.OperRemark = "NG涓嬬嚎";
+ wmsRecordPackage.OperRemark = _OperRemark;
wmsRecordPackage.CreateTime = DateTime.Now;
wmsRecordPackage.CreateUserName = _cretaorName;
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);
+ }
+
+ /// <summary>
+ /// 鍏叡-涓嬬嚎鏇存柊 璁㈠崟琛ㄦ暟鎹�
+ /// </summary>
+ /// <param name="singlePackage"></param>
+ /// <returns></returns>
+ private async Task UpdateOrderGather(Mes_Package_Gather singlePackage, bool isNG)
+ {
+ //涓嬬嚎鏇存柊 璁㈠崟琛ㄦ暟鎹� _mesOrderGatherRep
+ bool isAdd = false;
+ var order = await _mesOrderGatherRep.AsQueryable().Where(x => x.Info5 == singlePackage.Info5).FirstAsync();
+ if (order == null)
+ {
+ isAdd = true;
+ order = new Mes_Order_Gather()
+ {
+ Info5 = singlePackage.Info5,
+ OrderId = singlePackage.OrderId,
+ PlanNo = singlePackage.PlanNo,
+ };
+ }
+ var packageList = await _mesPackageGatherRep.AsQueryable().Where(x => x.Info5 == singlePackage.Info5).ToListAsync();
+ order.PackageNum = packageList.Count();
+ order.UnLinePackageNum = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾�).Count() + 1;
+
+ order.NgPackageNum = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾� && x.UpiFlag == UpiFlagEnum.NG).Count();
+ if (isNG)
+ {
+ order.NgPackageNum = order.NgPackageNum + 1;
+ }
+
+ order.NoUnLinePackageNum = order.PackageNum - order.UnLinePackageNum;
+
+ order.AllPackageArea = packageList.Sum(x => Convert.ToDecimal(x.Info13));
+ order.ScanPackageArea = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾� && x.UpiFlag == (int)UpiFlagEnum.姝ｅ父).Sum(x => Convert.ToDecimal(x.Info13));
+ if (isNG == false)
+ {
+ order.ScanPackageArea = order.ScanPackageArea + Convert.ToDecimal(singlePackage.Info13);
+ }
+
+ 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);
+ }
+ else
+ {
+ await _mesOrderGatherRep.UpdateAsync(order);
+ }
}
/// <summary>
@@ -590,5 +812,25 @@
}
+
+ /// <summary>
+ /// 鎵爜璁板綍娓呴櫎
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "PartClear")]
+ [Description("WmsOperationTask/PartClear")]
+ public async Task PartClear()
+ {
+ //妯″紡鍒ゆ柇
+ var client = await WCFServiceHelper.GetWCFService_SAPCC_Client(_sysConfigRep);
+ var res = await client.WriteStation_PartClearAsync();
+ if (res.result == false)
+ {
+ throw Oops.Oh(res.resMsg);
+ }
+ }
+
}
--
Gitblit v1.9.3