From beca28ecb3a730ffb33c21e0c55c729774725faf Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 25 四月 2025 16:51:28 +0800
Subject: [PATCH] 优化备料单发料逻辑
---
Tiger.Business.WMS/Transaction/Yada/Out_BIZ_WMS_PREP.cs | 65 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/Yada/Out_BIZ_WMS_PREP.cs b/Tiger.Business.WMS/Transaction/Yada/Out_BIZ_WMS_PREP.cs
index ab6b7ef..9abb932 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Out_BIZ_WMS_PREP.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Out_BIZ_WMS_PREP.cs
@@ -14,6 +14,7 @@
using Tiger.Model.Sharetronic.Shelf;
using MailKit.Search;
using Tiger.Business.WMS.Extensions;
+using static Tiger.Model.BIZ_WMS_PREP_BTH;
namespace Tiger.Business.WMS.Transaction
{
@@ -171,8 +172,8 @@
var action = new ApiAction<ScanOutput>(new ScanOutput());
try
{
- var inputDtl = input?.Data?.JsonToObject<BIZ_WMS_PREP_DTL>();
- var prepDtl = MainDB.Queryable<BIZ_WMS_PREP_DTL>().Where(q => q.ID == inputDtl.ID).First();
+ var option = CurPREP.Option = new BaseInput<SuggestOption>(input).Data;
+ var prepDtl = MainDB.Queryable<BIZ_WMS_PREP_DTL>().Where(q => q.ID == option.LineID).First();
if (prepDtl.IsNullOrEmpty())
{
action.IsSuccessed = false;
@@ -202,10 +203,10 @@
}
//濡傛灉鏄濂楀彂鏂欙紝鍒欏彧鎺ㄨ崘褰撳墠鐗╂枡琛岀殑涓�鐩樼墿鏂�
- if (CurPREP.Order.CurBatch.DLVY_MODE == BIZ_WMS_PREP_BTH.DLVY_MODEs.First.GetValue())
+ if (option.DlvyMode == WMS_ITEM_POOL.DLVY_MODEs.First)
{
//鎺ㄨ崘鐗╂枡
- Result<List<SuggestItem>> result = Suggest(CurPrepDtl.ORDER_NO, CurPrepDtl.ITEM_CODE, null, inputDtl.WH_ID, inputDtl.REGION_ID, inputDtl.SHELF_ID, input.AuthOption, 1);
+ Result<List<SuggestItem>> result = Suggest(CurPrepDtl.ORDER_NO, CurPrepDtl.ITEM_CODE, option, input.AuthOption, 1);
action.LocaleMsg = result.LocaleMsg;
if (result.IsException)
{
@@ -232,11 +233,11 @@
}
//濡傛灉鏄甯稿彂鏂欙紝鍒欐寜瀹為檯闇�姹傛暟閲忔帹鑽愬綋鍓嶇墿鏂欒鐨勬墍鏈夌墿鏂�
- if (CurPREP.Order.CurBatch.DLVY_MODE == BIZ_WMS_PREP_BTH.DLVY_MODEs.Supply.GetValue())
+ if (option.DlvyMode == WMS_ITEM_POOL.DLVY_MODEs.Supply)
{
//鎺ㄨ崘鐗╂枡
var actQty = CurPrepDtl.QTY_PREP > CurPREP.BizType.GetActReqQty(CurPrepDtl) ? 0 : (CurPREP.BizType.GetActReqQty(CurPrepDtl) - CurPrepDtl.QTY_PREP);
- Result<List<SuggestItem>> result = Suggest(CurPrepDtl.ORDER_NO, CurPrepDtl.ITEM_CODE, null, inputDtl.WH_ID, inputDtl.REGION_ID, inputDtl.SHELF_ID, input.AuthOption, actQty);
+ Result<List<SuggestItem>> result = Suggest(CurPrepDtl.ORDER_NO, CurPrepDtl.ITEM_CODE, option, input.AuthOption, actQty);
action.LocaleMsg = result.LocaleMsg;
if (result.IsException)
{
@@ -290,10 +291,6 @@
{
var action = new ApiAction<BIZ_WMS_PREP_DTL>();
var prepDtl = MainDB.Queryable<BIZ_WMS_PREP_DTL>().Where(q => q.ID == CurPrepDtl.ID).First();
- prepDtl.ERP_WH = CurPrepDtl.ERP_WH;
- prepDtl.WH_ID = CurPrepDtl.WH_ID;
- prepDtl.REGION_ID = CurPrepDtl.REGION_ID;
- prepDtl.SHELF_ID = CurPrepDtl.SHELF_ID;
prepDtl.Suggests = Suggests;
CurPrepDtl = prepDtl;
CurPREP.Order.Details.RemoveAll(q => q.ID == CurPrepDtl.ID);
@@ -415,6 +412,14 @@
action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemIsLock", inv.CurPkg.SN);
return SetOutPutMqttMsg(action, input.Locale);
}
+ //楠岃瘉鏉＄爜鏄惁琚叾浠栫敤鎴峰拰鍗曟嵁閿佸畾
+ if (inv.Items.Any(q => q.IS_LOCKED == "Y"))
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鏉＄爜[{0}]宸茶閿佸畾锛岃閲嶆柊鎵弿");
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemIsLock", inv.CurPkg.SN);
+ return SetOutPutMqttMsg(action, input.Locale);
+ }
//鍌ㄤ綅楠岃瘉
if (inv.Location.IsNullOrEmpty())
{
@@ -432,13 +437,22 @@
return SetOutPutMqttMsg(action, input.Locale);
}
//鍒ゆ柇鏄惁鍦ㄥ鏂欎腑鐨勭墿鏂�
- if (!CurPREP.Order.Details.Any(q => q.ITEM_CODE == inv.ItemInfo.ITEM_CODE))
+ if (inv.ItemInfo.ITEM_CODE != CurPrepDtl.ITEM_CODE)
{
action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L($"褰撳墠澶囨枡浠诲姟[{0}]涓嶅寘鍚潯鐮乕{1}]鐨勭墿鏂欑紪鐮乕{2}]锛岃鏀惧洖鍘熷偍浣�");
- action.LocaleMsg = Biz.L("WMS.Out_BIZ_WMS_PREP.ScanItem.NoNeedItemCode", inv.ItemInfo.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
+ //action.LocaleMsg = Biz.L($"鏉＄爜[{0}]涓嶆槸褰撳墠閫変腑鐨勭墿鏂欒[{1}]锛岃鏀惧洖鍘熷偍浣嶆垨鑰呴噸鏂伴�夋嫨涓嬫灦鐗╂枡琛�");
+ action.LocaleMsg = Biz.L("WMS.Out_BIZ_WMS_PREP.ScanItem.NoNeedItemCode", inv.CurPkg.SN, CurPrepDtl.ITEM_CODE);
return action;
}
+ //鍒ゆ柇鏄惁鍦ㄥ鏂欎腑鐨勭墿鏂�
+ //if (!CurPREP.Order.Details.Any(q => q.ITEM_CODE == inv.ItemInfo.ITEM_CODE))
+ //{
+ // action.IsSuccessed = false;
+ // //action.LocaleMsg = Biz.L($"褰撳墠澶囨枡浠诲姟[{0}]涓嶅寘鍚潯鐮乕{1}]鐨勭墿鏂欑紪鐮乕{2}]锛岃鏀惧洖鍘熷偍浣�");
+ // action.LocaleMsg = Biz.L("WMS.Out_BIZ_WMS_PREP.ScanItem.NoNeedItemCode", inv.ItemInfo.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
+ // return action;
+ //}
+
//ProcessingOrderDetail = input.SN;
//if (WMSContext.TransactionDic.Where(q => !string.IsNullOrWhiteSpace(q.Value.ProcessingSn)).Any(q => q.Value.ProcessingSn == ProcessingSn && q.Value.TransID != this.TransID))
//{
@@ -450,7 +464,6 @@
CurSn = CurInvItem.Items.Select(q => new BIZ_WMS_PREP_SN() {
ORDER_NO = CurPREP.Order.ORDER_NO,
ORDER_LINE = CurPrepDtl.ORDER_LINE,
- ORDER_BATCH = CurPREP.Order.CurBatch.BATCH.ToString(),
SN = q.SN,
ITEM_CODE = q.ITEM_CODE,
UNIT = q.UNIT,
@@ -458,22 +471,21 @@
QTY_DLVY = q.QTY,
STATUS = q.STATUS,
LOTNO = q.LOTNO,
+ WH_ID = CurInvItem.Warehouse.ID,
WH_CODE = CurInvItem.Warehouse.WH_CODE,
+ REGION_ID = CurInvItem.Region.ID,
REGION_CODE = CurInvItem.Region.REGION_CODE,
+ SHELF_ID = CurInvItem.Shelf.ID,
SHELF_CODE = CurInvItem.Shelf.SHELF_CODE,
+ LOCATION_ID = CurInvItem.Location.ID,
LOCATION_CODE = CurInvItem.Location.LOCATION_CODE,
- FTY_CODE = CurPREP.Order.CurBatch.FTY_CODE,
- WS_CODE = CurPREP.Order.CurBatch.WS_CODE,
- LINE_CODE = CurPREP.Order.CurBatch.LINE_CODE,
- POST_CODE = CurPREP.Order.CurBatch.POST_CODE,
- OPER_CODE = CurPREP.Order.CurBatch.OPER_CODE,
- SEGMENT = CurPREP.Order.CurBatch.SEGMENT,
SMT_NO = CurPrepDtl.SMT_NO,
STATION_NO = CurPrepDtl.STATION_NO,
FEEDER_NO = CurPrepDtl.FEEDER_NO,
FEEDER_TYPE = CurPrepDtl.FEEDER_TYPE,
- IS_FIRST = CurPREP.Order.CurBatch.DLVY_MODE == BIZ_WMS_PREP_BTH.DLVY_MODEs.First.GetValue() ? "Y" : "N",
+ IS_FIRST = CurPREP.Option.DlvyMode == WMS_ITEM_POOL.DLVY_MODEs.First ? "Y" : "N",
NEED_CUTTING = "N",
+ TRACE_ID = TransID,
}).ToList();
@@ -604,14 +616,11 @@
}
CurPrepDtl.QTY_PREP += CurSn.Sum(q => q.QTY_DLVY);
CurPREP.Order.STATUS = BIZ_WMS_PREP.STATUSs.Picking.GetValue();
- CurPREP.Order.CurBatch.STATUS = BIZ_WMS_PREP_BTH.STATUSs.Picking.GetValue();
- CurPREP.Order.CurBatch.PICK_TIME = CurPREP.Order.CurBatch.PICK_TIME < new DateTime(2000, 1, 1) ? DateTime.Now : CurPREP.Order.CurBatch.PICK_TIME;
//鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
var _CurSn = CurSn.Clone();
var _CurPrepDtl = CurPrepDtl.Clone();
var _CurPREPOrder = CurPREP.Order.Clone();
- var _CurPREPCurBatch = CurPREP.Order.CurBatch.Clone();
AddCommitAction("UpdatePrep", () =>
{
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
@@ -621,7 +630,6 @@
_CurPrepDtl.QTY_PREP = db.Queryable<BIZ_WMS_PREP_SN>().Where(q => q.ORDER_NO == _CurPrepDtl.ORDER_NO && q.ORDER_LINE == _CurPrepDtl.ORDER_LINE).Sum(q => q.QTY_DLVY);
db.Updateable(_CurPrepDtl, UserCode).UpdateColumns(q => new { q.QTY_PREP, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
db.Updateable(_CurPREPOrder, UserCode).UpdateColumns(q => new { q.STATUS, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
- db.Updateable(_CurPREPCurBatch, UserCode).UpdateColumns(q => new { q.STATUS, q.PICK_TIME, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
});
//鐏伅
@@ -773,13 +781,14 @@
}
/// <summary>
- /// 璋冪敤鍙戞枡鍗曟嵁鐨凟RP鎺ュ彛
+ /// 鍒涘缓鍙戞枡鎵规浠ュ畬鎴愭湰娆″彂鏂欙紝璋冪敤鍙戞枡鍗曟嵁鐨凟RP鎺ュ彛
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<ApiAction> CommitToERP(BaseInput input)
+ public async Task<ApiAction> GenerateDlvyBatch(BaseInput input)
{
- var action = await CurPREP.Order.BIZ_TYPE.GetEnum<BIZ_WMS_PREP.BIZ_TYPEs>() .CommitToERP(this, input);
+ var range = input.Data.ToInt32().GetEnum<BATCH_RANGEs>();
+ var action = await CurPREP.Order.BIZ_TYPE.GetEnum<BIZ_WMS_PREP.BIZ_TYPEs>() .GenerateDlvyBatch(this, range);
return action;
}
--
Gitblit v1.9.3