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 | 145 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 104 insertions(+), 41 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/ImportWoPlan.cs b/Tiger.Business.MES/BIZ/ImportWoPlan.cs
index 4bb151b..7a2d6e2 100644
--- a/Tiger.Business.MES/BIZ/ImportWoPlan.cs
+++ b/Tiger.Business.MES/BIZ/ImportWoPlan.cs
@@ -16,6 +16,8 @@
using System.Reflection;
using Dm.filter;
using System.Dynamic;
+using System.Data.Entity.Core.Metadata.Edm;
+using SqlSugar;
namespace Tiger.Business.MES
{
@@ -37,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)
@@ -76,40 +118,61 @@
/// <param name="newEntity"></param>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<ApiAction<List<T>>> ValidateTableImport<T>(T newEntity, ImportValidateInput input) {
+ public async Task<ApiAction<List<T>>> ValidateTableImport<T>(T newEntity, ImportValidateInput input)
+ {
var result = new ApiAction<List<T>>();
try
{
List<T> list = JsonConvert.DeserializeObject<List<T>>(input.EntityJson);
+ List<BIZ_MES_WO_BATCH> baths = list as List<BIZ_MES_WO_BATCH>;
List<string> chkColumns = JsonConvert.DeserializeObject<List<string>>(input.CheckJson);
List<string> wheres = JsonConvert.DeserializeObject<List<string>>(input.where); //鐩墠鍙湁=锛屼互鍚庡彲浠ュ鍔犲叾浠栫殑鏌ヨ鏉′欢
- Type entityType = typeof(T); //T娉涘瀷
- //閫氳繃灞炴�у悕鑾峰彇灞炴�у�� 鈥淰ALIDATION_TYPE鈥濆睘鎬у悕绉�
- PropertyInfo typeInfo = entityType.GetProperty("VALIDATION_TYPE");
- //閫氳繃灞炴�у悕鑾峰彇灞炴�у�� 鈥淰ALIDATION_RESULT鈥濆睘鎬у悕绉�
- PropertyInfo retInfo = entityType.GetProperty("VALIDATION_RESULT");
- foreach (var item in list)
+ foreach (var item in baths)
{
- string where = " 1=1 ";
- typeInfo.SetValue(item, "鏂板");
- retInfo.SetValue(item, "");
- foreach (var col in chkColumns)
+ item.VALIDATION_TYPE = "鏂板";
+ item.VALIDATION_RESULT = "";
+
+ 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()))
{
- PropertyInfo colInfo = entityType.GetProperty(col);
- if (!colInfo.IsNullOrEmpty() && colInfo.GetValue(item).IsNullOrEmpty()) {
- typeInfo.SetValue(item, "鏁版嵁寮傚父");
- retInfo.SetValue(item, "鍊间负绌烘垨涓嶅瓨鍦�");
+ item.VALIDATION_TYPE = "寮傚父";
+ item.VALIDATION_RESULT = "宸ュ崟涓嶅瓨鍦ㄦ垨鑰呭凡缁忓叧闂紝涓嶈兘瀵煎叆璁″垝锛�";
+ }
+ else
+ {
+ if (item.PLAN_DATE.IsNullOrEmpty())
+ {
+ item.VALIDATION_TYPE = "寮傚父";
+ item.VALIDATION_RESULT += $"璁″垝鏃ユ湡鍊间负绌烘垨涓嶅瓨鍦�; ";
}
- }
- foreach (var w in wheres)
- {
- PropertyInfo wInfo = entityType.GetProperty(w);
- where += $"AND {w} = '{wInfo.GetValue(item)}'";
- }
- if (await Biz.Db.Queryable<T>().Where(where).AnyAsync())
- {
- typeInfo.SetValue(item, "淇敼");
- retInfo.SetValue(item, "鏁版嵁宸茬粡瀛樺湪锛屼娇鐢ㄦ洿鏂�");
+
+ if (item.PLAN_QTY.IsNullOrEmpty())
+ {
+ item.VALIDATION_TYPE = "寮傚父";
+ item.VALIDATION_RESULT += $"璁″垝鏁伴噺涓虹┖; ";
+ }
+ 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}]";
+ }
+ 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;
+ }
}
}
result.Data = list;
--
Gitblit v1.9.3