From c7e7901305b9c2182a1faf52eb2bdc0481468e10 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 28 八月 2024 21:23:42 +0800
Subject: [PATCH] 优化条码规则，增加固定值可以设置为不包含；增加流水号取号支持设置取号间隔和跳号规则
---
Tiger.Business.MES/WorkAction/PackingAction.cs | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index b87f18b..7a1566f 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -25,6 +25,7 @@
public MES_WO_ACTION Setting { get; set; }
#endregion
public BAS_PKG_RULE PkgRule { get; set; }
+ public BAS_PKG_PROD PkgProd { get; set; }
public WipPkg CurPkg { get; set; }
public WipPkgItem CurPkgItem { get; set; }
public PackingActionOutput CurCmd { get; set; }
@@ -68,6 +69,8 @@
LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
//鑾峰彇鏄惁鍖呰瀹屽悗闇�瑕佺О閲�
NeedWeighing = Setting.OPTION_2 == "Y";
+ //鑾峰彇鍖呰瑙勫垯鐨勭О閲嶈寖鍥�
+ PkgProd = Biz.Db.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).First();
//濡傛灉宸ュ簭涓婁笅鏂囦腑娌℃湁鍖呰璁板綍鍒欐柊寤轰竴涓紝鏈夊垯鑾峰彇褰撳墠鐨勫寘瑁呰褰�
if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty())
{
@@ -280,6 +283,17 @@
{
if (!pInput.WeightInfo.IsNullOrEmpty() && pInput.WeightInfo.Weight > 0)
{
+ //楠岃瘉閲嶉噺鏁版嵁鏄惁绗﹀悎璁剧疆濂界殑閲嶉噺鑼冨洿
+ if (!PkgProd.IsNullOrEmpty() && (pInput.WeightInfo.Weight < PkgProd.MIN_WEIGHT || PkgProd.MIN_WEIGHT < pInput.WeightInfo.Weight))
+ {
+ action.IsSuccessed = false;
+ action.Data.Data = CurCmd;
+ action.Data.ShortMsg = new("閲嶉噺瓒呴檺", ShortMessage.Types.Failed);
+ //action.LocaleMsg = new($"澶栧寘瑁呴噸閲廩{0}]瓒呭嚭浜у搧[{1}]鍦ㄥ寘瑁呰鍒橻{2}]涓殑棰勮鑼冨洿[{3} - {4}]锛岃澶勭悊鍚庨噸鏂颁笂绉扮О閲�");
+ action.LocaleMsg = new("MES.WorkAction.PackingAction.PackageOverWeight", pInput.WeightInfo.Weight + pInput.WeightInfo.Unit.IsNullOrEmpty("", " " + pInput.WeightInfo.Unit), CurPosition.WorkBatch.WO.ITEM_CODE, PkgRule.RULE_NAME, PkgProd.MIN_WEIGHT + PkgProd.MIN_UNIT.IsNullOrEmpty("", " " + PkgProd.MIN_UNIT), PkgProd.MAX_WEIGHT + PkgProd.MAX_UNIT.IsNullOrEmpty("", " " + PkgProd.MAX_UNIT));
+ return action;
+ }
+
CurCmd = null;
PrintTimes = 0;
CurPkg.WeightInfo.Weight = pInput.WeightInfo.Weight;
@@ -333,8 +347,8 @@
action.IsSuccessed = false;
action.Data.Data = CurCmd;
action.Data.ShortMsg = new("绉伴噸澶辫触", ShortMessage.Types.Failed);
- //action.LocaleMsg = new($"鍖呰[{CurPkgItem.Package.SN}]绉伴噸鏁版嵁寮傚父锛岃閲嶆柊涓婄О绉伴噸");
- action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseWeighingAgain", CurPkgItem.Package.SN);
+ //action.LocaleMsg = new($"澶栧寘瑁呯О閲嶆暟鎹紓甯革紝璇烽噸鏂颁笂绉扮О閲�");
+ action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseWeighingAgain");
return action;
}
}
--
Gitblit v1.9.3