From 3586cc81669e86578ae69d69873c7844874d6ad1 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 31 十二月 2024 10:02:38 +0800
Subject: [PATCH] 重构批次检查逻辑并更新导入工单计划
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 89 +++++++++++++++++++++++++++++++-------------
1 files changed, 63 insertions(+), 26 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index 4fed14a..b4dd5d6 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.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.PLAN_DATE,q.ACT_LINE,q.RELEASE_TIME,q.RELEASE_USER,q.UPDATE_TIME,q.UPDATE_USER}).ExecuteCommand();
db.Insertable(input.WoBatch).ExecuteCommand();
});
@@ -291,6 +302,14 @@
_woBatch.ACT_LINE = input.ActLine;
_woBatch.CHANGE_USER = input.UserId;
_woBatch.CHANGE_TIME = DateTime.Now;
+ _wo.STATUS = BIZ_MES_WO.STATUSs.Release.GetValue();
+ }
+ else
+ {
+ if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Init.GetValue() && !Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.WorkOrder && x.BATCH_NO != input.WoBatch && x.STATUS > BIZ_MES_WO_BATCH.STATUSs.Init.GetValue()).Any())
+ {
+ _wo.STATUS = BIZ_MES_WO.STATUSs.Init.GetValue();
+ }
}
}
else
@@ -311,6 +330,10 @@
else
{
db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.UPDATE_USER, x.UPDATE_TIME, x.CHANGE_USER, x.CHANGE_TIME }).ExecuteCommand();
+ }
+ if (!_wo.IsNullOrEmpty())
+ {
+ db.Updateable(_wo, input.UserId).UpdateColumns(x => new { x.STATUS, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
}
});
if (!dbTran.IsSuccess)
@@ -630,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($"鍑鸿揣淇℃伅瀛樺湪锛�");
@@ -710,7 +733,7 @@
result.LocaleMsg = new($"鏉＄爜涓嶅瓨鍦紒");
return result;
}
- var wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == woSns[0].WORK_ORDER ).IncludesAllFirstLayer().FirstAsync();
+ var wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == woSns[0].WORK_ORDER ).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q._ItemInfos).FirstAsync();
if (wo == null)
{
result.IsSuccessed = false;
@@ -724,21 +747,12 @@
ErpProdInBth= new() {
WORK_ORDER = wo.ORDER_NO,
BATCH_NO = woSns[0].BATCH_NO,
- ITEM_CODE = wo.ITEM_CODE,
- ITEM_NAME = wo.ItemInfo?.ITEM_DESC,
- SCAN_QTY = woSns.Count
- },
- ProdInBatch = new()
- {
- WORK_ORDER = wo.ORDER_NO,
SALES_ORDER = wo.SALES_ORDER,
- BATCH_NO = woSns[0].BATCH_NO,
ITEM_CODE = wo.ITEM_CODE,
- SapCode = wo.ItemInfo?.ExtInfo?.SapCode,
ITEM_NAME = wo.ItemInfo?.ITEM_DESC,
- PLAN_QTY = wo.PLAN_QTY,
+ SapCode = wo.ItemInfo?.ExtInfo?.SapCode,
SCAN_QTY = woSns.Count,
- STATUS = "N" //Y-宸茬敓鎴愶紝N-鏈敓鎴愶紝F-澶辫触
+ IS_HANDLED = "N" //Y-宸茬敓鎴愶紝N-鏈敓鎴愶紝F-澶辫触
},
InStoreScanInfo = new() {
SN = cartonSn,
@@ -757,5 +771,28 @@
}
return result;
}
+
+ #region 鎻愪氦鍓嶉�氱敤鏂规硶
+ /// <summary>
+ /// 鎻愪氦鍓嶆鏌ユ槸鍚﹀矖浣嶃�佸伐鍗曞拰涓嶈壇浠ｇ爜
+ /// </summary>
+ /// <param name="code"></param>
+ /// <returns></returns>
+ public async Task<ApiAction<CheckCodeOutput>> CheckCode(string code)
+ {
+ var action = new ApiAction<CheckCodeOutput>($"妫�鏌ユ潯鐮亄code}鎴愬姛", new CheckCodeOutput());
+ try
+ {
+ action.Data.Position = DbCache.Cache.Position[code];
+ action.Data.WorkOrder = await Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == code).FirstAsync();
+ action.Data.Defect = DbCache.Cache.Defect[code];
+ }
+ catch (Exception ex)
+ {
+ action.CatchExceptionWithLog(ex, $"妫�鏌ユ潯鐮亄code}寮傚父");
+ }
+ return action;
+ }
+ #endregion
}
}
--
Gitblit v1.9.3