From 2e2033964d99196d94b0abd9f3364b9b2387b324 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 02 一月 2025 23:28:23 +0800
Subject: [PATCH] 优化 ImportWoPlan.cs 代码逻辑，减少冗余并增加状态处理
---
Tiger.Business.MES/BIZ/ImportWoPlan.cs | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/ImportWoPlan.cs b/Tiger.Business.MES/BIZ/ImportWoPlan.cs
index 78ffe33..479787c 100644
--- a/Tiger.Business.MES/BIZ/ImportWoPlan.cs
+++ b/Tiger.Business.MES/BIZ/ImportWoPlan.cs
@@ -46,21 +46,24 @@
foreach (var item in list)
{
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)
+ if (item.VALIDATION_TYPE == "鏂板")
{
- item.BATCH_NO = $"{item.ORDER_NO}-{(_batchWos.Max(x => x.BATCH) + 1).ToString("D2")}";
- }
- else
- {
- item.BATCH_NO = $"{item.ORDER_NO}-01";
+ 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.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;
+ item.CUST_CODE = wo.CUST_CODE;
woList.Add(wo);
}
}
@@ -72,17 +75,19 @@
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.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.ExecuteCommand();
+ s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
}
db.Updateable(woList).UpdateColumns(x => new { x.PLAN_DATE }).ExecuteCommand();
});
@@ -134,16 +139,6 @@
}
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 = "寮傚父";
@@ -155,11 +150,18 @@
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 _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) && BIZ_MES_WO_BATCH.STATUSs.Init.GetValue() < x.STATUS && x.STATUS < BIZ_MES_WO_BATCH.STATUSs.Closed.GetValue()).FirstAsync();
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