From 6ca8cb2376f6f02e93e233130da9896565706a7f Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 30 十二月 2024 11:10:32 +0800
Subject: [PATCH] 工单计划导入更新
---
Tiger.Business.MES/BIZ/ImportWoPlan.cs | 66 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 25 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/ImportWoPlan.cs b/Tiger.Business.MES/BIZ/ImportWoPlan.cs
index 4bb151b..7b4c2a2 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
{
@@ -76,40 +78,54 @@
/// <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 = "";
+ var _wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == item.ORDER_NO).FirstAsync();
+ if (_wo.IsNullOrEmpty())
{
- 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
+ {
+ 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")}";
}
- }
- 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, "鏁版嵁宸茬粡瀛樺湪锛屼娇鐢ㄦ洿鏂�");
+ else
+ {
+ item.BATCH_NO = $"{item.ORDER_NO}-01";
+ }
+
+ if (item.PLAN_DATE.IsNullOrEmpty())
+ {
+ item.VALIDATION_TYPE = "寮傚父";
+ item.VALIDATION_RESULT += $"璁″垝鏃ユ湡鍊间负绌烘垨涓嶅瓨鍦�; ";
+ }
+
+ if (item.PLAN_QTY.IsNullOrEmpty())
+ {
+ 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();
+ if (!_woBatch.IsNullOrEmpty())
+ {
+ item.VALIDATION_TYPE = "寮傚父";
+ item.VALIDATION_RESULT += $"鏁版嵁宸茬粡瀛樺湪锛屼笉鑳芥洿鏂般�傚瓨鍦ㄧ殑璁″垝鏁伴噺涓篬{_woBatch.PLAN_QTY}]";
+ }
}
}
result.Data = list;
--
Gitblit v1.9.3