From e902e8a37f677b8e6615286f552e97db1e738bb2 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 12 七月 2021 13:47:16 +0800
Subject: [PATCH] nothing
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 6
WebAPI/Controllers/MoveStockBillController.cs | 8 -
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 11 ++
WebAPI/Web.config | 4
WebAPI/Controllers/WebAPIController.cs | 70 ++++++++++++++
WebAPI/WebAPI.csproj | 1
WebAPI/Controllers/CellWidthController.cs | 174 ++++++++++++++++++++++++++++++++++
WebAPI/Controllers/Sc_MouldController.cs | 4
8 files changed, 262 insertions(+), 16 deletions(-)
diff --git a/WebAPI/Controllers/CellWidthController.cs b/WebAPI/Controllers/CellWidthController.cs
new file mode 100644
index 0000000..d91b945
--- /dev/null
+++ b/WebAPI/Controllers/CellWidthController.cs
@@ -0,0 +1,174 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class CellWidthController : ApiController
+ {
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+
+
+ #region 鍗曟嵁淇濆瓨鍒楀
+ /// <summary>
+ /// 鍗曟嵁鍒楄〃淇濆瓨
+ /// </summary>
+ /// <returns></returns>
+ [Route("tb_CellWidth/GetMouldScrapInHouseCellWidth")]
+ [HttpPost]
+ public object GetMouldScrapInHouseCellWidth()
+ {
+
+ string Item = HttpContext.Current.Request["myMap"];
+ string Name = HttpContext.Current.Request["Name"];
+ string[] sArray = Item.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg3 = sArray[0].ToString();
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ string[] myMap = msg3.Split(','); //瀛楃涓茶浆鏁扮粍
+
+ SaveGridView(myMap, Name, HttpContext.Current.Server.MapPath("~/bin"));
+
+ try
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = null;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ex.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region 鍒楀淇濆瓨
+ public object SaveGridView(string[] _value, string KeyItem, string AppPath)
+ {
+ string text = "";
+ try
+ {
+ for (int i = 0; i <= _value.Length - 1; i++)
+ {
+ bool flag = i == 0;
+ if (flag)
+ {
+ text = _value[i].ToString();
+ }
+ else
+ {
+ text = text + "," + _value[i].ToString();
+ }
+ }
+ ClsIni clsIni = new ClsIni();
+ bool flag2 = ClsIni.WriteIni("GridSave", KeyItem, text, AppPath + "\\grdWidth.wyini");
+ if (flag2)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎿嶄綔鎴愬姛锛�";
+ objJsonResult.data = null;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔澶辫触锛�";
+ objJsonResult.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message;
+ objJsonResult.data = null;
+ }
+
+ return objJsonResult;
+ }
+ #endregion
+
+ #region 鍒楀鏌ヨ
+
+ [Route("tb_CellWidth/GetMouldScrapInHouseCellWidthList")]
+ [HttpGet]
+ public object GetGridView(int colNum, string Name)
+ {
+ try
+ {
+
+ char c = Convert.ToChar(",");
+ string text = ClsIni.ReadIni("GridSave", Name, HttpContext.Current.Server.MapPath("~/bin") + "\\grdWidth.wyini");
+ bool flag = text != "娌℃湁鎵惧埌锛�";
+ if (flag)
+ {
+ string[] array = text.Split(new char[]
+ {
+ c
+ });
+ bool flag2 = colNum > array.Length;
+ int num;
+ if (flag2)
+ {
+ num = array.Length;
+ }
+ else
+ {
+ num = colNum;
+ }
+ for (int i = 0; i < num; i++)
+ {
+ bool flag3 = ClsPub.isInt(array[i]) > 500;
+ if (flag3)
+ {
+ array[i] = ClsPub.isInt(array[i]).ToString();
+ }
+ else
+ {
+ array[i] = ClsPub.isInt(array[i]).ToString();
+ }
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇鍒楀鎴愬姛!";
+ objJsonResult.data = array;
+ }
+ else
+ {
+ objJsonResult.code = "-1";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犺缃�!";
+ objJsonResult.data = null;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璁剧疆鍒楀澶辫触!" + ex.Message;
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+ }
+}
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index eea5b23..4e1c452 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -364,14 +364,6 @@
objJsonResult.data = null;
return objJsonResult;
}
- //else
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "2-搴撳瓨涓嶈冻锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
{
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
index 1f9f379..3e9492d 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -610,7 +610,16 @@
public static DataSet Sc_MouldRepairWorkBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList ", "h_v_Sc_MouldRepairWorkBillList");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList " + sWhere, "h_v_Sc_MouldRepairWorkBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldRepairWorkBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList");
+ }
}
#endregion
diff --git a/WebAPI/Controllers/Sc_MouldController.cs b/WebAPI/Controllers/Sc_MouldController.cs
index 658e8b7..1178caf 100644
--- a/WebAPI/Controllers/Sc_MouldController.cs
+++ b/WebAPI/Controllers/Sc_MouldController.cs
@@ -73,8 +73,8 @@
BillNew.omodel.HEmpID = 0;
BillNew.omodel.HManagerID = mainList[0].HManagerID;
BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
- BillNew.omodel.HKeeperID = mainList[0].HSecManagerID;
- BillNew.omodel.HDeptID = mainList[0].HSecManagerID;
+ BillNew.omodel.HKeeperID = mainList[0].HKeeperID;
+ BillNew.omodel.HDeptID = mainList[0].HDeptID;
BillNew.omodel.HExplanation = mainList[0].HExplanation;
BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index c1d9ee8..10e9ecf 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1884,6 +1884,76 @@
}
}
+ /// <summary>
+ /// 鑾峰彇鎵爜璇︽儏鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetWMSBarCodeDetailsList")]
+ [HttpGet]
+ public object GetWMSBarCodeDetailsList(int HInterID,string HBillType)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ ds = oCN.RunProcReturn("Select * from h_v_KF_PonderationBillMain_Temp_Sum where HInterID=" + HInterID + " and HBillType='" + HBillType + "' Order by HItemID ", "h_v_KF_PonderationBillMain_Temp_Sum");
+ //ds = oCN.RunProcReturn("Select top 10 * from h_v_KF_PonderationBillMain_Temp_Sum Order by HInterID ", "h_v_KF_PonderationBillMain_Temp_Sum");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁ID鍒犻櫎缂撳瓨琛ㄤ腑鎵爜璁板綍
+ /// </summary>
+ /// <param name="sHitemID">缂撳瓨琛↖D</param>
+ /// <returns>object</returns>
+ [Route("Web/DelCacheList")]
+ [HttpGet]
+ public object DelCacheList(long sHitemID)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HitemID = " + sHitemID);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+ }
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index c3712c8..e11d3ee 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -162,10 +162,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>07/05/2021 16:23:19</publishTime>
+ <publishTime>07/05/2021 13:46:25</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>07/05/2021 16:23:19</publishTime>
+ <publishTime>07/05/2021 13:46:25</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -333,7 +333,7 @@
<publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/05/2021 16:23:25</publishTime>
+ <publishTime>07/05/2021 13:46:40</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 4be5306..27ec4b2 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -17,8 +17,8 @@
<appSettings>
<!--鏈嶅姟鍣ㄦ枃浠禝P鍦板潃-->
- <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
- <add key="FileIP" value="http://localhost:8085/"/>
+ <add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>
+ <!--<add key="FileIP" value="http://localhost:8085/"/>-->
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index daced19..8086554 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -343,6 +343,7 @@
<Compile Include="Controllers\BLL\Xt_SystemParameterController.cs" />
<Compile Include="Controllers\BLL\Xt_UserController.cs" />
<Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
+ <Compile Include="Controllers\CellWidthController.cs" />
<Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" />
<Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
--
Gitblit v1.9.1