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/MaterialManagerDAL.cs | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/VueWebApi/DLL/DAL/MaterialManagerDAL.cs b/VueWebApi/DLL/DAL/MaterialManagerDAL.cs
index 61c8a7c..5a707d8 100644
--- a/VueWebApi/DLL/DAL/MaterialManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/MaterialManagerDAL.cs
@@ -28,22 +28,22 @@
{
if (warehousecode != "" && warehousecode != null)
{
- search += "and code like '%'+@warehousecode+'%' ";
+ search += "and A.code like '%'+@warehousecode+'%' ";
dynamicParams.Add("@warehousecode", warehousecode);
}
if (warehousename != "" && warehousename != null)
{
- search += "and name like '%'+@warehousename+'%' ";
+ search += "and A.name like '%'+@warehousename+'%' ";
dynamicParams.Add("@warehousename", warehousename);
}
if (description != "" && description != null)
{
- search += "and description like '%'+@description+'%' ";
+ search += "and A.description like '%'+@description+'%' ";
dynamicParams.Add("@description", description);
}
if (createuser != "" && createuser != null)
{
- search += "and lm_user like '%'+@createuser+'%' ";
+ search += "and T.username like '%'+@createuser+'%' ";
dynamicParams.Add("@createuser", createuser);
}
if (search == "")
@@ -52,8 +52,9 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select id,code,name,description,lm_user,lm_date from T_Sec_Stck
- where is_delete<>'1' " + search;
+ var sql = @"select A.id,A.code,A.name,A.description,T.username as lm_user,A.lm_date from T_Sec_Stck A
+ left join TUser T on A.lm_user=T.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -203,7 +204,7 @@
try
{
//鑾峰彇璁惧绫诲瀷鏁版嵁
- sql = @"select code,name from T_Sec_Stck where is_delete<>'1'";
+ sql = @"select erp_id, code,name from T_Sec_Stck where is_delete<>'1'";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -244,7 +245,7 @@
}
if (createuser != "" && createuser != null)
{
- search += "and A.lm_user like '%'+@createuser+'%' ";
+ search += "and U.username like '%'+@createuser+'%' ";
dynamicParams.Add("@createuser", createuser);
}
if (stockcode != "" && stockcode != null)
@@ -258,9 +259,10 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.id,A.code,A.name,A.description,A.stock_code,B.name as stock_name,A.lm_user,A.lm_date
+ var sql = @"select A.id,A.code,A.name,A.description,A.stock_code,B.name as stock_name,U.username as lm_user,A.lm_date
from T_Sec_Loca A
left join T_Sec_Stck B on A.stock_code=B.code
+ left join TUser U on A.lm_user=U.usercode
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
--
Gitblit v1.9.3