From 8745fb2b4824979aad955a9835decdb849fe278d Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 03 十一月 2024 22:24:01 +0800
Subject: [PATCH] 更新箱号，获取箱号
---
Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs | 16 ++++
Tiger.IBusiness.MES/BIZ/IMES_WO.cs | 1
Tiger.Model.Net/Entitys/MES/ParameterEntity/BizBasPkgRuleParameter.cs | 8 ++
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 98 ++++++++++++++++++++++++
Tiger.Business.MES/Transaction/Position.cs | 20 ++--
Tiger.IBusiness.MES/BIZ/IBasRule.cs | 1
Tiger.Controllers.MES/Controllers/MESController.BizBaseRule.cs | 21 +++++
Tiger.Business.MES/BIZ/BizBasRule.cs | 20 +++++
8 files changed, 175 insertions(+), 10 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index f95f3e9..a07df9e 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -453,6 +453,97 @@
}
/// <summary>
+ /// 鏇存柊琛屼负涓殑绠卞彿
+ /// </summary>
+ /// <param name="code"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> SavePrintLabelInAct(string code)
+ {
+ var result = new ApiAction();
+ try
+ {
+ var woSn = await Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q=>q.SN == code || q.FLOW_SN == code || q.OUTER_SN == code).FirstAsync();
+ if (woSn == null)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"鏉＄爜涓嶅瓨鍦紒");
+ return result;
+ }
+ //鍙栧緱鍖呰鍒楄〃
+ var pkgList = Biz.Db.Queryable<MES_WIP_PKG>().Where(q => q.PARENT_SN == woSn.OUTER_SN && q.OPER_CODE == "SpecPackingNode").ToList();
+ if (pkgList.Count == 0)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"鏉＄爜涓嶅瓨鍦紒");
+ return result;
+ }
+ List<MES_WIP_ACT> actlist = new List<MES_WIP_ACT>();
+ //瀹㈡埛鏍囩
+ var wipAct = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.CARTON_SN == woSn.OUTER_SN && q.NODE_ID == pkgList[0].NODE_ID && !SqlFunc.IsNullOrEmpty(q.ACT_VALUE_3)).First();
+ if (!wipAct.IsNullOrEmpty())
+ {
+ var label = JsonConvert.DeserializeObject<BAS_LABEL_TEMP>(wipAct.ACT_VALUE_3);
+ var cardNo = label.Variables.Where(q => q.VAR_NAME == "CardQR").FirstOrDefault();
+ if (!woSn.OUTER_SN.IsNullOrEmpty() && !cardNo.IsNullOrEmpty() && !cardNo.Value.StartsWith(woSn.OUTER_SN))
+ {
+ cardNo.Value = $"{woSn.OUTER_SN}{cardNo.Value}";
+ }
+ string ACT_VALUE_3 = JsonConvert.SerializeObject(label);
+ foreach (var pkg in pkgList)
+ {
+ var actSn = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID && q.ACT_VALUE_4 == "Customer").First();
+ if (!actSn.IsNullOrEmpty())
+ {
+ actSn.ACT_VALUE_3 = ACT_VALUE_3;
+ actlist.Add(actSn);
+ }
+ }
+ }
+ //鍏ュ簱鏍囩
+ var wipActInStore = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.SN == woSn.SN && q.NODE_ID == pkgList[0].NODE_ID && !SqlFunc.IsNullOrEmpty(q.ACT_VALUE_3) && q.ACT_VALUE_4 == "InStroe").First();
+ if (!wipActInStore.IsNullOrEmpty())
+ {
+ var label = JsonConvert.DeserializeObject<BAS_LABEL_TEMP>(wipActInStore.ACT_VALUE_3);
+ var cardNo = label.Variables.Where(q => q.VAR_NAME == "CardQR").FirstOrDefault();
+ if (!woSn.OUTER_SN.IsNullOrEmpty() && !cardNo.IsNullOrEmpty() && !cardNo.Value.StartsWith(woSn.OUTER_SN))
+ {
+ cardNo.Value = $"{woSn.OUTER_SN}{cardNo.Value}";
+ }
+ var xh = label.Variables.Where(q => q.VAR_NAME == "XH").FirstOrDefault();
+ if (!woSn.OUTER_SN.IsNullOrEmpty() && !xh.IsNullOrEmpty())
+ {
+ xh.Value = $"{woSn.OUTER_SN}";
+ }
+ string ACT_VALUE_3 = JsonConvert.SerializeObject(label);
+ foreach (var pkg in pkgList)
+ {
+ var actSn = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID && q.ACT_VALUE_4 == "InStroe").First();
+ if (!actSn.IsNullOrEmpty())
+ {
+ actSn.ACT_VALUE_3 = ACT_VALUE_3;
+ actlist.Add(actSn);
+ }
+ }
+ }
+ var db = Biz.Db;
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable(actlist).UpdateColumns(q => new { q.ACT_VALUE_3 }).ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"鏇存柊琛屼负鏃ュ織涓殑绠卞彿寮傚父");
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "鏇存柊琛屼负鏃ュ織涓殑绠卞彿寮傚父");
+ }
+ return result;
+ }
+
+ /// <summary>
/// 鑾峰彇閲嶆墦鏍囩淇℃伅
/// </summary>
/// <param name="input"></param>
@@ -470,6 +561,13 @@
result.LocaleMsg = new($"鏉＄爜涓嶅瓨鍦紒");
return result;
}
+ var woNode = await Biz.Db.Queryable<MES_WO_NODE>().Where(q => q.WORK_ORDER.Equals(woSn.WORK_ORDER) && q.OPER_CODE== "SpecPackingNode").FirstAsync();
+ if (woNode == null)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ヨ壓璺嚎鑺傜偣[SpecPackingNode-瑁呯]涓嶅瓨鍦�");
+ return result;
+ }
string printParam = "";
var labelPrint = await Biz.Db.Queryable<LOG_LABEL_PRINT>()
.WhereIF(input.ReqType == 0, q => q.SN.Equals(woSn.SN) || q.SN.Equals(woSn.FLOW_SN)) //鐧界洅鏍囩
diff --git a/Tiger.Business.MES/BIZ/BizBasRule.cs b/Tiger.Business.MES/BIZ/BizBasRule.cs
index cce51a1..39a2754 100644
--- a/Tiger.Business.MES/BIZ/BizBasRule.cs
+++ b/Tiger.Business.MES/BIZ/BizBasRule.cs
@@ -14,6 +14,7 @@
using Tiger.Model.Entitys.MES.BizMesWoBatch;
using Tiger.Model.Entitys.MES.BizMesWo;
using Tiger.Model.Entitys.MES.BizBasPkgRule;
+using Tiger.Model.Entitys.MES.Position;
namespace Tiger.Business.MES
{
@@ -109,5 +110,24 @@
}
return result;
}
+
+ /// <summary>
+ /// 鑾峰彇绠卞彿
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> GetCardOrBoxCode(GetCodeInput input)
+ {
+ var result = new ApiAction();
+ try
+ {
+ result.Data = Biz.CodeRule[input.Code]?.Generate(input.Prefix, $"{input.BatchNo}-{input.Qty}-").Data.ToString() ?? "";
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "鑾峰彇绠卞彿寮傚父");
+ }
+ return result;
+ }
}
}
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 5b1efd0..ccb961a 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -15,6 +15,7 @@
using Tiger.Business.MES.WorkAction;
using System.Collections;
using Tiger.IBusiness.MES.WorkAction;
+using Dm.parser;
namespace Tiger.Business.MES.Transaction
{
@@ -556,6 +557,8 @@
{
case "GetSN":
return CurSN;
+ case "GetItemCode":
+ return GetLabelVarWo(lv, WorkBatch.Product.ITEM_CODE);
case "GetBAS_ITEM":
return GetLabelVarWo(lv, WorkBatch.Product.CUST_PROD_CODE);
case "GetItemName":
@@ -567,9 +570,9 @@
case "GetPackNumber":
return GetLabelVarWo(lv, WorkBatch.WO.ORDER_NO);
case "GetBoxQR":
- return GetCardOrBoxQR(GetBoxCode(lvars), curAction);
+ return GetCardOrBoxQR(GetBoxCode(), curAction);
case "GetCardQR":
- return GetCardOrBoxQR(GetCardCode(lvars), curAction);
+ return GetCardOrBoxQR("", curAction);
case "GetCardSN":
List<string> minPkgList = new List<string>();
var _pkaction = curAction is PackingAction ? curAction as PackingAction : null;
@@ -602,7 +605,7 @@
}
if (curAction is PrintInStoreLabel)
{
- qtylist = (curAction as PrintInStoreLabel).CurPkg.Item.GetMinPackageList().Select(q=>q.SN).ToList();
+ qtylist = (curAction as PrintInStoreLabel).CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
}
return $"{qtylist.Count}PCS";
case "GetModel":
@@ -634,9 +637,9 @@
}
return "";
case "GetNOTES":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Remark);
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Remark);
case "GetXH":
- return GetCardCode(lvars);
+ return "";
case "GetCardNo":
return "";
case "GetCardTotal":
@@ -734,9 +737,8 @@
/// <summary>
/// 鑾峰彇鐧界洅鏉＄爜
/// </summary>
- /// <param name="action"></param>
/// <returns></returns>
- private string GetBoxCode(List<BAS_LABEL_VAR> lvars)
+ private string GetBoxCode()
{
return Biz.CodeRule["WhiteBoxNo"]?.Generate("W", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
}
@@ -744,10 +746,8 @@
/// <summary>
/// 鑾峰彇绠辨潯鐮�
/// </summary>
- /// <param name="lvars"></param>
- /// <param name="action"></param>
/// <returns></returns>
- private string GetCardCode(List<BAS_LABEL_VAR> lvars)
+ private string GetCardCode()
{
return Biz.CodeRule["CartonNo"]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
}
diff --git a/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs b/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
index c050994..a9f9edf 100644
--- a/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
@@ -161,6 +161,22 @@
return Ok(response);
}
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> SavePrintLabelInAct([FromBody] ApiAction action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IBIZ_MES_WO>().SavePrintLabelInAct(action.Data?.ToString()));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
+
/// <summary>
/// 鑾峰彇閲嶆墦鏍囩淇℃伅
/// </summary>
diff --git a/Tiger.Controllers.MES/Controllers/MESController.BizBaseRule.cs b/Tiger.Controllers.MES/Controllers/MESController.BizBaseRule.cs
index f12b0ea..3f0da8d 100644
--- a/Tiger.Controllers.MES/Controllers/MESController.BizBaseRule.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.BizBaseRule.cs
@@ -53,5 +53,26 @@
}
return Ok(response);
}
+
+ /// <summary>
+ /// 鑾峰彇绠卞彿
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> GetCardOrBoxCode([FromBody] ApiAction<GetCodeInput> action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IBasRule>().GetCardOrBoxCode(action.Data));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
}
}
diff --git a/Tiger.IBusiness.MES/BIZ/IBasRule.cs b/Tiger.IBusiness.MES/BIZ/IBasRule.cs
index bb316ff..9a03a46 100644
--- a/Tiger.IBusiness.MES/BIZ/IBasRule.cs
+++ b/Tiger.IBusiness.MES/BIZ/IBasRule.cs
@@ -14,5 +14,6 @@
{
public Task<ApiAction> SaveBasPkgRule(BizBasPkgRuleInput input);
public Task<ApiAction> SaveBasItemRule(BizBasItemRuleInput input);
+ public Task<ApiAction> GetCardOrBoxCode(GetCodeInput input);
}
}
diff --git a/Tiger.IBusiness.MES/BIZ/IMES_WO.cs b/Tiger.IBusiness.MES/BIZ/IMES_WO.cs
index d0108ce..76fe1df 100644
--- a/Tiger.IBusiness.MES/BIZ/IMES_WO.cs
+++ b/Tiger.IBusiness.MES/BIZ/IMES_WO.cs
@@ -22,5 +22,6 @@
public Task<ApiAction<QueryAble<BAS_LABEL_VAR_WO>>> GetLabelVarByWorkOrder(BizLabelVarWoInput input);
public Task<ApiAction> GetRePrintInfo(RePrintInput input);
public Task<ApiAction> GetShipList(string wo, string orgCode);
+ public Task<ApiAction> SavePrintLabelInAct(string code);
}
}
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizBasPkgRuleParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizBasPkgRuleParameter.cs
index 8ffe653..298e08c 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizBasPkgRuleParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizBasPkgRuleParameter.cs
@@ -18,4 +18,12 @@
public BAS_ITEM Item { get; set; }
public List<BAS_ITEM_CUST> ItemCusts { get; set; }
}
+
+ public class GetCodeInput
+ {
+ public string Code { get; set; }
+ public string Prefix { get; set; }
+ public string BatchNo { get; set; }
+ public string Qty { get; set; }
+ }
}
--
Gitblit v1.9.3