From f4a748766f25fd7f00b3c082a26c88d5d66d336e Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 25 五月 2024 18:01:35 +0800
Subject: [PATCH] 上料事务
---
Tiger.Business/MES/Transaction/LoadingMaterial.cs | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/Tiger.Business/MES/Transaction/LoadingMaterial.cs b/Tiger.Business/MES/Transaction/LoadingMaterial.cs
index 1eeda4b..5a41898 100644
--- a/Tiger.Business/MES/Transaction/LoadingMaterial.cs
+++ b/Tiger.Business/MES/Transaction/LoadingMaterial.cs
@@ -195,7 +195,7 @@
}
/// <summary>
- /// 鎵弿鏈哄櫒缂栫爜鎿嶄綔
+ /// 01鎵弿鏈哄櫒缂栫爜鎿嶄綔
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -228,7 +228,7 @@
}
/// <summary>
- /// 鎵弿妲戒綅鎿嶄綔
+ /// 02鎵弿妲戒綅鎿嶄綔
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -264,13 +264,14 @@
}
/// <summary>
- /// 鎵弿椋炶揪鎿嶄綔
+ /// 03鎵弿椋炶揪鎿嶄綔
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
private ApiAction<SmtLoadingReturn> ExecuteFeeder(SmtLoadingInput input)
{
var action = new ApiAction<SmtLoadingReturn>();
+ SmtLoadingReturn loadingReturn = new();
try
{
var _feeder = Biz.Db.Queryable<SMT_FEEDER>().Where(x => x.FEEDER_CODE == input.Code).First();
@@ -284,15 +285,28 @@
if (_feeder.FEEDER_TYPE != input.feederType)
{
action.IsSuccessed = false;
- action.LocaleMsg = Biz.L($"姝ら杈綶{input.Code}]Feeder绫诲瀷涓嶄竴鑷达紒瑕佹眰鐨勭被鍨嬶細[{_feeder.FEEDER_TYPE}]锛涘綋鍓岶eeder鐨勭被鍨嬶細[{input.feederType}]");
+ action.LocaleMsg = Biz.L($"姝eeder[{input.Code}]绫诲瀷涓嶄竴鑷达紒瑕佹眰鐨勭被鍨嬶細[{_feeder.FEEDER_TYPE}]锛涘綋鍓岶eeder鐨勭被鍨嬶細[{input.feederType}]");
return action;
}
if (_feeder.USED_COUNT >= _feeder.MAX_COUNT)
{
action.IsSuccessed = false;
- action.LocaleMsg = Biz.L($"姝ら杈綶{input.Code}]宸茶揪鏈�澶т娇鐢ㄦ鏁帮紝璇蜂繚鍏诲悗鍐嶄娇鐢紒");
+ action.LocaleMsg = Biz.L($"姝eeder[{input.Code}]宸茶揪鏈�澶т娇鐢ㄦ鏁帮紝璇蜂繚鍏诲悗鍐嶄娇鐢紒");
return action;
}
+ var _loading = Biz.Db.Queryable<SMT_LOADING>().Where(x => x.FEEDER_CODE == input.Code).First();
+ if (_loading!=null)
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = Biz.L($"姝eeder[{input.Code}]宸茶鍗犵敤锛佺嚎鍒細[{_loading.LINE_CODE}]锛屽伐鍗曪細[{_loading.WORK_ORDER}]锛屾満鍣細[{_loading.SMT_CODE}]锛屾Ы浣嶏細[{_loading.SLOT_NO}]");
+ return action;
+ }
+ action.LocaleMsg = Biz.L($"姝eeder楠岃瘉閫氳繃锛�");
+ loadingReturn.SmtCode = CurrSmtCode;
+ 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();
}
catch (Exception ex)
{
@@ -302,7 +316,7 @@
}
/// <summary>
- /// 鎵弿鐗╂枡鏉＄爜鎿嶄綔
+ /// 04鎵弿鐗╂枡鏉＄爜鎿嶄綔
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
--
Gitblit v1.9.3