From 7b6a3fab34e4867f011246248ae66b4d75a6eb72 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 01 六月 2023 20:49:58 +0800
Subject: [PATCH] 1.生产开包工末道工序传入入库条码 2.App工序检验提交接口修改 3.基本资料增加ERP接口：车间部门、仓库查询、用户信息 4.PC端报工、收料、工序检验提交接口增加入库条码字段 5.系统设置新增：条码规则生成(固定条码)接口 6.DapperHelper增加方法 7.增加App图标图片
---
VueWebApi/DLL/DAL/ProductModelDAL.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 8bea687..724f0d6 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -1433,6 +1433,7 @@
sql = @"select stepcode,stepname from TStep where is_delete<>'1' and enable='Y'";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
+ mes.count = data.Rows.Count;
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
@@ -1698,7 +1699,7 @@
left join(
select distinct A.eqp_code,B.wksp_code from TFlw_Rteqp A
inner join TEqpInfo B on A.eqp_code=B.code
- where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1'
+ where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1' and B.enable='Y'
) B on T.org_code=B.wksp_code where T.description='W' and is_delete<>'1'
UNION ALL
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
@@ -1750,7 +1751,7 @@
left join(
select distinct A.eqp_code from TFlw_Rteqp A
inner join TEqpInfo B on A.eqp_code=B.code
- where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1'
+ where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1' and B.enable='Y'
) B on A.code=B.eqp_code where A.wksp_code=@wkspcode and A.is_delete<>'1'";
dynamicParams.Add("@stepcode", stepcode);
dynamicParams.Add("@wkspcode", data.Rows[i]["WKSP_CODE"].ToString());
--
Gitblit v1.9.3