From 0859eca81c7d64fbc91c49928f78b50d6271760d Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 11 十月 2024 00:48:31 +0800
Subject: [PATCH] 优化了一些已知问题
---
Tiger.Business.MES/Transaction/TestNode.cs | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 3dce6a1..e276ea0 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -66,7 +66,7 @@
//褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗�
else
{
- var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER))
+ var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))
.ByAuth(input.AuthOption).Where((q, s) => s.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue())
.Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();
@@ -86,7 +86,7 @@
if (CurBatch?.Batch?.ORDER_NO != wosns.First().Batch.ORDER_NO)
{
//鏉＄爜宸茬粦瀹氱殑宸ュ崟涓嶇瓑浜庡綋鍓嶅伐鍗曞垯閲嶆柊閫夋嫨宸ュ崟
- var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosns.First().Batch.ORDER_NO });
+ var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosns.First().Batch.ORDER_NO }, wosns.First().Batch.BATCH_NO);
if (!result.IsSuccessed)
{
action.Data.ShortMsg = new("宸ュ崟寮傚父", ShortMessage.Types.Error);
@@ -210,14 +210,26 @@
public ApiAction<SubmitOutput> NodeSubmit(ApiAction<SubmitOutput> action, SubmitInput input)
{
var curNode = CurBatch.GetNode(PostCode);
+
try
{
+ //宸ュ簭鑺傜偣閫昏緫澧炲姞濡傛灉鏍瑰熀褰撳墠宀椾綅鎵句笉鍒板搴斿伐搴忕殑鏃跺�欒鎶ラ敊
+ if (curNode.IsNullOrEmpty())
+ {
+ action.Data.ShortMsg = new("鏈煡宸ュ簭", ShortMessage.Types.Error);
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"宀椾綅[{0}]鍦ㄥ伐鍗昜{1}]宸ヨ壓璺嚎涓壘涓嶅埌瀵瑰簲鐨勫伐搴忥紝璇锋鏌ュ伐鍗曞伐鑹鸿矾绾夸腑宸ュ簭涓庡矖浣嶇殑缁戝畾鍏崇郴鏄惁姝ｇ‘");
+ action.LocaleMsg = new("MES.Transaction.TestNode.NodeSubmit.OperateNodeError", PostCode, CurBatch.WO.ORDER_NO);
+ return action;
+ }
+ var curNodeSetting = CurBatch.GetNodeSetting(curNode);
+
//褰撳伐姝ュ垪琛ㄤ负绌猴紝鍒欐墽琛屽綋鍓嶅伐搴忕殑蹇呰閫昏緫褰撲綔绗竴涓伐搴忚妭鐐癸紝瀹屾垚鍚庢寜闇�姹傚垱寤哄悗缁殑宸ユ鍒楄〃
if (Steps.IsNullOrEmpty())
{
BeginAt = DateTime.Now;
//鍒ゆ柇宸ュ崟瀹炴椂鐘舵�佸垽鏂槸鍚﹀彲浠ョ敓浜�
- var woStatus = CurBatch.CheckCanProduce(curNode);
+ var woStatus = CurBatch.CheckCanProduce(curNode, curNodeSetting);
if (!woStatus.IsSuccessed)
{
woStatus.Data.ShortMsg = new("宸ュ崟寮傚父", ShortMessage.Types.Error);
@@ -281,7 +293,7 @@
//缁戝畾鏉＄爜鍒板伐鍗�
foreach (var wipSN in wipSNs)
{
- if (!CurBatch.WoSNs.Any(q => q.SN == wipSN.SN))
+ if (!CurBatch.WoSNs.Any(q => q.WIP_ID == wipSN.ID))
{
CurBatch.WoSNs.Add(new()
{
@@ -296,7 +308,7 @@
}
//鏇存柊宸ュ崟鏉＄爜鏄庣粏淇℃伅
- var woSNs = CurBatch.WoSNs.Where(q => wipSNs.Any(w => q.SN == w.SN)).ToList();
+ var woSNs = CurBatch.WoSNs.Where(q => wipSNs.Any(w => q.WIP_ID == w.ID)).ToList();
foreach (var woSN in woSNs)
{
woSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
@@ -328,17 +340,17 @@
wipSN.PRD_CODE = curShiftPeriod.Period.PRD_CODE;
}
//濡傛灉鏄姇鍏ョ珯
- if (curNode.IS_INPUT == "Y")
+ if (curNodeSetting.IS_INPUT == "Y")
{
- var woSN = woSNs.First(q => q.SN == wipSN.SN);
+ var woSN = woSNs.First(q => q.WIP_ID == wipSN.ID);
woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Inputed.GetValue();
wipSN.STATUS = MES_WIP_DATA.STATUSs.Input.GetValue();
wipSN.INLINE_DATE = DateTime.Now;
}
//濡傛灉鏄骇鍑虹珯
- if (curNode.IS_OUTPUT == "Y")
+ if (curNodeSetting.IS_OUTPUT == "Y")
{
- var woSN = woSNs.First(q => q.SN == wipSN.SN);
+ var woSN = woSNs.First(q => q.WIP_ID == wipSN.ID);
woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Finished.GetValue();
wipSN.STATUS = MES_WIP_DATA.STATUSs.Finished.GetValue();
wipSN.OUTLINE_DATE = DateTime.Now;
@@ -408,7 +420,7 @@
var _wipSns = wipSNs.Clone();
var _wipHiss = CurWipSNHiss.Clone();
var _defect = CurDefects.Clone();
- var _curNode = curNode.Clone();
+ var _curNodeSetting = curNodeSetting.Clone();
var _Batch = CurBatch.Batch.Clone();
//鍒濆鍖栧伐姝ュ垪琛�
@@ -433,13 +445,13 @@
db.Storageable(_defect, UserCode).ExecuteCommand();
}
//濡傛灉鏄姇鍏ョ珯
- if (_curNode.IS_INPUT == "Y")
+ if (_curNodeSetting.IS_INPUT == "Y")
{
db.Updateable<BIZ_MES_WO>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + _woSns.Count).Where(q => q.ORDER_NO == _Batch.ORDER_NO).ExecuteCommand();
db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + _woSns.Count).Where(q => q.BATCH_NO == _Batch.BATCH_NO).ExecuteCommand();
}
//濡傛灉鏄骇鍑虹珯
- if (_curNode.IS_OUTPUT == "Y")
+ if (_curNodeSetting.IS_OUTPUT == "Y")
{
db.Updateable<BIZ_MES_WO>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + _woSns.Count).Where(q => q.ORDER_NO == _Batch.ORDER_NO).ExecuteCommand();
db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + _woSns.Count).Where(q => q.BATCH_NO == _Batch.BATCH_NO).ExecuteCommand();
@@ -550,7 +562,7 @@
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
CurOperInfo(locale).InputQty += CurWipSNs.Count;
action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(locale));
- action.Data.ShortMsg = new("杩囩珯鎴愬姛", ShortMessage.Types.Success);
+ action.Data.ShortMsg = new(CurWipSNs.Any(q => q.DFT_FLAG == "Y") ? "涓嶈壇杩囩珯" : "鑹搧杩囩珯", ShortMessage.Types.Success);
//action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]");
action.LocaleMsg = new("MES.Transaction.CollectNode.ScanSn.PassSuccess", CurWipSNs.First().WORK_ORDER, CurSN, CurWipSNs.First().POST_CODE, CurWipSNs.First().NODE_NAME, CurWipSNs.First().STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
--
Gitblit v1.9.3