From 050fdd3ef7d0e17143093ee355941bd6437b5486 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 13 十一月 2024 12:00:43 +0800
Subject: [PATCH] 优化生产记录状态，使用完工标记作为产品完工的判断，不使用状态 从工单中解绑正在生产的条码时，同步更新工单池中同一工单的工单条码状态
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index c4c1db2..9052669 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -501,7 +501,7 @@
}
}
//鍏ュ簱鏍囩
- var wipActInStore = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.SN == woSn.SN && q.NODE_ID == pkgList[0].NODE_ID && !SqlFunc.IsNullOrEmpty(q.ACT_VALUE_3) && q.ACT_VALUE_4 == "InStroe").First();
+ var wipActInStore = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.SN == woSn.SN && q.NODE_ID == pkgList[0].NODE_ID && !SqlFunc.IsNullOrEmpty(q.ACT_VALUE_3) && q.ACT_VALUE_4 == "InStore").First();
if (!wipActInStore.IsNullOrEmpty())
{
var label = JsonConvert.DeserializeObject<BAS_LABEL_TEMP>(wipActInStore.ACT_VALUE_3);
@@ -518,7 +518,7 @@
string ACT_VALUE_3 = JsonConvert.SerializeObject(label);
foreach (var pkg in pkgList)
{
- var actSn = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID && q.ACT_VALUE_4 == "InStroe").First();
+ var actSn = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID && q.ACT_VALUE_4 == "InStore").First();
if (!actSn.IsNullOrEmpty())
{
actSn.ACT_VALUE_3 = ACT_VALUE_3;
@@ -555,7 +555,8 @@
try
{
//鍏堟煡鍑哄伐鍗曟潯鐮佷腑鏄惁瀛樺湪
- var woSn = await Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q => q.SN.Equals(input.Code) || q.FLOW_SN.Equals(input.Code)).FirstAsync();
+ var outerSn = input.Code.Split('|')[0];
+ var woSn = await Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q => q.SN.Equals(input.Code) || q.FLOW_SN.Equals(input.Code) || q.OUTER_SN == outerSn).FirstAsync();
if (woSn == null)
{
result.IsSuccessed = false;
@@ -578,11 +579,15 @@
//濡傛灉鏌ヤ笉鍒板氨鍘昏涓烘棩蹇楁煡
if (labelPrint.IsNullOrEmpty() && input.ReqType == 1)
{
- printParam = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => (q.SN.Equals(input.Code) || q.FLOW_SN.Equals(input.Code)) && q.ACT_VALUE_4 == "Customer").First()?.ACT_VALUE_3 ?? "";
+ printParam = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.CARTON_SN.Equals(woSn.OUTER_SN) && q.ACT_VALUE_4 == "Customer").First()?.ACT_VALUE_3 ?? "";
+ }
+ else if (labelPrint.IsNullOrEmpty() && input.ReqType == 2)
+ {
+ printParam = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.SN.Equals(woSn.SN) && q.ACT_VALUE_4 == "InStore").First()?.ACT_VALUE_3 ?? "";
}
else
{
- printParam = labelPrint.PRINT_PARAM;
+ printParam = labelPrint?.PRINT_PARAM ?? "";
}
result.Data = printParam;
result.LocaleMsg = new($"閲嶆墦鏉＄爜[{input.Code}]鐨勬爣绛炬垚鍔�");
@@ -606,9 +611,10 @@
{
DbClient db = Biz.DataSource["YadaU9C"].Client;
var org = await Biz.Db.Queryable<SYS_ORGANIZATION>().Where(q=>q.ORG_CODE == orgCode).FirstAsync();
- if (db.Queryable<mes_ShipList>().Any(q => q.MoDoc.Equals(wo) && SqlFunc.DateIsSame(q.BusinessDate, DateTime.Now) && q.Status == 2 && q.Org == org.ID.ToInt64()))
+ var shipList = db.Queryable<mes_ShipList>().Where(q => q.MoDoc.Equals(wo) && SqlFunc.DateIsSame(q.BusinessDate, DateTime.Now) && q.Status == 2 && q.Org == org.ID.ToInt64()).ToList();
+ if (shipList.Any())
{
- result.Data = "Customer";
+ result.Data = shipList[0].ShipQty;
result.LocaleMsg = new($"鍑鸿揣淇℃伅瀛樺湪锛�");
}
else
@@ -634,14 +640,21 @@
var result = new ApiAction();
try
{
- var wipList = await Biz.Db.Queryable<MES_WIP_DATA>().Where(q => q.SN.Equals(input.SN) || q.FLOW_SN.Equals(input.SN)).ToListAsync();
+ var cartonSn = input.SN.Split('|')[0];
+ var wipList = await Biz.Db.Queryable<MES_WIP_DATA>().Where(q => q.SN.Equals(input.SN) || q.FLOW_SN.Equals(input.SN) || q.CARTON_SN == cartonSn).ToListAsync();
if (wipList.Count == 0)
{
result.IsSuccessed = false;
result.LocaleMsg = new($"瑙ｇ粦鐨勬潯鐮佷笉瀛樺湪褰撳墠鎿嶄綔琛ㄤ腑锛�");
+ return result;
}
var wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == wipList[0].WORK_ORDER).FirstAsync();
result = WorkBatch.UnbindWipSnFromWO(wo, wipList, input.user);
+ if (result.IsSuccessed)
+ {
+ var newList = await Biz.Db.Queryable<MES_WIP_PKG>().Where(q => q.WORK_ORDER == wo.ORDER_NO && q.BATCH_NO == wipList[0].BATCH_NO && SqlFunc.IsNullOrEmpty(q.PARENT_SN) && q.QTY > 0).ToListAsync();
+ result.Data = newList;
+ }
}
catch (Exception ex)
{
--
Gitblit v1.9.3