From a32d6d34818393555876d4a6c4671e67ecdaf76e Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 16 十月 2024 20:43:31 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/Transaction/Position.cs | 81 ++++++++++++++++++++++++++++------------
1 files changed, 56 insertions(+), 25 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 5a149c2..0cd9d6a 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -117,7 +117,7 @@
{
action.IsSuccessed = false;
//action.LocaleMsg = new($"宸ュ崟[{0}]鐘舵�乕{1}]涓嶈兘鐢熶骇");
- action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.StatusException", input.OrderNo, wo.STATUS.GetEnum<BIZ_MES_WO.STATUSs>().GetName());
+ action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.StatusException", input.OrderNo, wo.STATUS.GetEnumDesc<BIZ_MES_WO.STATUSs>());
return action;
}
var batch = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().ByAuth(input.AuthOption)
@@ -135,7 +135,7 @@
{
action.IsSuccessed = false;
//action.LocaleMsg = new($"宸ュ崟[{0}]鎵规[1]鐘舵�乕{2}]涓嶈兘鐢熶骇");
- action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.BatchStatusException", input.OrderNo, batch.BATCH_NO, batch.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName());
+ action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.BatchStatusException", input.OrderNo, batch.BATCH_NO, batch.STATUS.GetEnumDesc<BIZ_MES_WO_BATCH.STATUSs>());
return action;
}
var wb = new WorkBatch(input.OrderNo).Init(CurLine.LINE_CODE);
@@ -410,24 +410,24 @@
//淇濆瓨宸ユ鐨勬暟鎹簱鎻愪氦鎿嶄綔鍒版彁浜ゆ搷浣滃垪琛�
if (!Steps.IsNullOrEmpty())
{
- var commitList = new List<Action>();
- foreach (var step in Steps.OrderBy(q => q.Sequence))
- {
- commitList.Add(step.DBSubmitAction);
- }
+ var commitList = new List<Action>();
+ foreach (var step in Steps.OrderBy(q => q.Sequence))
+ {
+ commitList.Add(step.DBSubmitAction);
+ }
//璁板綍宸ュ簭鑰楁椂
var ids = CurWipSNHiss.Select(q => q.ID).ToList().Clone();
commitList.Add(() =>
- {
- EndAt = DateTime.Now;
- GetCommitDB().Updateable<MES_WIP_HIS>().SetColumns(q => q.ELAPSED_TIME == ElapsedTime.TotalMilliseconds.ToInt64()).Where(q => ids.Contains(q.ID)).ExecuteCommand();
- });
+ {
+ EndAt = DateTime.Now;
+ GetCommitDB().Updateable<MES_WIP_HIS>().SetColumns(q => q.ELAPSED_TIME == ElapsedTime.TotalMilliseconds.ToInt64()).Where(q => ids.Contains(q.ID)).ExecuteCommand();
+ });
//澧炲姞闄勫姞鐨勪繚瀛樺唴瀹�
if (!appendToSave.IsNullOrEmpty())
{
commitList.Add(appendToSave);
}
- DBCommitList.Add(CurSN, commitList);
+ DBCommitList.Add(CurSN, commitList);
}
else
{
@@ -553,12 +553,14 @@
return CurSN;
case "GetBAS_ITEM":
return WorkBatch.Product.CUST_PROD_CODE;
+ case "GetItemName":
+ return WorkBatch.Product.ITEM_NAME;
case "GetCustomer":
return WorkBatch.Batch.Customer.ToJson();
case "GetBoxQR":
return action is PackingAction ? GetBoxCode(lvars, action as PackingAction) : "";
case "GetCardQR":
- return action is PackingAction ? GetCardCode(lvars, action as PackingAction) : "";
+ return action is PackingAction ? GetCardOrBoxQR(GetCardCode(lvars), lvars, action as PackingAction) : "";
case "GetCardSN":
List<string> minPkgList = new List<string>();
var _pkaction = action is PackingAction ? action as PackingAction : null;
@@ -570,15 +572,15 @@
case "GetDescription":
return WorkBatch.Product.ITEM_DESC;
case "GetFengZ":
- return WorkBatch.Product.ExtInfo.Packaging;
+ return WorkBatch.Product.ExtInfo.Packaging;
case "GetPAndO":
return WorkBatch.WO.SALES_CONTRACT;
case "GetLTD":
- return WorkBatch.Batch.Customer.SHORT_NAME;
+ return WorkBatch.Batch.Customer.CUST_NAME_CN;
case "GetHWDate":
List<string> list = new List<string>();
var _action = action is PackingAction ? action as PackingAction : null;
- if (_action!=null)
+ if (_action != null)
{
list = GetMinPkgList(_action);
}
@@ -593,16 +595,44 @@
return $"{qtylist.Count}PCS";
case "GetModel":
return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Model);
- case "GetInput":
+ case "GetInput":
return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Input);
- case "GetOutput":
+ case "GetOutput":
return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.OutPut);
- case "GetPower":
+ case "GetPower":
return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Power);
- case "GetAccuracy":
+ case "GetAccuracy":
return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Accuracy);
case "GetVarByWo":
return GetLabelVarWo(lv, "");
+ case "GetLOTNO":
+ string _lotnos = "";
+ var _orderAction = action is PackingAction ? action as PackingAction : null;
+ if (_orderAction != null)
+ {
+ var snList = _orderAction.GetMinPackageList(_orderAction.CurPkg.Item).Select(q => q.FLOW_SN).ToList();
+ if (!snList.Any())
+ {
+ snList.Add(_orderAction.CurPkg.CustSN.FLOW_SN);
+ }
+ _lotnos = string.Join(",", Biz.Db.Queryable<MES_CUST_SN>()
+ .Where((q) => snList.Contains(q.FLOW_SN))
+ .Select((q) => q.WORK_ORDER).Distinct().ToList());
+ return _lotnos;
+ }
+ return "";
+ case "GetNOTES":
+ return WorkBatch.Product.ExtInfo?.Remark;
+ case "GetXH":
+ return GetCardCode(lvars);
+ case "GetCardNo":
+ return "";
+ case "GetCardTotal":
+ return "";
+ case "GetModelSpec": //Model+绌烘牸+SPEC,
+ return $"{WorkBatch.Product.ExtInfo?.Model} {WorkBatch.Product.SPEC}";
+ case "GetDATE":
+ return $"{DateTime.Now.ToString("yyyy/MM/dd")}";
default:
return "";
}
@@ -675,7 +705,8 @@
/// </summary>
/// <param name="action"></param>
/// <returns></returns>
- private List<string> GetMinPkgList(PackingAction action) {
+ private List<string> GetMinPkgList(PackingAction action)
+ {
List<string> list = new List<string>();
if (action.CurPkg.Item.PKG_LEVEL == 1)
{
@@ -705,10 +736,10 @@
/// <param name="lvars"></param>
/// <param name="action"></param>
/// <returns></returns>
- private string GetCardCode(List<BAS_LABEL_VAR> lvars, PackingAction action)
+ private string GetCardCode(List<BAS_LABEL_VAR> lvars)
{
- var cardCode = Biz.CodeRule["CartonNo"]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "" ;
- return GetCardOrBoxQR(cardCode, lvars, action);
+ var cardCode = Biz.CodeRule["CartonNo"]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
+ return cardCode;
}
/// <summary>
@@ -724,7 +755,7 @@
var wo = WorkBatch.Batch.ORDER_NO;
var snList = string.Join("\r\n", minPkgList);
if (snList.IsNullOrEmpty()) { snList = $"{CurSN}"; }
- var itemCode = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == CurWipSNs.First().FLOW_SN).First()?.ITEM_CODE;
+ var itemCode = action.CurPkg.CustSN?.ITEM_CODE;
var weight = action.CurPkg.WeightInfo.Weight;
var unit = action.CurPkg.WeightInfo.Unit.ToUpper();
var model = WorkBatch.Product.ExtInfo.Model;
--
Gitblit v1.9.3