From e3e68c2fc02f2ada02254f1167056278cd570f5c Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 21 二月 2023 18:30:47 +0800
Subject: [PATCH] 1.工艺路线删除判断工艺路路线是否被存货绑定 2.新增质检方案列表查询、列表查看编辑带回接口
---
VueWebApi/DLL/DAL/ProductModelDAL.cs | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index e113945..9674f59 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -1339,6 +1339,18 @@
var dynamicParams = new DynamicParameters();
try
{
+ //鍒ゆ柇宸ヨ壓璺矾绾挎槸鍚﹁瀛樿揣缁戝畾
+ sql = @"select * from TMateriel_Route where route_code=@routecode";
+ dynamicParams.Add("@routecode", routecode);
+ var data_0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data_0.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "瀛樿揣妗ｆ宸插叧鑱斿伐鑹鸿矾绾匡紝涓嶅厑璁稿垹闄�!";
+ mes.data = null;
+ return mes;
+ }
//鍒ゆ柇宸ヨ壓璺嚎鏄惁琚伐鍗曞紩鐢�(琚紩鐢ㄥ垯涓嶈兘鍒犻櫎)
sql = @"select * from TK_Wrk_Man where route_code=@routecode";
dynamicParams.Add("@routecode", routecode);
@@ -1688,13 +1700,13 @@
where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1'
) B on T.org_code=B.wksp_code where T.description='W' and is_delete<>'1'
UNION ALL
- select distinct T.btype as wksp_code,(case T.btype when 'WX' then '澶栧崗渚涙柟' end ) as wksp_name,'W' as type,(case when B.btype is null then 'N' else 'Y' end) flag
+ select distinct T.type as wksp_code,(case when T.type='211' then '渚涘簲鍟�' when T.type='228' then '瀹㈡埛/渚涘簲鍟�' end ) as wksp_name,'W' as type,(case when B.type is null then 'N' else 'Y' end) flag
from TCustomer T
left join(
- select distinct A.eqp_code,B.btype from TFlw_Rteqp A
+ select distinct A.eqp_code,B.type from TFlw_Rteqp A
inner join TCustomer B on A.eqp_code=B.code
- where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1'
- ) B on T.btype=B.btype where T.btype='WX' and T.is_delete<>'1'";
+ where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1'
+ ) B on T.type=B.type where T.type in('211','228') and T.is_delete<>'1'"; //226(瀹㈡埛)
dynamicParams.Add("@stepcode", stepcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
for (int i = 0; i < data.Rows.Count; i++)
@@ -1705,7 +1717,7 @@
rout.type = data.Rows[i]["TYPE"].ToString();
rout.flag = data.Rows[i]["FLAG"].ToString();
rout.children = new List<StepEqpCn>();
- if (rout.code == "WX") //澶栧崗渚涙柟
+ if (rout.code == "211"|| rout.code == "228") //澶栧崗渚涙柟
{
//鏍规嵁澶栧崗渚涙柟鏍囪瘑缂栫爜鏌ユ壘澶栧崗渚涙柟淇℃伅(鍖呭惈宸插叧鑱旀爣璇�)
sql = @"select A.code,A.name,'W' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
@@ -1713,8 +1725,9 @@
left join(
select distinct A.eqp_code from TFlw_Rteqp A
inner join TCustomer B on A.eqp_code=B.code
- where B.btype=@wxcode and A.is_delete<>'1' and B.is_delete<>'1'
- ) B on A.code=B.eqp_code where A.btype=@wxcode and A.is_delete<>'1'";
+ where A.step_code=@stepcode and B.type=@wxcode and A.is_delete<>'1' and B.is_delete<>'1'
+ ) B on A.code=B.eqp_code where A.type=@wxcode and A.is_delete<>'1'";
+ dynamicParams.Add("@stepcode", stepcode);
dynamicParams.Add("@wxcode", rout.code);
var data0 = DapperHelper.selectdata(sql, dynamicParams);
for (int k = 0; k < data0.Rows.Count; k++)
--
Gitblit v1.9.3