From 6b821f97b2a82c199113d68054b3e3c93f3443aa Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期一, 28 四月 2025 14:19:04 +0800
Subject: [PATCH] 收货行ID类型修改
---
Tiger.Business.MES/WorkAction/InputQty.cs | 88 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 82 insertions(+), 6 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/InputQty.cs b/Tiger.Business.MES/WorkAction/InputQty.cs
index 0cb3940..c860232 100644
--- a/Tiger.Business.MES/WorkAction/InputQty.cs
+++ b/Tiger.Business.MES/WorkAction/InputQty.cs
@@ -69,11 +69,25 @@
action.LocaleMsg = GetBeginMsg();
- //濡傛灉杩斿洖鎴愬姛鍒欒涓哄綋鍓嶈涓哄彲浠ュ紑濮嬫墽琛岋紝鍚﹀垯杩斿洖澶辫触
- CurStep.Message = Biz.L("璇疯緭鍏ユ暟閲�");
- CurStep.Status = StepStatus.Normal;
- action.IsSuccessed = true;
- action.Data.ShortMsg = new("璇疯緭鍏ユ暟閲�", ShortMessage.Types.Success);
+ //濡傛灉鏄寘瑁呮潯鐮佸垯涓嶅厑璁镐慨鏀规暟閲�
+ if (MainDB.Queryable<MES_WIP_PKG>().Any(q => q.PARENT_SN == CurPosition.CurSN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG))
+ {
+ CurStep.Message = Biz.L("鍖呰鏉＄爜涓嶅厑璁镐慨鏀规暟閲�");
+ CurStep.Status = StepStatus.Error;
+ action.IsSuccessed = false;
+ action.Data.ShortMsg = new("鍖呰鏉＄爜涓嶅厑璁镐慨鏀规暟閲�", ShortMessage.Types.Error);
+ //action.LocaleMsg = new($"鍖呰鏉＄爜[{0}]涓嶅厑璁镐慨鏀规暟閲忥紝璇烽噸鏂版壂鎻忔纭殑鏉＄爜");
+ action.LocaleMsg = new("MES.WorkAction.InputQty.NotAllowPackage", CurPosition.CurSN);
+ CurPosition.ResetNode();
+ }
+ else
+ {
+ //濡傛灉杩斿洖鎴愬姛鍒欒涓哄綋鍓嶈涓哄彲浠ュ紑濮嬫墽琛岋紝鍚﹀垯杩斿洖澶辫触
+ CurStep.Message = Biz.L("璇疯緭鍏ユ暟閲�");
+ CurStep.Status = StepStatus.Normal;
+ action.IsSuccessed = true;
+ action.Data.ShortMsg = new("璇疯緭鍏ユ暟閲�", ShortMessage.Types.Success);
+ }
return action;
}
@@ -114,7 +128,8 @@
.Where(q => !CurPosition.CurWipSNs.Any(sn => sn.ID == q.WIP_ID)).DistinctBy(q => q.WIP_ID).Sum(q => q.QTY);
var batchInput = CurPosition.WorkBatch.WoSNs.Where(q => q.BATCH_NO == CurPosition.WorkBatch.Batch.BATCH_NO && BIZ_MES_WO_SN.STATUSs.NotInput.GetValue() < q.STATUS && q.STATUS <= BIZ_MES_WO_SN.STATUSs.Finished.GetValue())
.Where(q => !CurPosition.CurWipSNs.Any(sn => sn.ID == q.WIP_ID)).DistinctBy(q => q.WIP_ID).Sum(q => q.QTY);
-
+
+
//宸ュ崟鎵规鎶曞叆鏁伴噺鍑忓幓鎶ュ簾鏁伴噺濡傛灉澶т簬绛変簬璁″垝鏁伴噺锛屽垯涓嶅厑璁哥敓浜�
if ((NewBatchInputQty = batchInput + newInput) > CurPosition.WorkBatch.Batch.PLAN_QTY)
{
@@ -171,8 +186,18 @@
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
//璁板綍琛屼负鎿嶄綔璁板綍
var wipActs = new List<MES_WIP_ACT>();
+ var wipVars = new List<MES_WIP_ACT_VAR>();
foreach (var wipSn in CurPosition.CurWipSNs)
{
+ wipSn.QTY = NewQty;
+ foreach (var item in CurPosition.CurWipSNHiss.Where(q => q.WIP_ID == wipSn.ID))
+ {
+ item.QTY = NewQty;
+ }
+ foreach (var item in CurPosition.WorkBatch.WoSNs.Where(q => q.WIP_ID == wipSn.ID))
+ {
+ item.QTY = NewQty;
+ }
var wipAct = new MES_WIP_ACT()
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
@@ -206,15 +231,60 @@
PRD_CODE = wipSn.PRD_CODE,
ACT_TYPE = NodeAct.ACT_TYPE,
ACT_SN = wipSn.SN,
+ ACT_VAR_DIC = CurStep.ActionDic.ToJson(),
ACT_RESULT = "Y",
ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
TRACE_INFO = $"鏉＄爜[{CurPosition.CurSN}]鏇存柊鏁伴噺涓篬{NewQty}]淇濆瓨鎴愬姛",
};
wipActs.Add(wipAct);
+ foreach (var item in NodeAct.Variables)
+ {
+ var wipVar = new MES_WIP_ACT_VAR()
+ {
+ AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
+ AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
+ WIP_ID = wipSn.ID,
+ SN = wipSn.SN,
+ ITEM_CODE = wipSn.ITEM_CODE,
+ WORK_ORDER = wipSn.WORK_ORDER,
+ BATCH_NO = wipSn.BATCH_NO,
+ CUST_CODE = CurPosition.WorkBatch.WO.CUST_CODE,
+ ROT_CODE = wipSn.ROT_CODE,
+ NODE_ID = wipSn.NODE_ID,
+ NODE_NAME = wipSn.NODE_NAME,
+ ACT_ID = NodeAct.ID,
+ ACT_NAME = NodeAct.ACT_NAME,
+ FTY_CODE = wipSn.FTY_CODE,
+ WS_CODE = wipSn.WS_CODE,
+ LINE_CODE = wipSn.LINE_CODE,
+ POST_CODE = wipSn.POST_CODE,
+ OPER_CODE = wipSn.OPER_CODE,
+ SEGMENT = wipSn.SEGMENT,
+ FLOW_SN = wipSn.FLOW_SN,
+ TRAY_SN = wipSn.TRAY_SN,
+ INNER_SN = wipSn.INNER_SN,
+ CARTON_SN = wipSn.CARTON_SN,
+ PALLET_SN = wipSn.PALLET_SN,
+ OPERATION_TIME = DateTime.Now,
+ SFTS_CODE = wipSn.SFTS_CODE,
+ SFT_CODE = wipSn.SFT_CODE,
+ PRD_CODE = wipSn.PRD_CODE,
+ VAR_CODE = item.VAR_CODE,
+ VAR_NAME = item.VAR_NAME,
+ VAR_CONTROL = item.VAR_CONTROL,
+ VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
+ INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
+ TRACE_INFO = CurStep.ActionDic.ToJson(),
+ };
+ wipVars.Add(wipVar);
+ }
}
//鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
var _wipActs = wipActs.Clone();
+ var _wipVars = wipVars.Clone();
var wo = CurPosition.WorkBatch.WO.ORDER_NO;
var batch = CurPosition.WorkBatch.Batch.BATCH_NO;
var nodeID = NodeAct.NODE_ID;
@@ -233,6 +303,11 @@
.SetColumns(q => q.QTY == NewQty)
.Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && _wipIDs.Contains(q.WIP_ID))
.ExecuteCommand();
+ //鐢熶骇鍖呰璁板綍
+ db.Updateable<MES_WIP_PKG>(CurPosition.UserCode)
+ .SetColumns(q => q.QTY == NewQty)
+ .Where(q => q.WORK_ORDER == wo && _wipIDs.Contains(q.ID))
+ .ExecuteCommand();
//宸ュ崟琛�
db.Updateable<BIZ_MES_WO>(CurPosition.UserCode)
.SetColumns(q => q.INPUT_QTY == NewWoInputQty)
@@ -249,6 +324,7 @@
.Where(q => q.WORK_ORDER == wo && _wipIDs.Contains(q.WIP_ID))
.ExecuteCommand();
db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
+ db.Storageable(_wipVars, CurPosition.UserCode).ExecuteCommand();
};
IsFinished = true;
--
Gitblit v1.9.3