From f0c7f4ba26a8bcb4e551c50d6d9468edb542c063 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 27 十月 2024 14:07:05 +0800
Subject: [PATCH] 优化手动结束包装支持打印入库标签
---
Tiger.Business.MES/Transaction/Position.cs | 245 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 186 insertions(+), 59 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index ad4824e..415cecb 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -13,6 +13,7 @@
using Tiger.Model.Entitys.MES.Position;
using System.Globalization;
using Tiger.Business.MES.WorkAction;
+using System.Collections;
namespace Tiger.Business.MES.Transaction
{
@@ -61,6 +62,7 @@
public WorkBatch CurBatch { get; set; }
public IWorkBatch WorkBatch => CurBatch;
public List<MES_WIP_DATA> CurWipSNs { get; set; } = new();
+ public List<MES_WIP_DATA> LastWipSNs { get; set; } = new();
public string CurSN => (CurWipSNs.Any() ? (CurWipSNs.First().TRAY_SN.IsNullOrEmpty() ? CurWipSNs.First().SN : CurWipSNs.First().TRAY_SN) : "");
public List<MES_WIP_HIS> CurWipSNHiss { get; set; } = new();
public List<MES_WIP_DFT> CurDefects { get; set; } = new();
@@ -96,12 +98,12 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<ApiAction> SelectOrder(WoInput input)
+ public async Task<ApiAction> SelectOrder(WoInput input, string batchNo = "")
{
var action = new ApiAction();
try
{
- if (!WoContext.ExistsBatch(input.OrderNo, CurLine.LINE_CODE))
+ if (!WoContext.ExistsBatch(input.OrderNo, CurLine.LINE_CODE, batchNo, true))
{
var wo = await Biz.Db.Queryable<BIZ_MES_WO>().ByAuth(input.AuthOption).Where(q => q.ORDER_NO == input.OrderNo).FirstAsync();
//楠岃瘉鏄庣粏鏄惁姝ｇ‘
@@ -115,11 +117,14 @@
if (wo.STATUS != BIZ_MES_WO.STATUSs.Release.GetValue() && wo.STATUS != BIZ_MES_WO.STATUSs.Working.GetValue())
{
action.IsSuccessed = false;
- //action.LocaleMsg = new($"宸ュ崟[{input.OrderNo}]鐘舵�乕{wo.STATUS.GetEnum<BIZ_MES_WO.STATUSs>().GetName()}]涓嶈兘鐢熶骇");
- action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.StatusException", input.OrderNo, wo.STATUS.GetEnum<BIZ_MES_WO.STATUSs>().GetName());
+ //action.LocaleMsg = new($"宸ュ崟[{0}]鐘舵�乕{1}]涓嶈兘鐢熶骇");
+ 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).Where(q => q.ORDER_NO == input.OrderNo && q.ACT_LINE == CurLine.LINE_CODE).FirstAsync();
+ var batch = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().ByAuth(input.AuthOption)
+ .Where(q => q.ORDER_NO == input.OrderNo && q.ACT_LINE == CurLine.LINE_CODE)
+ .WhereIF(!batchNo.IsNullOrEmpty(), q => q.BATCH_NO == batchNo)
+ .OrderBy(q => q.STATUS).FirstAsync();
if (batch.IsNullOrEmpty())
{
action.IsSuccessed = false;
@@ -130,14 +135,14 @@
if (batch.STATUS != BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() && batch.STATUS != BIZ_MES_WO_BATCH.STATUSs.Working.GetValue())
{
action.IsSuccessed = false;
- //action.LocaleMsg = new($"宸ュ崟[{input.OrderNo}]鐘舵�乕{wo.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName()}]涓嶈兘鐢熶骇");
- action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.StatusException", input.OrderNo, batch.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName());
+ //action.LocaleMsg = new($"宸ュ崟[{0}]鎵规[1]鐘舵�乕{2}]涓嶈兘鐢熶骇");
+ 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);
WoContext.WoBatchDic.Add(wb.Batch.BATCH_NO, wb);
}
- CurBatch = WoContext.GetBatch(input.OrderNo, CurLine.LINE_CODE);
+ CurBatch = WoContext.GetBatch(input.OrderNo, CurLine.LINE_CODE, batchNo);
if (!OperInfoDic.ContainsKey(CurBatch.Batch.BATCH_NO))
{
OperInfoDic.Add(CurBatch.Batch.BATCH_NO, new());
@@ -221,7 +226,12 @@
if (CurWipSNs.Any())
{
info.CurNode = CurWipSNs.First().NODE_NAME;
- info.NextNode = string.Join(",", CurBatch.GetNextNodes(CurWipSNs.First()).Select(q => q.NODE_NAME));
+ var nextNodes = CurBatch.GetNextNodes(CurWipSNs.First());
+ info.NextNode = string.Join(",", nextNodes.Select(q => q.NODE_NAME));
+ if (nextNodes.Count == 1 && nextNodes.Single().OPER_CODE == "EndNode")
+ {
+ info.IsReachedEndNode = true;
+ }
}
else
{
@@ -401,24 +411,24 @@
//淇濆瓨宸ユ鐨勬暟鎹簱鎻愪氦鎿嶄綔鍒版彁浜ゆ搷浣滃垪琛�
if (!Steps.IsNullOrEmpty())
{
- var commitList = new List<Action>();
- foreach (var step in Steps.OrderBy(q => q.Sequence))
- {
- commitList.Add(step.DBSubmitAction);
- }
- //璁板綍宸ュ簭鑰楁椂
- commitList.Add(() =>
- {
- EndAt = DateTime.Now;
- var ids = CurWipSNHiss.Select(q => q.ID).ToList();
- GetCommitDB().Updateable<MES_WIP_HIS>().SetColumns(q => q.ELAPSED_TIME == ElapsedTime.TotalMilliseconds.ToInt64()).Where(q => ids.Contains(q.ID)).ExecuteCommand();
- });
+ 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();
+ });
//澧炲姞闄勫姞鐨勪繚瀛樺唴瀹�
if (!appendToSave.IsNullOrEmpty())
{
commitList.Add(appendToSave);
}
- DBCommitList.Add(CurSN, commitList);
+ DBCommitList.Add(CurSN, commitList);
}
else
{
@@ -470,6 +480,9 @@
throw dbTran.ErrorException;
}
}
+ //璁板綍鏈�鍚庢垚鍔熻繃绔欑殑鏉＄爜
+ LastWipSNs.Clear();
+ LastWipSNs.AddRange(CurWipSNs);
}
protected void DoSaveToDB()
@@ -529,7 +542,7 @@
/// <param name="labelPVs">杩囩▼鍙橀噺鍒楄〃</param>
/// <param name="lv">鏍囩妯℃澘鍙橀噺</param>
/// <returns></returns>
- public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction action)
+ public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction)
{
var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
if (!pv.IsNullOrEmpty())
@@ -543,43 +556,91 @@
case "GetSN":
return CurSN;
case "GetBAS_ITEM":
- return WorkBatch.Product.CUST_PROD_CODE;
+ return GetLabelVarWo(lv, WorkBatch.Product.CUST_PROD_CODE);
+ case "GetItemName":
+ return GetLabelVarWo(lv, WorkBatch.Product.ITEM_NAME);
case "GetCustomer":
- return WorkBatch.Batch.Customer.ToJson();
+ return GetLabelVarWo(lv, WorkBatch.Batch.Customer.ToJson());
+ case "GetSalesOrder":
+ return GetLabelVarWo(lv, WorkBatch.WO.SALES_ORDER);
+ case "GetPackNumber":
+ return GetLabelVarWo(lv, WorkBatch.WO.ORDER_NO);
case "GetBoxQR":
- return action is PackingAction ? GetBoxCode(lvars, action as PackingAction) : "";
+ return curAction is PackingAction ? GetBoxCode(lvars, curAction as PackingAction) : "";
case "GetCardQR":
- return action is PackingAction ? GetCardCode(lvars, action as PackingAction) : "";
+ return curAction is PackingAction ? GetCardOrBoxQR(GetCardCode(lvars), lvars, curAction as PackingAction) : "";
+ case "GetCardSN":
+ List<string> minPkgList = new List<string>();
+ var _pkaction = curAction is PackingAction ? curAction as PackingAction : null;
+ if (_pkaction != null)
+ {
+ minPkgList = GetMinPkgList(_pkaction);
+ }
+ return string.Join("\r\n", minPkgList);
case "GetDescription":
- return WorkBatch.Product.ITEM_DESC;
+ return GetLabelVarWo(lv, WorkBatch.Product.ITEM_DESC);
+ case "GetFengZ":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Packaging);
case "GetPAndO":
- return WorkBatch.WO.SALES_CONTRACT;
+ return GetLabelVarWo(lv, WorkBatch.WO.SALES_CONTRACT);
case "GetLTD":
- return WorkBatch.Batch.Customer.SHORT_NAME;
+ return GetLabelVarWo(lv, WorkBatch.WO.Customer?.CUST_NAME_CN);
case "GetHWDate":
List<string> list = new List<string>();
- var _action = action is PackingAction ? action as PackingAction : null;
- if (_action.CurPkg.Item.PKG_LEVEL == 1)
+ var _action = curAction is PackingAction ? curAction as PackingAction : null;
+ if (_action != null)
{
- list.Add(CurSN);
- }
- else
- {
- list = _action != null ? _action.GetMinPackageList(_action.CurPkg.Item).Select(q => q.SN).ToList() : new List<string>();
+ list = GetMinPkgList(_action);
}
return GetHuaWeiWeek(WorkBatch.Batch.ORDER_NO, list);
+ case "GetQty":
+ List<string> qtylist = new List<string>();
+ var _qtyAction = curAction is PackingAction ? curAction as PackingAction : null;
+ if (_qtyAction != null)
+ {
+ qtylist = GetMinPkgList(_qtyAction);
+ }
+ return $"{qtylist.Count}PCS";
case "GetModel":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Model);
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Model);
case "GetInput":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Input);
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Input);
case "GetOutput":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.OutPut);
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.OutPut);
case "GetPower":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Power);
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Power);
case "GetAccuracy":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Accuracy);
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Accuracy);
case "GetVarByWo":
return GetLabelVarWo(lv, "");
+ case "GetLOTNO":
+ string _lotnos = "";
+ var _orderAction = curAction is PackingAction ? curAction 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 GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Remark);
+ case "GetXH":
+ return GetCardCode(lvars);
+ case "GetCardNo":
+ return "";
+ case "GetCardTotal":
+ return "";
+ case "GetModelSpec": //Model+绌烘牸+SPEC,
+ return GetLabelVarWo(lv, $"{WorkBatch.Product.ExtInfo?.Model} {WorkBatch.Product.SPEC}");
+ case "GetDATE":
+ return GetLabelVarWo(lv, $"{DateTime.Now.ToString("yyyy/MM/dd")}");
default:
return "";
}
@@ -613,7 +674,7 @@
switch (pv.VAR_METHOD)
{
case "GetCartonGenerate":
- return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate($"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
+ return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
case "GetHW21SNGenerate":
return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate("SN:", "05").Data.ToString() ?? "";
default:
@@ -642,9 +703,28 @@
}
else
{
- result = value.IsNullOrEmpty() ? (labelVarwos.Count > 0 ? labelVarwos.First().DEFAULT_VALUE : "") : value;
+ result = value.IsNullOrEmpty() ? (labelVarwos.Count > 0 ? labelVarwos.First(q => q.WORK_ORDER.IsNullOrEmpty()).DEFAULT_VALUE : "") : value;
}
return result;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏈�灏忓寘瑁呮潯鐮佸垪琛�
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ private List<string> GetMinPkgList(PackingAction action)
+ {
+ List<string> list = new List<string>();
+ if (action.CurPkg.Item.PKG_LEVEL == 1)
+ {
+ list.Add(CurSN);
+ }
+ else
+ {
+ list = action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN).ToList();
+ }
+ return list;
}
/// <summary>
@@ -664,10 +744,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>
@@ -679,19 +759,20 @@
/// <returns></returns>
private string GetCardOrBoxQR(string code, List<BAS_LABEL_VAR> lvars, PackingAction action)
{
- var itemCode = WorkBatch.Product.CUST_PROD_CODE;
+ var minPkgList = action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN);
var wo = WorkBatch.Batch.ORDER_NO;
- var snList = string.Join("\r\n", action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN));
+ var snList = string.Join("\r\n", minPkgList);
if (snList.IsNullOrEmpty()) { snList = $"{CurSN}"; }
+ 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;
- var Input = WorkBatch.Product.ExtInfo.Input;
- var OutPut = WorkBatch.Product.ExtInfo.OutPut;
- var Power = WorkBatch.Product.ExtInfo.Power;
- var Accuracy = WorkBatch.Product.ExtInfo.Accuracy;
- var Display = WorkBatch.Product.ExtInfo.Display;
- var Remark = WorkBatch.Product.ExtInfo.Remark;
+ var model = WorkBatch.Product.ExtInfo?.Model;
+ var Input = WorkBatch.Product.ExtInfo?.Input;
+ var OutPut = WorkBatch.Product.ExtInfo?.OutPut;
+ var Power = WorkBatch.Product.ExtInfo?.Power;
+ var Accuracy = WorkBatch.Product.ExtInfo?.Accuracy;
+ var Display = WorkBatch.Product.ExtInfo?.Display;
+ var Remark = WorkBatch.Product.ExtInfo?.Remark;
return $"{code}|{itemCode}|{wo}|\r\n{snList}|{weight}{unit}|鍨嬪彿:{model},杈撳叆:{Input},鏄剧ず:{Display},杈撳嚭:{OutPut},鐢垫簮:{Power},绮惧害:{Accuracy},澶囨敞:{Remark}";
}
@@ -717,7 +798,7 @@
int daysOffset = firstDay.DayOfWeek.GetValue() > 3 ? (firstDay.DayOfWeek.GetValue() - 7) : 0;
int year = date.Year + ((date - firstDay).TotalDays + daysOffset < 0 ? -1 : 0);
int week = CultureInfo.CurrentCulture.Calendar.GetWeekOfYear(date, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Sunday);
- dic.Add(sn, $"{year.ToString().Substring(2, 2)}{week:00}");
+ dic.Add(sn, $"{year.ToString("0000").Substring(2, 2)}{week:00}");
}
else
{
@@ -733,12 +814,58 @@
case 1:
return weeks.First();
case 2:
- return string.Join("/", weeks.Select(q => q + $"({dic.Count(d => d.Value == q)})"));
+ return string.Join("銆�", weeks.Select(q => q + $"({dic.Count(d => d.Value == q)}PCS)"));
default:
- return string.Join("/", weeks.Take(2)) + " (+)";
+ return string.Join("銆�", weeks.Take(2)) + " (+)";
}
}
#endregion
+ #region 鏉＄爜瑙勫垯鏂规硶
+ /// <summary>
+ /// 鑾峰彇鏍规嵁鏉＄爜瑙勫垯鐢熸垚鏉＄爜
+ /// </summary>
+ /// <param name="ruleCode"></param>
+ /// <param name="curAction"></param>
+ /// <returns></returns>
+ public string GenerateSN(string ruleCode, IWorkAction curAction)
+ {
+ var rule = Biz.CodeRule[ruleCode ?? ""];
+ if (!rule.IsNullOrEmpty())
+ {
+ switch (rule.RULE_CODE)
+ {
+ case "WhiteBoxNo":
+ return rule.Generate("W", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
+ case "CartonNo":
+ return rule.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
+ default:
+ return rule.Generate().Data.ToString() ?? "";
+ }
+ }
+ return "";
+ }
+ #endregion
+ #region 鍖呰涓撶敤鏂规硶
+ /// <summary>
+ /// 鏍规嵁浼犲叆鐨勫寘瑁呭璞¤繑鍥炴墍鏈夌殑鍖呰瀹炰綋鍒楄〃
+ /// </summary>
+ /// <param name="parent"></param>
+ /// <returns></returns>
+ public List<MES_WIP_PKG> GetPackageList(WipPkgItem parent)
+ {
+ List<MES_WIP_PKG> list = new();
+ if (!parent.Package.IsNullOrEmpty())
+ {
+ list.Add(parent.Package);
+ }
+ foreach (var item in parent.Items)
+ {
+ item.Package.PARENT_SN = parent.Package?.SN;
+ list.AddRange(GetPackageList(item));
+ }
+ return list;
+ }
+ #endregion
#endregion Functions
public override bool Close(bool needSaveHistoryLog = false)
--
Gitblit v1.9.3