From e05f0fb09b78e6de1dd4ad808fdbe1e044ebbbdd Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 28 三月 2025 11:46:33 +0800
Subject: [PATCH] 添加生成收货单功能及相关接口
---
Tiger.Business.MES/Transaction/LoadingMaterial.cs | 33 ++++++++-------------------------
1 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/LoadingMaterial.cs b/Tiger.Business.MES/Transaction/LoadingMaterial.cs
index 136ee7a..a39c686 100644
--- a/Tiger.Business.MES/Transaction/LoadingMaterial.cs
+++ b/Tiger.Business.MES/Transaction/LoadingMaterial.cs
@@ -34,7 +34,7 @@
public string UserCode { get; set; }
public long UserId { get; set; }
public string OrgCode { get; set; }
- public string CurrSmtCode { get; set; }
+ public string CurSmtCode { get; set; }
public string CurrSlotNo { get; set; }
/// <summary>
/// 姝ラ绫诲瀷
@@ -206,10 +206,10 @@
{
if (Biz.Db.Queryable<SMT_WO_TABLE>().Where(x => x.WORK_ORDER == input.moCode && x.LINE_CODE == input.lineCode && x.PROD_CODE == input.prodCode && x.SMT_CODE == input.Code).Any())
{
- CurrSmtCode = input.Code;
+ CurSmtCode = input.Code;
action.IsSuccessed = true;
action.LocaleMsg = Biz.L($"鏈哄櫒缂栫爜楠岃瘉閫氳繃锛�");
- loadingReturn.SmtCode = CurrSmtCode;
+ loadingReturn.SmtCode = CurSmtCode;
loadingReturn.Step = (int)Step_Types.SmtCode;
loadingReturn.Status = (int)Statuss.SmtCodeOK;
}
@@ -238,16 +238,16 @@
SmtLoadingReturn loadingReturn = new();
try
{
- if (Biz.Db.Queryable<SMT_WO_TABLE>().Where(x => x.WORK_ORDER == input.moCode && x.LINE_CODE == input.lineCode && x.PROD_CODE == input.prodCode && x.SMT_CODE == CurrSmtCode && x.SLOT_NO == input.Code).Any())
+ if (Biz.Db.Queryable<SMT_WO_TABLE>().Where(x => x.WORK_ORDER == input.moCode && x.LINE_CODE == input.lineCode && x.PROD_CODE == input.prodCode && x.SMT_CODE == CurSmtCode && x.SLOT_NO == input.Code).Any())
{
CurrSlotNo = input.Code;
action.IsSuccessed = true;
action.LocaleMsg = Biz.L($"妲戒綅楠岃瘉閫氳繃锛�");
- loadingReturn.SmtCode = CurrSmtCode;
+ loadingReturn.SmtCode = CurSmtCode;
loadingReturn.SlotNo = CurrSlotNo;
loadingReturn.Step = (int)Step_Types.SlotNo;
loadingReturn.Status = (int)Statuss.SlotNoOK;
- loadingReturn.LoadingCount = Biz.Db.Queryable<SMT_LOADING>().Where(x=> x.WORK_ORDER == input.moCode && x.LINE_CODE == input.lineCode && x.PROD_CODE == input.prodCode && x.SMT_CODE == CurrSmtCode && x.SLOT_NO == input.Code).Count();
+ loadingReturn.LoadingCount = Biz.Db.Queryable<SMT_LOADING>().Where(x=> x.WORK_ORDER == input.moCode && x.LINE_CODE == input.lineCode && x.PROD_CODE == input.prodCode && x.SMT_CODE == CurSmtCode && x.SLOT_NO == input.Code).Count();
}
else
{
@@ -302,11 +302,11 @@
return action;
}
action.LocaleMsg = Biz.L($"姝eeder楠岃瘉閫氳繃锛�");
- loadingReturn.SmtCode = CurrSmtCode;
+ loadingReturn.SmtCode = CurSmtCode;
loadingReturn.SlotNo = CurrSlotNo;
loadingReturn.Step = (int)Step_Types.Feeder;
loadingReturn.Status = (int)Statuss.FeederOK;
- loadingReturn.LoadingCount = Biz.Db.Queryable<SMT_LOADING>().Where(x => x.WORK_ORDER == input.moCode && x.LINE_CODE == input.lineCode && x.PROD_CODE == input.prodCode && x.SMT_CODE == CurrSmtCode && x.FEEDER_CODE == input.Code && x.SLOT_NO == CurrSlotNo).Count();
+ loadingReturn.LoadingCount = Biz.Db.Queryable<SMT_LOADING>().Where(x => x.WORK_ORDER == input.moCode && x.LINE_CODE == input.lineCode && x.PROD_CODE == input.prodCode && x.SMT_CODE == CurSmtCode && x.FEEDER_CODE == input.Code && x.SLOT_NO == CurrSlotNo).Count();
}
catch (Exception ex)
{
@@ -332,23 +332,6 @@
action.CatchExceptionWithLog(ex, $"鎵弿鏂欑洏鐮佸紓甯�");
}
return action;
- }
-
- /// <summary>
- /// 娣诲姞涓�涓狝piAction鐨勫巻鍙茶褰�
- /// </summary>
- /// <param name="action"></param>
- public override void AddHistory<T>(Microsoft.AspNetCore.Http.HttpRequest request, ApiAction<T> action)
- {
- var his = action.History();
- //his.TraceDic.Add("CurReqType", CurReqType);
- //his.TraceDic.Add("CurInv", CurInv);
- //his.TraceDic.Add("req", req);
- //his.TraceDic.Add("toMes", toMes);
- //his.TraceDic.Add("CurPoolList", CurPoolList);
- //his.TraceDic.Add("isComplete", his_isComplete);
- //ActionHistoryList.Add($"{request.HttpContext.TraceIdentifier} at {action.Timestamp:yyyy/MM/dd HH:mm:ss.fff}: {request.Path}", his);
- LastActionTime = DateTime.Now;
}
#endregion Functions
--
Gitblit v1.9.3