From 5cdcde592ae19de697c4bf16dce08838065987e3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 22 八月 2023 16:01:23 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI
---
WebAPI/Controllers/WebAPIController.cs | 91 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 75 insertions(+), 16 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 2281dfe..c4fde65 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -2,16 +2,20 @@
using DBUtility;
using Microsoft.AspNet.SignalR;
using Model;
+using Newtonsoft.Json.Linq;
using SQLHelper;
using System;
using System.Collections.Generic;
using System.Data;
+using System.Data.SqlClient;
using System.Linq;
using System.Net;
using System.Net.Http;
+using System.Web;
using System.Web.Http;
using WebAPI.BLL;
using WebAPI.Models;
+using WebAPI.Utility;
namespace WebAPI.Controllers
{
@@ -183,12 +187,14 @@
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
//LogService.Write("娴嬭瘯1锛�"+ DBUtility.ClsPub.sExeReturnInfo);
string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
- //LogService.Write("娴嬭瘯2锛�" + DBUtility.ClsPub.sExeReturnInfo);
- //LogService.Write(FCusName);
- if (FCusName == "澶忓疂鐢靛櫒")
- ds = oUser.CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
- else
- ds = oUser.CheckCzymc(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
+ LogService.Write(FCusName);
+ LogService.Write("DBUtility.ClsPub.StrToPsd(PassWord.Trim()):" + DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
+ //if (FCusName == "澶忓疂鐢靛櫒")
+ // ds = CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
+ //else
+ // ds = CheckCzymc(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
+
+ ds = CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -217,6 +223,34 @@
return objJsonResult; ;
}
}
+ public DataSet CheckMainID(string MainID, string sPsd)
+ {
+ DataSet DS;
+ try
+ {
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ DS = oCn.RunProcReturn("select * from Gy_Czygl where Czybm='" + MainID + "' and Czmm='" + sPsd + "' ", "Gy_Czygl");
+ if (DS.Tables[0].Rows.Count == 0)
+ return null;
+ else
+ {
+ return DS;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ public DataSet CheckCzymc(string sUser, string sPsd)
+ {
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ SqlParameter[] prams ={oCn.MakeInParam("@Czymc",SqlDbType.VarChar,100,sUser ),
+ oCn.MakeInParam("@Czmm",SqlDbType.VarChar ,100,sPsd ),
+ };
+ return oCn.RunProcReturn("select * from Gy_Czygl where Czymc='" + sUser + "' and Czmm='" + sPsd + "' ", prams, "Gy_Czygl");
+ }
+
/// <summary>
/// 淇敼瀵嗙爜
/// </summary>
@@ -377,13 +411,13 @@
try
{
- oCn.BeginTran();
- oCn.RunProc("Insert into SRM_OpenTmp " +
- " (HNumber,HModel,HName) " +
- " Values('" + HNumber + "','" + HName + "','" + HName + "')", ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- //oCn.RunProc("Update Gy_OpenTmp set HEndflag=0 where HItemID=" + oModel.HParentID, ref ClsPub.sExeReturnInfo);
- oCn.Commit();
+ //oCn.BeginTran();
+ //oCn.RunProc("Insert into SRM_OpenTmp " +
+ // " (HNumber,HModel,HName) " +
+ // " Values('" + HNumber + "','" + HName + "','" + HName + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ ////淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ ////oCn.RunProc("Update Gy_OpenTmp set HEndflag=0 where HItemID=" + oModel.HParentID, ref ClsPub.sExeReturnInfo);
+ //oCn.Commit();
objjson.code = "0";
objjson.count = 1;
objjson.Message = "淇濆瓨鎴愬姛!";
@@ -413,9 +447,9 @@
ClsCNSRM oCn = new ClsCNSRM();
try
{
- oCn.BeginTran();
- oCn.RunProc("Delete from SRM_OpenTmp where HItemID='" + DBUtility.ClsPub.isLong(HItemID) + "'", ref DBUtility.ClsPub.sExeReturnInfo);
- oCn.Commit();
+ //oCn.BeginTran();
+ //oCn.RunProc("Delete from SRM_OpenTmp where HItemID='" + DBUtility.ClsPub.isLong(HItemID) + "'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //oCn.Commit();
objjson.code = "0";
objjson.count = 1;
objjson.Message = "鍒犻櫎鎴愬姛!";
@@ -812,5 +846,30 @@
return objjson; ;
}
#endregion
+ #region[鎵撳嵃idSession]
+ [Route("linteridSession")]
+ [HttpPost]
+ public object linteridSession([FromBody] JObject linterid)
+ {
+ var _linterid = linterid["linterid"].ToString();
+ var _huserName = linterid["HUserName"].ToString();
+ var postMesseege = _linterid + ";" + _huserName;
+ //HttpHelper.PostData("http://localhost:8082/ZYMES/layuiAdmin.std-v1.2.1/src/views/SRM/Api/SRM_Web_PoBarCodeBillApi.ashx", postMesseege);
+ HttpHelper.PostData("http://60.191.21.115:9090/layuiAdmin.std-v1.2.1/src/views/SRM/Api/SRM_Web_PoBarCodeBillApi.ashx", postMesseege);
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ string sql = $"Update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0) + 1 where HItemID in ({_linterid})";
+ oCn.RunProc(sql);
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "";
+ objJsonResult.data = 1;
+ return objJsonResult;
+
+ //HttpContext.Current.Session["linterid"];
+
+ }
+ #endregion
+
+
}
}
--
Gitblit v1.9.1