From 9fe67118a220448d5d9647733d6c8308f069e4da Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 13 十月 2024 16:05:23 +0800
Subject: [PATCH] 增加工艺路线必须要有结束节点，及其流程相应优化 增加工单批次自动关单 增加判断条码是未投入生产还是已经完工产出
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index 4b9b837..ec3383a 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,10 @@
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;
var _batchWos = await Biz.Db.Queryable<V_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.WoBatch.ORDER_NO).ToListAsync();
if (_batchWos.Count > 0)
@@ -198,7 +207,7 @@
var db = Biz.Db;
var dbTran = db.UseTran(() =>
{
- db.Updateable(_wo, input.UserId).UpdateColumns(x => new { x.STATUS, x.ROUTE_STATUS }).ExecuteCommand();
+ db.Updateable(_wo, input.UserId).UpdateColumns(x => new { x.STATUS, x.ROUTE_STATUS, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
});
if (!dbTran.IsSuccess)
{
@@ -232,13 +241,20 @@
_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() && Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Any(x => x.ORDER_NO == input.WorkOrder && x.BATCH_NO != input.WoBatch && x.ACT_LINE == _woBatch.ACT_LINE && BIZ_MES_WO.STATUSs.Imported.GetValue() < x.STATUS && x.STATUS < BIZ_MES_WO.STATUSs.Closed.GetValue()))
+ //濡傛灉鏄笅鍙�
+ if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue())
{
- result.IsSuccessed = false;
- result.LocaleMsg = new($"宸ュ崟瀛樺湪鏈畬鎴愮殑宸ュ崟鎵规锛屼笉鑳戒笅鍙�");
- return result;
+ if (Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Any(x => x.ORDER_NO == input.WorkOrder && x.BATCH_NO != input.WoBatch && x.ACT_LINE == input.ActLine && BIZ_MES_WO.STATUSs.Imported.GetValue() < x.STATUS && x.STATUS < BIZ_MES_WO.STATUSs.Closed.GetValue()))
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟瀛樺湪鏈畬鎴愮殑宸ュ崟鎵规锛屼笉鑳戒笅鍙�");
+ return result;
+ }
+ _woBatch.RELEASE_TIME = DateTime.Now;
+ _woBatch.RELEASE_USER = input.UserId;
+ _woBatch.ACT_LINE = input.ActLine;
}
}
else
@@ -251,7 +267,15 @@
var db = Biz.Db;
var dbTran = db.UseTran(() =>
{
- db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS }).ExecuteCommand();
+ //濡傛灉鏄笅鍙�
+ if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue())
+ {
+ db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.RELEASE_USER, x.RELEASE_TIME, x.ACT_LINE, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
+ }
+ else
+ {
+ db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
+ }
});
if (!dbTran.IsSuccess)
{
--
Gitblit v1.9.3