From 8083bd8e92584a46a21ee8e71ddcdb834d1c8bab Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 22 七月 2024 15:01:20 +0800
Subject: [PATCH] 工单路由树
---
Tiger.Api/Controllers/MES/MESController.Route.cs | 9 +++++++++
Tiger.Business.MES/Transaction/LoadingMaterial.cs | 14 +++++++-------
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/Tiger.Api/Controllers/MES/MESController.Route.cs b/Tiger.Api/Controllers/MES/MESController.Route.cs
index ce42819..63c004f 100644
--- a/Tiger.Api/Controllers/MES/MESController.Route.cs
+++ b/Tiger.Api/Controllers/MES/MESController.Route.cs
@@ -152,6 +152,15 @@
return Ok(data);
}
+ [HttpGet]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> GetWoPTreeAsync(string wo)
+ {
+ SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { WO = wo });
+ var data = Biz.Db.Ado.UseStoredProcedure().SqlQuery<V_MES_ROUTE_PTREE>("SP_MES_GET_WO_PTREE", pars);//杩斿洖List
+ return Ok(data);
+ }
+
/// <summary>
/// 娣诲姞鐢熶骇宸ヨ壓璺嚎
/// </summary>
diff --git a/Tiger.Business.MES/Transaction/LoadingMaterial.cs b/Tiger.Business.MES/Transaction/LoadingMaterial.cs
index f1ddd6d..a39c686 100644
--- a/Tiger.Business.MES/Transaction/LoadingMaterial.cs
+++ b/Tiger.Business.MES/Transaction/LoadingMaterial.cs
@@ -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)
{
--
Gitblit v1.9.3