From 0e82c6a0abbfcf4e5fea3ec1b4d27cf2268f2521 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 31 十二月 2024 23:18:09 +0800
Subject: [PATCH] 修复计划日期逻辑和更新条件判断
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index 9d3fe8a..57ed2a5 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -20,6 +20,7 @@
using Tiger.Model.MES.Yada;
using static Microsoft.CodeAnalysis.CSharp.SyntaxTokenParser;
using Tiger.Model.Minsun;
+using Tiger.Model.Entitys.MES.U9C;
namespace Tiger.Business.MES
{
@@ -131,20 +132,30 @@
return result;
}
var batchs = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.Wo.ORDER_NO).ToListAsync();
- if ((batchs.Count > 0 && batchs.Sum(x => x.PLAN_QTY) + input.WoBatch.PLAN_QTY > _wo.PLAN_QTY) || input.WoBatch.PLAN_QTY > _wo.PLAN_QTY)
+ if (batchs.Count > 0)
{
- result.IsSuccessed = false;
- result.LocaleMsg = new($"宸ュ崟涓嬪彂鐨勬暟閲忚秴杩囧伐鍗曡鍒掓暟閲忥紝涓嶈兘涓嬪彂锛�");
- return result;
- }
- var _batch = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.Wo.ORDER_NO && x.ACT_LINE == input.WoBatch.ACT_LINE && x.STATUS < BIZ_MES_WO.STATUSs.Closed.GetValue()).First();
- if (_batch != null)
- {
- result.IsSuccessed = false;
- result.LocaleMsg = new($"宸ュ崟[{input.Wo.ORDER_NO}]宸茬粡瀛樺湪宸ュ崟鎵规[{_batch.BATCH_NO}]鍦ㄧ嚎浣揫{input.WoBatch.ACT_LINE}]涓姸鎬佷负[{_batch.STATUS.GetEnumDesc<BIZ_MES_WO.STATUSs>()}]锛屼笉鑳戒笅鍙戯紒");
- return result;
+ if ((batchs.Sum(x => x.PLAN_QTY) + input.WoBatch.PLAN_QTY > _wo.PLAN_QTY) || input.WoBatch.PLAN_QTY > _wo.PLAN_QTY)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟涓嬪彂鐨勬暟閲忚秴杩囧伐鍗曡鍒掓暟閲忥紝涓嶈兘涓嬪彂锛�");
+ return result;
+ }
+ if (batchs.Any(x => x.ORDER_NO == input.Wo.ORDER_NO && x.ACT_LINE == input.WoBatch.ACT_LINE && x.STATUS < BIZ_MES_WO.STATUSs.Closed.GetValue()))
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟[{input.Wo.ORDER_NO}]宸茬粡鏈夋壒娆″瓨鍦ㄧ嚎浣揫{input.WoBatch.ACT_LINE}]涓紝鑰屼笖鐘舵�佷笉涓哄叧闂紝涓嶈兘涓嬪彂锛�");
+ return result;
+ }
+ if (batchs.Any(x => x.ORDER_NO == input.Wo.ORDER_NO && x.STATUS == BIZ_MES_WO.STATUSs.Init.GetValue() && SqlFunc.DateIsSame(x.PLAN_DATE, DateTime.Now)))
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟[{input.Wo.ORDER_NO}]宸茬粡鏈夋壒娆″瓨鍦ㄨ鍒掓棩鏈熺浉鍚岋紝鑰屼笖鐘舵�佷负[鍒濆鍖朷锛岃杞埌宸ュ崟鎵规涓笅鍙戯紒");
+ return result;
+ }
}
//WoContext.RemoveBatch(input.WoBatch.BATCH_NO);
+ input.WoBatch.PLAN_DATE = DateTime.Now;
+ input.Wo.PLAN_DATE = (input.Wo.PLAN_DATE ?? "") + ((input.Wo.PLAN_DATE ?? "").Contains(input.WoBatch.PLAN_DATE.ToString("yyyy-MM-dd")) ? "" : $",{input.WoBatch.PLAN_DATE.ToString("yyyy-MM-dd")}");
input.Wo.ACT_LINE = input.WoBatch.ACT_LINE;
input.Wo.RELEASE_TIME = DateTime.Now;
input.Wo.RELEASE_USER = input.WoBatch.UPDATE_USER;
@@ -166,7 +177,7 @@
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q=>new { q.STATUS, q.PLAN_DATE,q.ACT_LINE,q.RELEASE_TIME,q.RELEASE_USER,q.UPDATE_TIME,q.UPDATE_USER}).ExecuteCommand();
db.Insertable(input.WoBatch).ExecuteCommand();
});
@@ -642,12 +653,12 @@
result.Data = ship.BusinessDate.Date == DateTime.Now.Date ? new()
{
ShipDoc = ship.ShipDoc,
- ShippingQty = ship.ShipQty,
+ ShippingQty = ship.ShipQty.ToDouble(),
Tag = "Customer"
} : new()
{
ShipDoc = ship.ShipDoc,
- ShippingQty = ship.ShipQty,
+ ShippingQty = ship.ShipQty.ToDouble(),
Tag = "InStoreLabel"
};
result.LocaleMsg = new($"鍑鸿揣淇℃伅瀛樺湪锛�");
--
Gitblit v1.9.3