From 9f49831b4fc9d883acaec0601dc0d5b3bb25bf4f Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 11 十月 2024 19:30:48 +0800
Subject: [PATCH] 包装数量（出货数量）包装工序验证
---
Tiger.Business.MES/Transaction/Position.cs | 199 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 172 insertions(+), 27 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 06c902b..1277758 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -12,6 +12,8 @@
using static Tiger.Business.Biz;
using Tiger.Model.Entitys.MES.Position;
using System.Globalization;
+using Tiger.Business.MES.WorkAction;
+using System.Collections;
namespace Tiger.Business.MES.Transaction
{
@@ -95,12 +97,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))
{
var wo = await Biz.Db.Queryable<BIZ_MES_WO>().ByAuth(input.AuthOption).Where(q => q.ORDER_NO == input.OrderNo).FirstAsync();
//楠岃瘉鏄庣粏鏄惁姝ｇ‘
@@ -114,11 +116,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($"宸ュ崟[{0}]鐘舵�乕{1}]涓嶈兘鐢熶骇");
action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.StatusException", input.OrderNo, wo.STATUS.GetEnum<BIZ_MES_WO.STATUSs>().GetName());
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;
@@ -129,14 +134,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.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName());
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());
@@ -394,15 +399,45 @@
/// <summary>
/// 淇濆瓨宸ユ鐨勬暟鎹簱鎻愪氦鎿嶄綔鍒版暟鎹簱
/// </summary>
- protected void SaveStepsCommitActionToDB()
+ /// <param name="appendToSave">鎻愪氦瀹屽伐姝ユ暟鎹悗锛屾彁浜ら檮鍔犵殑淇濆瓨鍐呭</param>
+ public void SaveStepsCommitActionToDB(Action appendToSave = null)
{
//淇濆瓨宸ユ鐨勬暟鎹簱鎻愪氦鎿嶄綔鍒版彁浜ゆ搷浣滃垪琛�
- var commitList = new List<Action>();
- foreach (var step in Steps.OrderBy(q => q.Sequence))
+ if (!Steps.IsNullOrEmpty())
{
- commitList.Add(step.DBSubmitAction);
+ 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();
+ });
+ //澧炲姞闄勫姞鐨勪繚瀛樺唴瀹�
+ if (!appendToSave.IsNullOrEmpty())
+ {
+ commitList.Add(appendToSave);
+ }
+ DBCommitList.Add(CurSN, commitList);
}
- DBCommitList.Add(CurSN, commitList);
+ else
+ {
+ //澧炲姞闄勫姞鐨勪繚瀛樺唴瀹�
+ if (!appendToSave.IsNullOrEmpty())
+ {
+ if (!DBCommitList.ContainsKey("AppendSaveAction"))
+ {
+ DBCommitList.Add("AppendSaveAction", new List<Action>());
+ }
+ var commitList = DBCommitList["AppendSaveAction"];
+ commitList.Add(appendToSave);
+ }
+ }
+
//濡傛灉涓嶉渶瑕佷复鏃跺瓨鍌ㄦ暟鎹簱鎻愪氦鎿嶄綔锛屽垯鎶婃彁浜ゆ搷浣滃垪琛ㄦ彁浜ゅ埌鏁版嵁搴�
if (!NeedTemporaryStoreDBCommitAction)
{
@@ -412,17 +447,21 @@
var dbTran = GetCommitDB().UseTran(() =>
{
//鍦ㄥ悓涓�涓簨鍔′腑淇濆瓨鎵�鏈夊伐姝ョ殑鏁版嵁
- foreach (var wipSn in DBCommitList.Keys)
+ foreach (var wipSn in DBCommitList.Keys.Where(q => q != "AppendSaveAction"))
{
foreach (var action in DBCommitList[wipSn])
{
action.Invoke();
}
}
- //璁板綍宸ュ簭鑰楁椂
- 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();
+ //闄勫姞鐨勪繚瀛樺唴瀹�
+ if (DBCommitList.ContainsKey("AppendSaveAction"))
+ {
+ foreach (var action in DBCommitList["AppendSaveAction"])
+ {
+ action.Invoke();
+ }
+ }
});
if (dbTran.IsSuccess)
{
@@ -463,7 +502,7 @@
/// <returns></returns>
public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action)
{
- foreach (var item in label.Variables)
+ foreach (var item in label.Variables.OrderBy(q => q.VAR_TYPE == BAS_LABEL_VAR.VAR_TYPEs.BarcodeGenerate.GetValue() ? 0 : 1))
{
switch (item.VAR_TYPE.GetEnum<BAS_LABEL_VAR.VAR_TYPEs>())
{
@@ -471,7 +510,7 @@
item.Value = item.VAR_VALUE;
break;
case BAS_LABEL_VAR.VAR_TYPEs.ProcessVariable:
- item.Value = GetPrintProcessValue(labelPVs, item, action);
+ item.Value = GetPrintProcessValue(labelPVs, item, label.Variables, action);
break;
case BAS_LABEL_VAR.VAR_TYPEs.DateVariable:
item.Value = DateTime.Now.ToString(item.VAR_VALUE);
@@ -494,7 +533,7 @@
/// <param name="labelPVs">杩囩▼鍙橀噺鍒楄〃</param>
/// <param name="lv">鏍囩妯℃澘鍙橀噺</param>
/// <returns></returns>
- public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, IWorkAction action)
+ public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction action)
{
var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
if (!pv.IsNullOrEmpty())
@@ -508,9 +547,45 @@
case "GetSN":
return CurSN;
case "GetBAS_ITEM":
- return WorkBatch.Product.ToJson();
+ return WorkBatch.Product.CUST_PROD_CODE;
case "GetCustomer":
- return WorkBatch.Batch.ToJson();
+ 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) : "";
+ case "GetCardSN":
+ List<string> minPkgList = new List<string>();
+ var _pkaction = action is PackingAction ? action as PackingAction : null;
+ if (_pkaction != null)
+ {
+ minPkgList = GetMinPkgList(_pkaction);
+ }
+ return string.Join("\r\n", minPkgList);
+ case "GetDescription":
+ return WorkBatch.Product.ITEM_DESC;
+ case "GetFengZ":
+ return WorkBatch.Product.ExtInfo.Packaging;
+ case "GetPAndO":
+ return WorkBatch.WO.SALES_CONTRACT;
+ case "GetLTD":
+ return WorkBatch.Batch.Customer.SHORT_NAME;
+ case "GetHWDate":
+ List<string> list = new List<string>();
+ var _action = action is PackingAction ? action as PackingAction : null;
+ if (_action!=null)
+ {
+ list = GetMinPkgList(_action);
+ }
+ return GetHuaWeiWeek(WorkBatch.Batch.ORDER_NO, list);
+ case "GetQty":
+ List<string> qtylist = new List<string>();
+ var _qtyAction = action is PackingAction ? action as PackingAction : null;
+ if (_qtyAction != null)
+ {
+ qtylist = GetMinPkgList(_qtyAction);
+ }
+ return $"{qtylist.Count}PCS";
case "GetModel":
return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Model);
case "GetInput":
@@ -556,7 +631,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:
@@ -591,6 +666,75 @@
}
/// <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>
+ /// 鑾峰彇鐧界洅鏉＄爜
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ private string GetBoxCode(List<BAS_LABEL_VAR> lvars, PackingAction action)
+ {
+ var boxCode = Biz.CodeRule["WhiteBoxNo"]?.Generate("W", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
+ return GetCardOrBoxQR(boxCode, lvars, action);
+ }
+
+ /// <summary>
+ /// 鑾峰彇绠辨潯鐮�
+ /// </summary>
+ /// <param name="lvars"></param>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ private string GetCardCode(List<BAS_LABEL_VAR> lvars, PackingAction action)
+ {
+ var cardCode = Biz.CodeRule["CartonNo"]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "" ;
+ return GetCardOrBoxQR(cardCode, lvars, action);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐧界洅鎴栬�呯浜岀淮鐮�
+ /// </summary>
+ /// <param name="code"></param>
+ /// <param name="lvars"></param>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ private string GetCardOrBoxQR(string code, List<BAS_LABEL_VAR> lvars, PackingAction action)
+ {
+ var minPkgList = action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN);
+ var wo = WorkBatch.Batch.ORDER_NO;
+ var snList = string.Join("\r\n", minPkgList);
+ if (snList.IsNullOrEmpty()) { snList = $"{CurSN}"; }
+ var _sn = minPkgList.FirstOrDefault() ?? CurSN;
+ var itemCode = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == _sn || q.CUST_SN == _sn).First()?.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;
+
+ return $"{code}|{itemCode}|{wo}|\r\n{snList}|{weight}{unit}|鍨嬪彿:{model},杈撳叆:{Input},鏄剧ず:{Display},杈撳嚭:{OutPut},鐢垫簮:{Power},绮惧害:{Accuracy},澶囨敞:{Remark}";
+ }
+
+ /// <summary>
/// 鏍规嵁鍖呰宸ュ崟鍜屾潯鐮佽幏鍙栧崕涓鸿姹傜殑鐢熶骇鍛ㄦ湡
/// </summary>
/// <param name="snList"></param>
@@ -606,12 +750,12 @@
var item = snOrder.FirstOrDefault(q => q.FLOW_SN == sn || q.CUST_SN == sn);
if (!item.IsNullOrEmpty())
{
- var date = item.ACT_START_TIME < new DateTime(2000, 1, 1) ? item.PLAN_START_TIME : item.ACT_START_TIME; ;
+ var date = item.ACT_START_TIME < new DateTime(2000, 1, 1) ? item.PLAN_START_TIME : item.ACT_START_TIME;
var firstDay = new DateTime(date.Year, 1, 1);
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
{
@@ -627,9 +771,9 @@
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
@@ -643,5 +787,6 @@
this.IsFinished = true;
return IsFinished ? base.Close(needSaveHistoryLog) : IsFinished;
}
+
}//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3