From a1190b73462ad2cd7d3ff4a5d942d1435ac62031 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 10 十月 2024 09:49:13 +0800
Subject: [PATCH] 优化工序逻辑
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index c66e448..a09f5cd 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;
@@ -121,19 +127,23 @@
return result;
}
var batchs = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.Wo.ORDER_NO).ToListAsync();
- if (batchs.Count > 0 && batchs.Sum(x => x.PLAN_QTY) + input.WoBatch.PLAN_QTY > _wo.PLAN_QTY)
+ if ((batchs.Count > 0 && batchs.Sum(x => x.PLAN_QTY) + input.WoBatch.PLAN_QTY > _wo.PLAN_QTY) || input.WoBatch.PLAN_QTY > _wo.PLAN_QTY)
{
result.IsSuccessed = false;
result.LocaleMsg = new($"宸ュ崟涓嬪彂鐨勬暟閲忚秴杩囧伐鍗曡鍒掓暟閲忥紝涓嶈兘涓嬪彂锛�");
return result;
}
- if (Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Any(x => x.ORDER_NO == input.Wo.ORDER_NO && x.ACT_LINE == input.WoBatch.ACT_LINE && x.STATUS > BIZ_MES_WO.STATUSs.Imported.GetValue() && x.STATUS < BIZ_MES_WO.STATUSs.Closed.GetValue()))
+ var _batch = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.Wo.ORDER_NO && x.ACT_LINE == input.WoBatch.ACT_LINE && x.STATUS < BIZ_MES_WO.STATUSs.Closed.GetValue()).First();
+ if (_batch != null)
{
result.IsSuccessed = false;
- result.LocaleMsg = new($"宸ュ崟鎵规鍦ㄧ嚎浣揫{input.WoBatch.ACT_LINE}]涓姸鎬佷负[{input.WoBatch.STATUS.GetEnumDesc<BIZ_MES_WO.STATUSs>()}]锛屼笉鑳戒笅鍙戯紒");
+ 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);
+ 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)
@@ -197,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 }).ExecuteCommand();
});
if (!dbTran.IsSuccess)
{
@@ -224,6 +234,7 @@
try
{
//淇濆瓨鍓嶇殑鍒ゆ柇
+ var _wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == input.WorkOrder).FirstAsync();
var _woBatch = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.BATCH_NO == input.WoBatch).FirstAsync();
if (_woBatch != null)
{
@@ -231,6 +242,19 @@
if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Paused.GetValue())
{
WoContext.RemoveBatch(input.WoBatch);
+ }
+ //濡傛灉鏄笅鍙�
+ if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue())
+ {
+ 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
@@ -243,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 }).ExecuteCommand();
+ }
+ else
+ {
+ db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS }).ExecuteCommand();
+ }
});
if (!dbTran.IsSuccess)
{
--
Gitblit v1.9.3