From 4ad0c3cfa27e9562217e517d62173bf97759f68e Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 02 八月 2024 21:12:52 +0800
Subject: [PATCH] 增加工单生产判断
---
Tiger.Business/MES/Biz.WorkBatch.cs | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/Tiger.Business/MES/Biz.WorkBatch.cs b/Tiger.Business/MES/Biz.WorkBatch.cs
index 4e4fec1..a34b4a8 100644
--- a/Tiger.Business/MES/Biz.WorkBatch.cs
+++ b/Tiger.Business/MES/Biz.WorkBatch.cs
@@ -8,20 +8,16 @@
using Rhea.Common;
using System.Net;
using System.Linq;
-using Newtonsoft.Json;
using Tiger.IBusiness;
-using Microsoft.AspNetCore.Http;
using Tiger.Business.MES;
-using Org.BouncyCastle.Ocsp;
using Tiger.Model.Entitys.MES.Position;
-using static System.Net.Mime.MediaTypeNames;
namespace Tiger.Business
{
public partial class Biz
{
/// <summary>
- /// 宸ュ崟鎵规
+ /// 鐢熶骇涓殑宸ュ崟鎵规
/// </summary>
public partial class WorkBatch : IWorkBatch, IDisposable
{
@@ -110,12 +106,13 @@
}
/// <summary>
- /// 妫�鏌ュ伐鍗曞疄鏃剁姸鎬侊紝鍒ゆ柇鍙互鐢熶骇锛氬伐鍗曡窡鎵规鐘舵�佷笉鏄凡涓嬪彂鎴栬�呯敓浜т腑锛屽垯涓嶅厑璁哥敓浜�
+ /// 妫�鏌ュ伐鍗曞湪褰撳墠宸ュ簭鑺傜偣鏄惁鍙互鐢熶骇
/// </summary>
+ /// <param name="curNode"></param>
/// <returns></returns>
- public ApiAction<SubmitOutput> CheckStatus()
+ public ApiAction<SubmitOutput> CheckCanProduce(MES_WO_NODE curNode)
{
- var action = new ApiAction<SubmitOutput>(true);
+ var action = new ApiAction<SubmitOutput>(new SubmitOutput(), true);
WO = Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == OrderNo).First();
Batch = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(q => q.ORDER_NO == OrderNo && q.ACT_LINE == LineCode).First();
@@ -123,8 +120,7 @@
if (Batch.STATUS != BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() && Batch.STATUS != BIZ_MES_WO_BATCH.STATUSs.Working.GetValue())
{
action.IsSuccessed = false;
- action.Data.CurWO = WO.ORDER_NO;
- action.Data.CurBatch = Batch.BATCH_NO;
+ action.Data.SetValue(this, null);
//action.LocaleMsg = new($"宸ュ崟鎵规[{Batch.BATCH_NO}]鐘舵�乕{Batch.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName()}]涓嶆槸鍏佽鐢熶骇鐨勭姸鎬侊紝璇锋壂鎻忓厑璁哥敓浜х殑浜у搧鏉＄爜");
action.LocaleMsg = new("MES.WorkBatch.WoBatchStatusCanNotWork", Batch.BATCH_NO, Batch.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName());
}
@@ -132,10 +128,17 @@
if (WO.STATUS != BIZ_MES_WO.STATUSs.Release.GetValue() && WO.STATUS != BIZ_MES_WO.STATUSs.Working.GetValue())
{
action.IsSuccessed = false;
- action.Data.CurWO = WO.ORDER_NO;
- action.Data.CurBatch = Batch.BATCH_NO;
+ action.Data.SetValue(this, null);
//action.LocaleMsg = new($"宸ュ崟[{WO.ORDER_NO}]鐘舵�乕{Batch.STATUS.GetEnum<BIZ_MES_WO.STATUSs>().GetName()}]涓嶆槸鍏佽鐢熶骇鐨勭姸鎬侊紝璇锋壂鎻忓厑璁哥敓浜х殑浜у搧鏉＄爜");
action.LocaleMsg = new("MES.WorkBatch.WoStatusCanNotWork", WO.ORDER_NO, Batch.STATUS.GetEnum<BIZ_MES_WO.STATUSs>().GetName());
+ }
+ //宸ュ崟鎵规鎶曞叆鏁伴噺鍑忓幓鎶ュ簾鏁伴噺濡傛灉澶т簬绛変簬璁″垝鏁伴噺锛屽垯涓嶅厑璁哥敓浜�
+ if (curNode.IS_INPUT == "Y" && Batch.INPUT_QTY - Batch.SCRAP_QTY >= Batch.PLAN_QTY)
+ {
+ action.IsSuccessed = false;
+ action.Data.SetValue(this, null);
+ action.LocaleMsg = new($"宸ュ崟鎵规[{0}]宸叉姇鍏� {1}锛屽叾涓姤搴� {2}锛屼互婊¤冻璁″垝鏁伴噺[{3}]锛屾棤闇�缁х画鎶曞叆");
+ action.LocaleMsg = new("MES.WorkBatch.WoInputEnough", Batch.BATCH_NO, Batch.INPUT_QTY, Batch.SCRAP_QTY, Batch.PLAN_QTY);
}
return action;
@@ -226,7 +229,7 @@
/// <returns></returns>
public ApiAction<SubmitOutput> CanGotoNext(SubmitInput input, MES_WIP_DATA wipSN, MES_WO_NODE nextNode)
{
- var action = new ApiAction<SubmitOutput>();
+ var action = new ApiAction<SubmitOutput>(new SubmitOutput());
//鏉＄爜鍦ㄦ湰宸ュ崟绗竴娆¤繃绔�
if (wipSN.NODE_ID.IsNullOrEmpty())
@@ -239,8 +242,7 @@
else
{
action.IsSuccessed = false;
- action.Data.CurWO = WO.ORDER_NO;
- action.Data.CurBatch = Batch.BATCH_NO;
+ action.Data.SetValue(this, null);
var nextList = Nodes.Where(q => q.IS_FIRST_NODE == "Y");
action.LocaleMsg = new("MES.WorkBatch.GotoNextNodeException", wipSN.SN, nextNode.NODE_NAME, string.Join(", ", nextList.Select(q => q.NODE_NAME + (q.CAN_SKIP == "Y" ? $"({T(L("MES.WorkBatch.Optional"), input.Locale)})" : ""))));
return action;
@@ -275,8 +277,7 @@
else
{
action.IsSuccessed = false;
- action.Data.CurWO = WO.ORDER_NO;
- action.Data.CurBatch = Batch.BATCH_NO;
+ action.Data.SetValue(this, null);
var nextList = reflowNodes.Where(q => wipSN.REFLOW_NODE.IsNullOrEmpty() || wipSN.REFLOW_NODE == q.NODE_NAME);
action.LocaleMsg = new("MES.WorkBatch.ReflowToNodeException", nextNode.NODE_NAME, wipSN.SN, curNode.NODE_NAME, string.Join(", ", nextList.Select(q => q.NODE_NAME + (q.CAN_SKIP == "Y" ? $"({T(L("MES.WorkBatch.Optional"), input.Locale)})" : ""))));
return action;
@@ -287,8 +288,7 @@
&& curSetting.ALLOW_DFT_IN != "Y" && nextNode.Operation.OPER_TYPE != MES_OPERATION.OPER_TYPEs.Repair.GetValue())
{
action.IsSuccessed = false;
- action.Data.CurWO = WO.ORDER_NO;
- action.Data.CurBatch = Batch.BATCH_NO;
+ action.Data.SetValue(this, null);
action.LocaleMsg = new("MES.WorkBatch.PleaseGotoRepair", curNode.NODE_NAME, wipSN.SN);
return action;
}
@@ -308,8 +308,7 @@
if (nextNodes.Any(q => NodeSets.Any(s => s.NODE_ID == q.ID && s.IS_ACTIVE == "Y" && s.CAN_SKIP != "Y")))
{
action.IsSuccessed = false;
- action.Data.CurWO = WO.ORDER_NO;
- action.Data.CurBatch = Batch.BATCH_NO;
+ action.Data.SetValue(this, null);
var nextList = nextNodes.Where(q => NodeSets.Any(s => s.NODE_ID == q.ID && s.IS_ACTIVE == "Y" && s.CAN_SKIP != "Y"));
action.LocaleMsg = new("MES.WorkBatch.GotoNextNodeException", wipSN.SN, nextNode.NODE_NAME, string.Join(", ", nextList.Select(q => q.NODE_NAME + (q.CAN_SKIP == "Y" ? $"({T(L("MES.WorkBatch.Optional"), input.Locale)})" : ""))));
return action;
@@ -338,8 +337,7 @@
else
{
action.IsSuccessed = false;
- action.Data.CurWO = WO.ORDER_NO;
- action.Data.CurBatch = Batch.BATCH_NO;
+ action.Data.SetValue(this, null);
var nextList = nextNodes.Where(q => NodeSets.Any(s => s.NODE_ID == q.ID && s.IS_ACTIVE == "Y"));
action.LocaleMsg = new("MES.WorkBatch.GotoNextNodeException", wipSN.SN, nextNode.NODE_NAME, string.Join(", ", nextList.Select(q => q.NODE_NAME + (q.CAN_SKIP == "Y" ? $"({T(L("MES.WorkBatch.Optional"), input.Locale)})" : ""))));
return action;
--
Gitblit v1.9.3