From 9e70e03376aa1d7b86baef15e2ddfe3641fc0cb8 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 03 一月 2025 11:06:55 +0800
Subject: [PATCH] 优化代码结构，改进打印和计划处理逻辑
---
Tiger.Business.MES/BIZ/ImportWoPlan.cs | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/ImportWoPlan.cs b/Tiger.Business.MES/BIZ/ImportWoPlan.cs
index 80928c1..7a2d6e2 100644
--- a/Tiger.Business.MES/BIZ/ImportWoPlan.cs
+++ b/Tiger.Business.MES/BIZ/ImportWoPlan.cs
@@ -41,26 +41,29 @@
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.Any(q => q.VALIDATION_TYPE == "寮傚父"))
{
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")}";
+ 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;
+ 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,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