From c049523656adcbab2d16df48faa94c672063c0dc Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 30 三月 2025 18:44:59 +0800
Subject: [PATCH] 备料任务初版
---
Tiger.Business.WMS/Common/Preparation.cs | 390 +++++++++++++++++++------------------------------------
1 files changed, 133 insertions(+), 257 deletions(-)
diff --git a/Tiger.Business.WMS/Common/Preparation.cs b/Tiger.Business.WMS/Common/Preparation.cs
index 9d18f2a..139088e 100644
--- a/Tiger.Business.WMS/Common/Preparation.cs
+++ b/Tiger.Business.WMS/Common/Preparation.cs
@@ -1,304 +1,180 @@
锘縰sing Rhea.Common;
+using SqlSugar;
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Tiger.Business.WMS.Extensions;
using Tiger.Business.WMS.Transaction;
using Tiger.IBusiness;
using Tiger.Model;
+using Tiger.Model.Entitys.MES.Position;
+using Tiger.Model.Extensions;
namespace Tiger.Business.WMS.Common
{
/// <summary>
- /// 澶囨枡鍗曞彂鏂欎簨鍔�
+ /// 澶囨枡浠诲姟鍗曟嵁
/// </summary>
- public class Preparation : WMSTransactionBase, IPreparation
+ public class Preparation : IPreparation
{
+ public Preparation(DbClient mainDB, string userCode, string orgCode)
+ {
+ MainDB = mainDB;
+ UserCode = userCode;
+ OrgCode = orgCode;
+ }
+
#region Propertys & Variables
+ private static object AddOrderLock { get; } = new object();
+ public DbClient MainDB { get; set; }
public string UserCode { get; set; }
- public long UserId { get; set; }
public string OrgCode { get; set; }
- private DbClient _MainDB;
- public DbClient MainDB => _MainDB;
- private DbClient CommitDB;
- public Inventory CurInvItem { get; set; }
- public ScanShelfInfo CurScanShelf { get; set; }
- /// <summary>
- /// 璺熷鎴风閫氳鏃剁殑鎸囦护锛屾湁鍏蜂綋鍔熻兘瀹氫箟锛岄粯璁や负Normal
- /// </summary>
- public string Command { get; set; } = "Normal";
- /// <summary>
- /// 鏄惁闇�瑕佷复鏃跺瓨鍌ㄦ暟鎹簱鎻愪氦鎿嶄綔锛屽緟闇�瑕佺殑鏃跺�欏啀鎻愪氦
- /// </summary>
- public bool NeedTemporaryStoreDBCommitAction { get; set; } = false;
- protected Dictionary<string, List<Action>> DBCommitList { get; set; } = new();
+ public BIZ_WMS_PREP PrepOrder { get; set; }
#endregion Propertys & Variables
#region Functions
- public IPreparation Init(string id, string userCode, string apiHost, string orgCode)
- {
- TransID = id;
- UserCode = userCode;
- ApiHost = apiHost;
- OrgCode = orgCode;
- _MainDB = Biz.Db;
-
- return this;
- }
-
/// <summary>
- /// 鑾峰彇鎻愪氦鏁版嵁鐨凞bClient瀵硅薄
+ /// 澶囨枡浠诲姟娣诲姞鍗曟嵁
/// </summary>
+ /// <param name="bizType"></param>
+ /// <param name="orderNo"></param>
/// <returns></returns>
- public DbClient GetCommitDB()
+ public ApiAction<ScanOutput> AddOrder(BIZ_WMS_PREP.BIZ_TYPEs bizType, string orderNo)
{
- return CommitDB ??= Biz.Db;
- }
-
- /// <summary>
- /// 澧炲姞鏆傚瓨鐨勬暟鎹簱鎿嶄綔
- /// </summary>
- /// <param name="groupName">鏆傚瓨鐨勫垎缁�</param>
- /// <param name="action">鏆傚瓨鐨勬暟鎹簱鎿嶄綔</param>
- public void AddCommitAction(string group, Action action)
- {
- //澧炲姞闄勫姞鐨勪繚瀛樺唴瀹�
- if (!action.IsNullOrEmpty())
+ lock(AddOrderLock)
{
- if (!DBCommitList.ContainsKey(group))
- {
- DBCommitList.Add(group, new List<Action>());
- }
- var commitList = DBCommitList[group];
- commitList.Add(action);
- }
- }
+ var action = new ApiAction<ScanOutput>(new ScanOutput());
+
+ // 鏌ヨ鏄惁宸插瓨鍦ㄥ鏂欎换鍔�
+ var src = MainDB.Queryable<BIZ_WMS_PREP_SRC>().Where(q => q.SOURCE_ORDER == orderNo &&
+ SqlFunc.Subqueryable<BIZ_WMS_PREP>().Where(p => p.STATUS < BIZ_WMS_PREP.STATUSs.Sended.GetValue()).Any()).First();
+ if (PrepOrder.IsNullOrEmpty())
+ {
+ if (!src.IsNullOrEmpty())
+ {
+ PrepOrder = MainDB.Queryable<BIZ_WMS_PREP>().Where(q => q.ORDER_NO == src.ORDER_NO).IncludesAllFirstLayer().First();
+ //action.LocaleMsg = Biz.L("鍗曟嵁[{0}]鐨勫鏂欎换鍔{1}]鍔犺浇鎴愬姛锛屽彲浠ュ紑濮嬪鏂欎笅鏋�");
+ action.LocaleMsg = Biz.L("WMS.Out_BIZ_WMS_PREP.AddOrder.LoadSuccess", orderNo, PrepOrder.ORDER_NO);
+ return action;
+ }
+ else
+ {
+ PrepOrder = new BIZ_WMS_PREP()
+ {
+ AUTH_ORG = OrgCode,
+ ORDER_NO = $"MP{DateTime.Now:yyMMdd}{(DateTime.Now - DateTime.Today).TotalSeconds:00000}",
+ BIZ_TYPE = bizType.GetValue(),
+ STATUS = BIZ_WMS_PREP.STATUSs.Init.GetValue(),
+ };
+ }
+ }
+ if (!src.IsNullOrEmpty() && src.ORDER_NO != PrepOrder.ORDER_NO)
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鍗曟嵁[{0}]宸插睘浜庡鏂欎换鍔{1}]锛屾棤娉曟坊鍔犲埌褰撳墠澶囨枡浠诲姟[{2}]涓紝濡傞渶鍒囨崲澶囨枡涓氬姟锛岃閫�鍑哄悗閲嶆柊閫夋嫨");
+ action.LocaleMsg = Biz.L("WMS.Out_BIZ_WMS_PREP.AddOrder.NoFound", orderNo, src.ORDER_NO, PrepOrder.ORDER_NO);
+ return action;
+ }
+
+ // 鏌ヨ鍗曟嵁鏄庣粏锛屽苟鍚堝苟鍒板鏂欏崟鐨勫鏂欐槑缁嗕腑
+ var dtls = bizType.GetPickList(orderNo);
+ if (dtls.Sum(q => q.QTY_ACT_REQ) <= 0)
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鍗曟嵁[{0}]鏈壘鍒伴渶瑕佸鏂欑殑琛屾槑缁嗭紝璇锋壂鎻忔纭殑鍗曟嵁");
+ action.LocaleMsg = Biz.L("WMS.Out_BIZ_WMS_PREP.AddOrder.NoNeedPrep", orderNo);
+ return action;
+ }
- /// <summary>
- /// 鏆傚瓨鐨勬暟鎹簱鎿嶄綔鎻愪氦鍒版暟鎹簱
- /// </summary>
- /// <param name="appendToSave">闄勫姞鐨勪繚瀛樺唴瀹�</param>
- public void SaveCommitListToDB(Action appendToSave = null)
- {
- //澧炲姞闄勫姞鐨勪繚瀛樺唴瀹�
- if (!appendToSave.IsNullOrEmpty())
- {
- if (!DBCommitList.ContainsKey("AppendSaveAction"))
+ PrepOrder.SourceOrders = PrepOrder.SourceOrders ?? new();
+ PrepOrder.SourceDetails = PrepOrder.SourceDetails ?? new();
+ PrepOrder.Details = PrepOrder.Details ?? new();
+ PrepOrder.Batchs = PrepOrder.Batchs ?? new();
+ PrepOrder.SnList = PrepOrder.SnList ?? new();
+ var srcOrder = new BIZ_WMS_PREP_SRC()
{
- DBCommitList.Add("AppendSaveAction", new List<Action>());
- }
- var appendList = DBCommitList["AppendSaveAction"];
- appendList.Add(appendToSave);
- }
-
- //濡傛灉涓嶉渶瑕佷复鏃跺瓨鍌ㄦ暟鎹簱鎻愪氦鎿嶄綔锛屽垯鎶婃彁浜ゆ搷浣滃垪琛ㄦ彁浜ゅ埌鏁版嵁搴�
- if (!NeedTemporaryStoreDBCommitAction)
- {
- //鎭㈠涓存椂瀛樺偍鏍囪涓篺alse
- NeedTemporaryStoreDBCommitAction = false;
-
- var dbTran = GetCommitDB().UseTran(() =>
+ AUTH_ORG = OrgCode,
+ ORDER_NO = PrepOrder.ORDER_NO,
+ SOURCE_CODE = bizType.GetSourceCode(),
+ SOURCE_ORDER = orderNo,
+ ADD_TIME = DateTime.Now,
+ };
+ PrepOrder.SourceOrders.Add(srcOrder);
+ foreach (var dtl in dtls)
{
- //鍦ㄥ悓涓�涓簨鍔′腑淇濆瓨鎵�鏈夊伐姝ョ殑鏁版嵁
- foreach (var wipSn in DBCommitList.Keys.Where(q => q != "AppendSaveAction"))
+ dtl.AUTH_ORG = OrgCode;
+ var pdtl = PrepOrder.Details.Where(q => q.ITEM_CODE == dtl.ITEM_CODE).FirstOrDefault();
+ if (pdtl.IsNullOrEmpty())
{
- foreach (var action in DBCommitList[wipSn])
+ pdtl = new ()
{
- action.Invoke();
- }
+ AUTH_ORG = OrgCode,
+ ORDER_NO = PrepOrder.ORDER_NO,
+ ORDER_LINE = (PrepOrder.Details.Max(q => q.LINE_CODE.ToInt32()) + 1).ToString(),
+ ITEM_CODE = dtl.ITEM_CODE,
+ SUBITEM_CODE = dtl.SUBITEM_CODE,
+ UNIT = dtl.UNIT,
+ PLAN_LOSS_QTY = dtl.PLAN_LOSS_QTY,
+ PLAN_LOSS_RATE = dtl.PLAN_LOSS_RATE,
+ IS_CALC_LOSS = dtl.IS_CALC_LOSS,
+ IS_WHOLE = dtl.IS_WHOLE,
+ SOURCE_CODE = dtl.SOURCE_CODE,
+ SOURCE_ORDER = dtl.SOURCE_ORDER,
+ SOURCE_LINE = dtl.SOURCE_LINE,
+ STATUS = BIZ_WMS_PREP_DTL.STATUSs.UnCalc.GetValue(),
+ FTY_CODE = dtl.FTY_CODE,
+ WS_CODE = dtl.WS_CODE,
+ LINE_CODE = dtl.LINE_CODE,
+ POST_CODE = dtl.POST_CODE,
+ OPER_CODE = dtl.OPER_CODE,
+ SEGMENT = dtl.SEGMENT,
+ SMT_NO = dtl.SMT_NO,
+ STATION_NO = dtl.STATION_NO,
+ FEEDER_NO = dtl.FEEDER_NO,
+ FEEDER_TYPE = dtl.FEEDER_TYPE,
+ };
+ PrepOrder.Details.Add(pdtl);
}
- //闄勫姞鐨勪繚瀛樺唴瀹�
- if (DBCommitList.ContainsKey("AppendSaveAction"))
- {
- foreach (var action in DBCommitList["AppendSaveAction"])
- {
- action.Invoke();
- }
- }
+ pdtl.QTY_REQ += dtl.QTY_ACT_REQ;
+ PrepOrder.SourceDetails.Add(dtl);
+ }
+ var srcInfo = PrepOrder.SourceOrders.Select(q => new { q.SOURCE_CODE, q.SOURCE_ORDER }).DistinctBy(q => q.SOURCE_ORDER).OrderBy(q => q.SOURCE_ORDER);
+ PrepOrder.SOURCE_CODE = string.Join(",", srcInfo.Select(q => q.SOURCE_CODE));
+ PrepOrder.SOURCE_ORDER = string.Join(",", srcInfo.Select(q => q.SOURCE_ORDER));
+
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = Biz.Db;
+ var dbTran = db.UseTran(() =>
+ {
+ var o = db.Storageable(PrepOrder, UserCode).WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW }).ToStorage();
+ o.AsInsertable.ExecuteCommand();
+ o.AsUpdateable.IgnoreColumns(q => q.ID).UpdateColumns(q => new { q.SOURCE_CODE, q.SOURCE_ORDER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
+ var so = db.Storageable(PrepOrder.SourceOrders, UserCode).WhereColumns(t => new { t.ORDER_NO, t.SOURCE_ORDER, t.GHOST_ROW }).ToStorage();
+ so.AsInsertable.ExecuteCommand();
+ var sd = db.Storageable(PrepOrder.SourceDetails, UserCode).WhereColumns(t => new { t.ORDER_NO, t.ITEM_CODE, t.GHOST_ROW }).ToStorage();
+ sd.AsInsertable.ExecuteCommand();
+ var d = db.Storageable(PrepOrder.Details, UserCode).WhereColumns(t => new { t.ORDER_NO, t.ITEM_CODE, t.GHOST_ROW }).ToStorage();
+ d.AsInsertable.ExecuteCommand();
+ d.AsUpdateable.IgnoreColumns(q => q.ID).UpdateColumns(q => new { q.QTY_REQ, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
});
if (dbTran.IsSuccess)
{
- //淇濆瓨鎴愬姛鍒欐竻绌烘彁浜ゆ搷浣滃垪琛�
- DBCommitList.Clear();
+ //action.LocaleMsg = Biz.L("澶囨枡浠诲姟[{0}娣诲姞]鍗曟嵁[{1}]鎴愬姛锛屽彲浠ュ紑濮嬪鏂欎笅鏋�");
+ action.LocaleMsg = Biz.L("WMS.Out_BIZ_WMS_PREP.AddOrder.LoadSuccess", PrepOrder?.ORDER_NO, orderNo);
}
else
{
+ Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
//鎶涘嚭寮傚父
throw dbTran.ErrorException;
}
+ return action;
}
- }
-
- /// <summary>
- /// 涓婃灦
- /// </summary>
- /// <param name="inventory">瑕佷笂鏋剁殑搴撳瓨瀵硅薄</param>
- /// <param name="option">鎺堟潈鏌ヨ閫夐」</param>
- /// <param name="targetLocation">瑕佷笂鏋剁殑鍌ㄤ綅浠ｇ爜</param>
- /// <param name="isTransfer">鏄惁绉诲簱鎿嶄綔</param>
- /// <returns></returns>
- public Result PutOn(AuthOption option, string targetLocation)
- {
- var result = new Result(Result.Flags.Success);
- try
- {
- var location = Biz.Db.Queryable<V_WH_UNIT>().Where(q => q.LOCATION_CODE == targetLocation && q.AUTH_ORG == option.CurOrg).IncludesAllFirstLayer().First();
- if (!location.IsNullOrEmpty())
- {
- var isTransfer = CurInvItem.Location.LOCATION_CODE != location.LOCATION_CODE;
- foreach (var item in CurInvItem.Items)
- {
- item.STATUS = WMS_ITEM.STATUSs.InStore.GetValue();
- item.SUPP_LOTNO = CurInvItem.Barcode.LotNo;
- item.FIRST_IN_DATE = item.FIRST_IN_DATE <= DateTime.MinValue ? DateTime.Now : item.FIRST_IN_DATE;
- item.PROD_DATE = item.PROD_DATE <= DateTime.MinValue ? item.FIRST_IN_DATE : item.PROD_DATE;
- item.WH_ID = location.WH_ID;
- item.REGION_ID = location.REGION_ID;
- item.SHELF_ID = location.SHELF_ID;
- item.LOCATION_ID = location.LOCATION_ID;
- CurInvItem.History.Add(new WMS_ITEM_HIS(item, $"鏉＄爜[{CurInvItem.SN}]{(isTransfer ? $"浠庡偍浣峓{CurInvItem?.Location?.LOCATION_CODE}]绉诲簱" : "涓婃灦")}鍒板偍浣峓{location.LOCATION_CODE}]鎴愬姛{(isTransfer ? "" : $"锛屾搷浣滃崟鎹甗{item.TRANS_NO}]")}"));
- }
- foreach (var item in CurInvItem.Packages)
- {
- item.WH_ID = location.WH_ID;
- item.REGION_ID = location.REGION_ID;
- item.SHELF_ID = location.SHELF_ID;
- item.LOCATION_ID = location.LOCATION_ID;
- }
- foreach (var item in CurInvItem.ItemsExt)
- {
- item.AUTH_ORG = option.OrgCode;
- item.SN = CurInvItem.Barcode.SN;
- }
- //鏇存柊鍌ㄥ瓨淇℃伅
- CurInvItem.Warehouse = location.Warehouse;
- CurInvItem.Region = location.Region;
- CurInvItem.Shelf = location.Shelf;
- CurInvItem.Location = location.Location;
-
- //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
- var _Items = CurInvItem.Items.Clone();
- var _Packages = CurInvItem.Packages.Clone();
- var _History = CurInvItem.History.Clone();
- var _ItemsExt = CurInvItem.ItemsExt.Clone();
- AddCommitAction("PutOn", () =>
- {
- //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
- var db = GetCommitDB();
- //鏁版嵁淇濆瓨閫昏緫
- db.Storageable(_Items, UserCode).ExecuteCommand();
- db.Storageable(_Packages, UserCode).ExecuteCommand();
- db.Insertable(_History, UserCode).ExecuteCommand();
- var x = db.Storageable(_ItemsExt, UserCode).ToStorage();
- x.AsInsertable.ExecuteCommand();//涓嶅瓨鍦ㄦ彃鍏�
- x.AsUpdateable.ExecuteCommand();//瀛樺湪鏇存柊
- });
- }
- else
- {
- result.Flag = Result.Flags.Failed;
- result.LocaleMsg = new("WMS.WmsItem.PutOn.LocationNotExists", targetLocation);
- }
- }
- catch (Exception ex)
- {
- result.CatchExceptionWithLog(ex, Biz.L("WMS.WmsItem.PutOn.Exception", CurInvItem.SN, targetLocation));
- }
- return result;
- }
-
- /// <summary>
- /// 涓嬫灦
- /// </summary>
- /// <param name="option">鎺堟潈鏌ヨ閫夐」</param>
- /// <param name="status">涓嬫灦鍚庣姸鎬�</param>
- /// <param name="clearLocation">鏄惁娓呯悊鍌ㄥ尯璐ф灦鍌ㄤ綅淇℃伅</param>
- /// <returns></returns>
- public Result TakeDown(AuthOption option, WMS_ITEM.STATUSs status)
- {
- return TakeDown(CurInvItem.Items.ToDictionary(k => k.SN, v => v.QTY), option, status);
- }
-
- /// <summary>
- /// 涓嬫灦
- /// </summary>
- /// <param name="inventory">瑕佷笅鏋剁殑搴撳瓨瀵硅薄</param>
- /// <param name="qtyList">瑕佷笅鏋剁殑鏈�灏忓寘瑁呮暟閲忓瓧鍏革紝key锛歴n锛寁alue锛歲ty</param>
- /// <param name="option">鎺堟潈鏌ヨ閫夐」</param>
- /// <param name="status">涓嬫灦鍚庣姸鎬�</param>
- /// <param name="clearLocation">鏄惁娓呯悊鍌ㄥ尯璐ф灦鍌ㄤ綅淇℃伅</param>
- /// <returns></returns>
- public Result TakeDown(Dictionary<string, double> qtyList, AuthOption option, WMS_ITEM.STATUSs status)
- {
- var result = new Result(Result.Flags.Success);
- try
- {
- //濡傛灉瑕佷笅鏋剁殑鏁伴噺瀛楀吀涓虹┖鍒欒涓烘槸鍏ㄩ儴涓嬫灦
- qtyList = qtyList.IsNullOrEmpty(CurInvItem.Items.ToDictionary(k => k.SN, v => v.QTY));
-
- foreach (var item in CurInvItem.Items)
- {
- if (qtyList.ContainsKey(item.SN) && qtyList[item.SN] > 0)
- {
- var downQty = qtyList[item.SN];
- if (item.QTY > downQty)
- {
- item.QTY -= downQty;
- var pkg = CurInvItem.Packages.First(q => q.SN == item.SN);
- pkg.QTY = item.QTY;
- }
- else
- {
- item.STATUS = status.GetValue();
- var pkg = CurInvItem.Packages.First(q => q.SN == item.SN);
- pkg.PARENT_SN = null;
- pkg.Parent = null;
- //濡傛灉涓嬫灦鏁伴噺绛変簬搴撳瓨鏁伴噺鍒欐竻鐞嗗偍鍖鸿揣鏋跺偍浣嶄俊鎭紝鍚﹀垯淇濈暀浠撳簱淇℃伅
- //item.WH_ID = null;
- item.REGION_ID = null;
- item.SHELF_ID = null;
- item.LOCATION_ID = null;
- //pkg.WH_ID = null;
- pkg.REGION_ID = null;
- pkg.SHELF_ID = null;
- pkg.LOCATION_ID = null;
- }
- CurInvItem.History.Add(new WMS_ITEM_HIS(item, $"鏉＄爜[{CurInvItem.SN}]浠庡偍浣峓{CurInvItem?.Location?.LOCATION_CODE}]涓嬫灦鏁伴噺[{downQty}]鎴愬姛锛岀姸鎬乕{item.STATUS.GetEnumDesc<WMS_ITEM.STATUSs>()}]锛屾搷浣滃崟鎹甗{item.TRANS_NO}]"));
- }
- }
- CurInvItem.Packages = WMS_ITEM_PKG.UpdateQty(CurInvItem.Packages);
-
- //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
- var _Items = CurInvItem.Items.Clone();
- var _Packages = CurInvItem.Packages.Clone();
- var _History = CurInvItem.History.Clone();
- AddCommitAction("TakeDown", () =>
- {
- //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
- var db = GetCommitDB();
- //鏁版嵁淇濆瓨閫昏緫
- db.Updateable(_Items, UserCode).ExecuteCommand();
- db.Insertable(_History, UserCode).ExecuteCommand();
- db.Updateable(_Packages, UserCode).ExecuteCommand();
- });
- }
- catch (Exception ex)
- {
- result.CatchExceptionWithLog(ex, Biz.L("WMS.WmsItem.TakeDown.Exception", CurInvItem.SN, CurInvItem?.Location?.LOCATION_CODE));
- }
- return result;
}
#endregion Functions
-
- public override bool Close(bool needSaveHistoryLog = false)
- {
- //needSaveHistoryLog = true;
- //淇濆瓨鎿嶄綔鏃ュ織
-
- this.IsFinished = true;
- return IsFinished ? base.Close(needSaveHistoryLog) : IsFinished;
- }
}
}
--
Gitblit v1.9.3