From a8fcfbb5e5ed9a07b1a30ef2d7ef9d407e9b04dd Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 02 四月 2025 21:44:54 +0800
Subject: [PATCH] 更新ASN实体
---
Tiger.Business.MES/BIZ/ImportWoPlan.cs | 109 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 78 insertions(+), 31 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/ImportWoPlan.cs b/Tiger.Business.MES/BIZ/ImportWoPlan.cs
index 7b4c2a2..7a2d6e2 100644
--- a/Tiger.Business.MES/BIZ/ImportWoPlan.cs
+++ b/Tiger.Business.MES/BIZ/ImportWoPlan.cs
@@ -39,29 +39,69 @@
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");
+ if (item.VALIDATION_TYPE == "鏂板")
{
- var y = db.Storageable(pageList)
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.ExecuteCommand();
- });
+ var _batchWos = await Biz.Db.Queryable<V_MES_WO_BATCH>().Where(x => x.ORDER_NO == item.ORDER_NO).ToListAsync();
+ if (_batchWos.Count > 0)
+ {
+ 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 ?? "") + ((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)
+ .WhereColumns(t => new { t.ORDER_NO, t.PLAN_DATE, t.GHOST_ROW })
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ });
+ }
+ else
+ {
+ var s = db.Storageable(list)
+ .WhereColumns(t => new { t.ORDER_NO, t.PLAN_DATE, t.GHOST_ROW })
+ .ToStorage();
+ s.AsInsertable.ExecuteCommand();
+ s.AsUpdateable.IgnoreColumns(x => x.ID).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,24 +131,14 @@
{
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
{
- var _batchWos = await Biz.Db.Queryable<V_MES_WO_BATCH>().Where(x => x.ORDER_NO == item.ORDER_NO).ToListAsync();
- if (_batchWos.Count > 0)
- {
- item.BATCH_NO = $"{item.ORDER_NO}-{(_batchWos.Max(x => x.BATCH) + 1).ToString("D2")}";
- }
- else
- {
- item.BATCH_NO = $"{item.ORDER_NO}-01";
- }
-
if (item.PLAN_DATE.IsNullOrEmpty())
{
item.VALIDATION_TYPE = "寮傚父";
@@ -120,11 +150,28 @@
item.VALIDATION_TYPE = "寮傚父";
item.VALIDATION_RESULT += $"璁″垝鏁伴噺涓虹┖; ";
}
- var _woBatch = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == item.ORDER_NO && SqlFunc.DateIsSame(x.PLAN_DATE, item.PLAN_DATE) && x.STATUS != BIZ_MES_WO_BATCH.STATUSs.Closed.GetValue()).FirstAsync();
+ var _wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == item.ORDER_NO).FirstAsync();
+ var _batchs = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == item.ORDER_NO).ToListAsync();
+ if (_batchs.Count > 0)
+ {
+ if ((_batchs.Sum(x => x.PLAN_QTY) + item.PLAN_QTY > _wo.PLAN_QTY) || item.PLAN_QTY > _wo.PLAN_QTY)
+ {
+ item.VALIDATION_TYPE = "寮傚父";
+ item.VALIDATION_RESULT += $"宸ュ崟涓嬪彂鐨勬暟閲忚秴杩囧伐鍗曡鍒掓暟閲忥紝涓嶈兘涓嬪彂锛�";
+ }
+ }
+ var _woBatch = _batchs.Where(x => x.ORDER_NO == item.ORDER_NO && SqlFunc.DateIsSame(x.PLAN_DATE, item.PLAN_DATE) && BIZ_MES_WO_BATCH.STATUSs.Init.GetValue() < x.STATUS && x.STATUS < BIZ_MES_WO_BATCH.STATUSs.Closed.GetValue()).FirstOrDefault();
if (!_woBatch.IsNullOrEmpty())
{
item.VALIDATION_TYPE = "寮傚父";
- item.VALIDATION_RESULT += $"鏁版嵁宸茬粡瀛樺湪锛屼笉鑳芥洿鏂般�傚瓨鍦ㄧ殑璁″垝鏁伴噺涓篬{_woBatch.PLAN_QTY}]";
+ item.VALIDATION_RESULT += $"鏁版嵁宸茬粡瀛樺湪涓旂姸鎬佷笉鏄垵濮嬪寲锛屼笉鑳芥洿鏂般�傚瓨鍦ㄧ殑璁″垝鏁伴噺涓篬{_woBatch.PLAN_QTY}]";
+ }
+ var _woBatch2 = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == item.ORDER_NO && SqlFunc.DateIsSame(x.PLAN_DATE, item.PLAN_DATE) && x.STATUS == BIZ_MES_WO_BATCH.STATUSs.Init.GetValue()).First();
+ if (!_woBatch2.IsNullOrEmpty())
+ {
+ item.VALIDATION_TYPE = "鏇存柊";
+ item.VALIDATION_RESULT = $"鏁版嵁鍙互鏇存柊";
+ item.BATCH_NO = _woBatch2.BATCH_NO;
}
}
}
--
Gitblit v1.9.3