From 770c681572301c938d7b9adcc60d9aad9d1dd604 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 19 九月 2023 17:37:03 +0800
Subject: [PATCH] 1.新增基本资料功能接口(erp车间/部门、erp仓库、erp用户信息) 2.报工接口添加字段入库条码 3.增加末道工序报工后提交入库接口(对接erp) 4.增加生成系统条码接口(自定义)
---
VueWebApi/DLL/DAL/LoginDAL.cs | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/VueWebApi/DLL/DAL/LoginDAL.cs b/VueWebApi/DLL/DAL/LoginDAL.cs
index eec617d..234f067 100644
--- a/VueWebApi/DLL/DAL/LoginDAL.cs
+++ b/VueWebApi/DLL/DAL/LoginDAL.cs
@@ -1,6 +1,7 @@
锘縰sing Dapper;
using System;
using System.Collections.Generic;
+using System.Configuration;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
@@ -19,6 +20,8 @@
public static List<SqlParameter> listStr = new List<SqlParameter>(); //瀹氫箟鍏ㄥ眬鍙傛暟闆嗗悎
public static SqlParameter[] parameters; //瀹氫箟鍏ㄥ眬SqlParameter鍙傛暟鏁扮粍
public static string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
+ //鑾峰彇浼佷笟閰嶇疆Enterprise
+ private static readonly string Enterprise = ConfigurationManager.AppSettings["Enterprise"];
#region [鐧诲綍鏌ヨ]
public static DataTable LoginSearch(string username, string password)
@@ -163,7 +166,7 @@
}
#endregion
-
+
#region[淇敼瀵嗙爜]
public static ToMessage UpdateUserPassword(string usercode, string username, string password, string newpassword)
@@ -239,7 +242,7 @@
cont = DapperHelper.SQL(sql, dynamicParams);
if (cont > 0)
{
- redis.Remove("LoginUserID" + usertype + userid, 0); //鍒犻櫎redis
+ redis.Remove(Enterprise+"LoginUserID" + usertype + userid, 0); //鍒犻櫎redis
mes.code = "200";
mes.count = 0;
mes.Message = "鐧诲嚭鎴愬姛!";
@@ -313,29 +316,20 @@
try
{
sql = @"select B.eqp_code,E.name as eqp_name,B.wkshp_code,T.org_name as wkshp_name,
- A.tpye as typecode,D.name as typename,B.start_user,B.start_date
+ A.type as typecode,D.name as typename,B.start_user,B.start_date
from TAnDnMessagePush A
inner join TAnDon_Task_Info B on A.m_id=B.id
left join TEqpInfo E on B.eqp_code=E.code
left join TOrganization T on B.wkshp_code=T.org_code
- left join TAnDonType D on A.tpye=d.code
+ left join TAnDonType D on A.type=d.code
where A.resp_user=@username and B.status='START' and T.description='W'";
dynamicParams.Add("@username", username);
var data = DapperHelper.selectdata(sql, dynamicParams);
- if (data.Rows.Count > 0)
- {
- mes.code = "200";
- mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
- mes.data = data;
- }
- else
- {
- mes.code = "300";
- mes.count = 0;
- mes.Message = "鏌ヨ澶辫触!";
- mes.data = null;
- }
+
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
}
catch (Exception e)
{
--
Gitblit v1.9.3