From a18b6286678e90a00c3ac20c8e937d40104d2ef9 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期六, 12 十月 2024 21:45:26 +0800
Subject: [PATCH] 工序结束返回包装信息
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index 673bd94..ff45619 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -108,12 +108,18 @@
{
//淇濆瓨鍓嶇殑鍒ゆ柇,骞剁敓鎴愭壒娆″彿
var _wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == input.Wo.ORDER_NO).FirstAsync();
- //if (_wo.STATUS > (int)BIZ_MES_WO.STATUSs.Init)
- //{
- // result.IsSuccessed = false;
- // result.LocaleMsg = new($"宸ュ崟涓嶆槸鍒濆鍖栫姸鎬侊紝涓嶈兘涓嬪彂锛�");
- // return result;
- //}
+ if (_wo.IsNullOrEmpty())
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟涓嶅瓨鍦紝涓嶈兘涓嬪彂锛�");
+ return result;
+ }
+ if (_wo.ROUTE_STATUS != BIZ_MES_WO.ROUTE_STATUSs.Finish.GetValue())
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟宸ヨ壓璺嚎鏈厤缃紝涓嶈兘涓嬪彂锛�");
+ return result;
+ }
if (_wo.STATUS > (int)BIZ_MES_WO.STATUSs.Working)
{
result.IsSuccessed = false;
@@ -134,7 +140,7 @@
result.LocaleMsg = new($"宸ュ崟[{input.Wo.ORDER_NO}]宸茬粡瀛樺湪宸ュ崟鎵规[{_batch.BATCH_NO}]鍦ㄧ嚎浣揫{input.WoBatch.ACT_LINE}]涓姸鎬佷负[{_batch.STATUS.GetEnumDesc<BIZ_MES_WO.STATUSs>()}]锛屼笉鑳戒笅鍙戯紒");
return result;
}
- WoContext.RemoveBatch(input.WoBatch.BATCH_NO);
+ //WoContext.RemoveBatch(input.WoBatch.BATCH_NO);
input.Wo.ACT_LINE = input.WoBatch.ACT_LINE;
input.Wo.RELEASE_TIME = DateTime.Now;
input.Wo.RELEASE_USER = input.WoBatch.UPDATE_USER;
@@ -235,7 +241,7 @@
_woBatch.STATUS = input.Status < 0 ? _woBatch.STATUS : input.Status;
if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Paused.GetValue())
{
- WoContext.RemoveBatch(input.WoBatch);
+ //WoContext.RemoveBatch(input.WoBatch);
}
//濡傛灉鏄笅鍙�
if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue())
--
Gitblit v1.9.3