From 53f33d1f1575f5ce60fb3e6230e569ba4cc0dba5 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 13 十月 2024 23:11:26 +0800
Subject: [PATCH] 保存工艺路线到产品的客户
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 83 +++++++++++++++++++++++++++++++++++------
1 files changed, 70 insertions(+), 13 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index c66e448..e8397d3 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);
+ //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)
@@ -160,6 +170,31 @@
{
result.IsSuccessed = false;
result.LocaleMsg = new($"淇濆瓨鎵规宸ュ崟寮傚父");
+ }
+ //濡傛灉鎴愬姛锛屾牴鎹潯浠跺紓姝ヤ繚瀛樺伐鑹鸿矾绾垮埌浜у搧鐨勫鎴�
+ if (result.IsSuccessed && input.IfToCust) {
+ Work.DoAsync(() => {
+ try
+ {
+ SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { WO = input.Wo.ORDER_NO, ERR_CODE = 0, ERR_MSG = "" });
+ pars[1].Direction = System.Data.ParameterDirection.Output;
+ pars[2].Direction = System.Data.ParameterDirection.Output;
+ Biz.Db.Ado.UseStoredProcedure().ExecuteCommand("SP_MES_WO2CUST", pars);
+ //response.LocaleMsg = new(pars[2].Value.ToString());
+ if (pars[1].Value.ToInt32() == 0)
+ {
+ Logger.Default.Info($"宸ュ崟[{input.Wo.ORDER_NO}]涓嬪彂瀹屾垚鍚庝繚瀛樺伐鑹鸿矾绾挎暟鎹埌浜у搧[{input.Wo.ITEM_CODE}]鐨勫鎴穂{input.Wo.Customer.CUST_NAME_CN}]鐨勫伐鑹鸿矾绾夸腑锛寋pars[2].Value.ToString()}");
+ }
+ else
+ {
+ Logger.Default.Error($"宸ュ崟[{input.Wo.ORDER_NO}]涓嬪彂瀹屾垚鍚庝繚瀛樺伐鑹鸿矾绾挎暟鎹埌浜у搧[{input.Wo.ITEM_CODE}]鐨勫鎴穂{input.Wo.Customer.CUST_NAME_CN}]鐨勫伐鑹鸿矾绾垮嚭閿欙紝{pars[2].Value.ToString()}");
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "淇濆瓨鎵规宸ュ崟寮傚父");
+ }
+ });
}
}
catch (Exception ex)
@@ -197,7 +232,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)
{
@@ -224,13 +259,27 @@
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)
{
_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())
+ {
+ 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 +292,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