From 3586cc81669e86578ae69d69873c7844874d6ad1 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 31 十二月 2024 10:02:38 +0800
Subject: [PATCH] 重构批次检查逻辑并更新导入工单计划
---
Tiger.Business.MES/BIZ/ImportWoPlan.cs | 73 +++++++++++++++++++++++++++---------
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 35 +++++++++++------
2 files changed, 77 insertions(+), 31 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index 75a63f5..b4dd5d6 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -20,6 +20,7 @@
using Tiger.Model.MES.Yada;
using static Microsoft.CodeAnalysis.CSharp.SyntaxTokenParser;
using Tiger.Model.Minsun;
+using Tiger.Model.Entitys.MES.U9C;
namespace Tiger.Business.MES
{
@@ -131,20 +132,30 @@
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) || input.WoBatch.PLAN_QTY > _wo.PLAN_QTY)
+ if (batchs.Count > 0)
{
- result.IsSuccessed = false;
- result.LocaleMsg = new($"宸ュ崟涓嬪彂鐨勬暟閲忚秴杩囧伐鍗曡鍒掓暟閲忥紝涓嶈兘涓嬪彂锛�");
- return result;
- }
- 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.Wo.ORDER_NO}]宸茬粡瀛樺湪宸ュ崟鎵规[{_batch.BATCH_NO}]鍦ㄧ嚎浣揫{input.WoBatch.ACT_LINE}]涓姸鎬佷负[{_batch.STATUS.GetEnumDesc<BIZ_MES_WO.STATUSs>()}]锛屼笉鑳戒笅鍙戯紒");
- return result;
+ if ((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 (batchs.Any(x => x.ORDER_NO == input.Wo.ORDER_NO && x.ACT_LINE == input.WoBatch.ACT_LINE && x.STATUS < BIZ_MES_WO.STATUSs.Closed.GetValue()))
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟[{input.Wo.ORDER_NO}]宸茬粡鏈夋壒娆″瓨鍦ㄧ嚎浣揫{input.WoBatch.ACT_LINE}]涓紝鑰屼笖鐘舵�佷笉涓哄叧闂紝涓嶈兘涓嬪彂锛�");
+ return result;
+ }
+ if (batchs.Any(x => x.ORDER_NO == input.Wo.ORDER_NO && x.STATUS == BIZ_MES_WO.STATUSs.Init.GetValue() && SqlFunc.DateIsSame(x.PLAN_DATE, DateTime.Now)))
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟[{input.Wo.ORDER_NO}]宸茬粡鏈夋壒娆″瓨鍦ㄨ鍒掓棩鏈熺浉鍚岋紝鑰屼笖鐘舵�佷负[鍒濆鍖朷锛岃杞埌宸ュ崟鎵规涓笅鍙戯紒");
+ return result;
+ }
}
//WoContext.RemoveBatch(input.WoBatch.BATCH_NO);
+ input.WoBatch.PLAN_DATE = DateTime.Now;
+ input.Wo.PLAN_DATE += input.Wo.PLAN_DATE.Contains(input.WoBatch.PLAN_DATE.ToString("yyyy-MM-dd")) ? "" : $",{input.WoBatch.PLAN_DATE.ToString("yyyy-MM-dd")}";
input.Wo.ACT_LINE = input.WoBatch.ACT_LINE;
input.Wo.RELEASE_TIME = DateTime.Now;
input.Wo.RELEASE_USER = input.WoBatch.UPDATE_USER;
@@ -166,7 +177,7 @@
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q=>new { q.PLAN_DATE,q.ACT_LINE,q.RELEASE_TIME,q.RELEASE_USER,q.UPDATE_TIME,q.UPDATE_USER}).ExecuteCommand();
db.Insertable(input.WoBatch).ExecuteCommand();
});
diff --git a/Tiger.Business.MES/BIZ/ImportWoPlan.cs b/Tiger.Business.MES/BIZ/ImportWoPlan.cs
index 7b4c2a2..80928c1 100644
--- a/Tiger.Business.MES/BIZ/ImportWoPlan.cs
+++ b/Tiger.Business.MES/BIZ/ImportWoPlan.cs
@@ -39,29 +39,64 @@
try
{
- List<T> list = JsonConvert.DeserializeObject<List<T>>(input.EntityJson);
- DbClient db = Biz.Db;
- if (list.Any())
+ List<BIZ_MES_WO_BATCH> list = JsonConvert.DeserializeObject<List<BIZ_MES_WO_BATCH>>(input.EntityJson);
+ List<BIZ_MES_WO> woList = new List<BIZ_MES_WO>();
+ if (list.Any(q => q.VALIDATION_TYPE != "寮傚父"))
{
- if (list.Count > 100)
+ foreach (var item in list)
{
- db.Utilities.PageEach(list, 100, pageList =>
+ item.ID = Guid.NewGuid().ToString("N");
+ var _batchWos = await Biz.Db.Queryable<V_MES_WO_BATCH>().Where(x => x.ORDER_NO == item.ORDER_NO).ToListAsync();
+ if (_batchWos.Count > 0)
{
- var y = db.Storageable(pageList)
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.ExecuteCommand();
- });
+ item.BATCH_NO = $"{item.ORDER_NO}-{(_batchWos.Max(x => x.BATCH) + 1).ToString("D2")}";
+ }
+ else
+ {
+ item.BATCH_NO = $"{item.ORDER_NO}-01";
+ }
+ BIZ_MES_WO wo = Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == item.ORDER_NO).First();
+ if (wo != null)
+ {
+ wo.PLAN_DATE += wo.PLAN_DATE.Contains(item.PLAN_DATE.ToString("yyyy-MM-dd")) ? "" : $",{item.PLAN_DATE.ToString("yyyy-MM-dd")}";
+ item.ITEM_CODE = wo.ITEM_CODE;
+ item.CUST_CODE = wo.CUST_CODE;
+ woList.Add(wo);
+ }
}
- else
+ var db = Biz.Db;
+ var dbTran = db.UseTran(() =>
{
- var s = db.Storageable(list)
- .ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.ExecuteCommand();
+ if (list.Count > 100)
+ {
+ db.Utilities.PageEach(list, 100, pageList =>
+ {
+ var y = db.Storageable(pageList)
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.ExecuteCommand();
+ });
+ }
+ else
+ {
+ var s = db.Storageable(list)
+ .ToStorage();
+ s.AsInsertable.ExecuteCommand();
+ s.AsUpdateable.ExecuteCommand();
+ }
+ db.Updateable(woList).UpdateColumns(x => new { x.PLAN_DATE }).ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"淇濆瓨鎵规宸ュ崟寮傚父");
}
}
-
+ else
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new("瀵煎叆鏁版嵁鏈夊紓甯革紝涓嶈兘瀵煎叆锛�");
+ }
}
catch (Exception ex)
@@ -91,11 +126,11 @@
{
item.VALIDATION_TYPE = "鏂板";
item.VALIDATION_RESULT = "";
- var _wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == item.ORDER_NO).FirstAsync();
- if (_wo.IsNullOrEmpty())
+
+ if (!Biz.Db.Queryable<BIZ_MES_WO>().Any(x => x.ORDER_NO == item.ORDER_NO) || Biz.Db.Queryable<BIZ_MES_WO>().Any(x => x.ORDER_NO == item.ORDER_NO && x.STATUS == BIZ_MES_WO_BATCH.STATUSs.Closed.GetValue()))
{
item.VALIDATION_TYPE = "寮傚父";
- item.VALIDATION_RESULT = "宸ュ崟涓嶅瓨鍦紝涓嶈兘瀵煎叆璁″垝锛�";
+ item.VALIDATION_RESULT = "宸ュ崟涓嶅瓨鍦ㄦ垨鑰呭凡缁忓叧闂紝涓嶈兘瀵煎叆璁″垝锛�";
}
else
{
--
Gitblit v1.9.3