From abe6630fe280b96b246170adcd6a2f666c77c520 Mon Sep 17 00:00:00 2001
From: ouyangqing <ouyangqing@DESKTOP-B85SG1D>
Date: 星期四, 21 一月 2021 13:17:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/~ouyangqing/YqnApi
---
WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user | 6
WebAPI/WebAPI.csproj.user | 2
WebAPI/Controllers/LMESController.cs | 1024 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
WebAPI/WebAPI.csproj | 1
4 files changed, 1,029 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
new file mode 100644
index 0000000..55f51ae
--- /dev/null
+++ b/WebAPI/Controllers/LMESController.cs
@@ -0,0 +1,1024 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+namespace WebAPI.Controllers
+{
+ public class LMESController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ /// <summary>
+ /// 杩斿洖杩涚珯鎵弿鍒楄〃|宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_StationInBillList_Json")]
+ [HttpGet]
+ public object MES_StationInBillList_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_MES_StationInBillList", "h_v_MES_StationInBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_MES_StationInBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_MES_StationInBillList");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖宸ュ簭娴佽浆鍗＄淮鎶ゅ垪琛ㄤ富琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_Sc_ProcessExchangeBillQuery_Json")]
+ [HttpGet]
+ public object MES_Sc_ProcessExchangeBillList_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery", "h_v_Sc_ProcessExchangeBillQuery");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBillQuery");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖宸ュ簭娴佽浆鍗＄淮鎶ゅ垪琛ㄤ粠琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json")]
+ [HttpGet]
+ public object MES_Sc_ProcessExchangeBillSub_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = "select * from h_v_Sc_ProcessExchangeBillQuerySub where hmainid = ";
+ string sql1 = sql + sWhere;
+ ds = oCN.RunProcReturn(sql1, "h_v_Sc_ProcessExchangeBillQuerySub");
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_StationOutBillList_Json")]
+ [HttpGet]
+ public object MES_StationOutBillList_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList ", "h_v_MES_StationInBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_MES_StationOutBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖宸ュ簭濮斿鍙戝嚭鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_StationEntrustInBillList_Json")]
+ [HttpGet]
+ public object MES_StationEntrustInBillList_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustInBillList ", "h_v_MES_StationEntrustInBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_MES_StationEntrustInBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_MES_StationEntrustInBillList");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖宸ヨ壓璺嚎鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_Gy_RoutingBillList_Json")]
+ [HttpGet]
+ public object MES_Gy_RoutingBillList_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList ", "h_v_Gy_RoutingBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_RoutingBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖鐢熶骇浠诲姟鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_IF_ICMOBillList_Json")]
+ [HttpGet]
+ public object MES_IF_ICMOBillList_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList ", "h_v_IF_ICMOBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_ICMOBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillList");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖宸ュ簭濮斿鎺ユ敹鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_StationEntrustOutBillList_Json")]
+ [HttpGet]
+ public object MES_StationEntrustOutBillList_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustOutBillList ", "h_v_MES_StationEntrustOutBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_MES_StationEntrustOutBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_MES_StationEntrustOutBillList");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return GetObjectJson(ds);
+ }
+
+ ///<summary>
+ ///灏佽鐘舵�佺爜鍙婅繑鍥炰俊鎭殑鍏敤鏂规硶銆�
+ ///鍙傛暟锛欴ataSet銆�
+ ///杩斿洖鍊硷細json銆�
+ ///</summary>
+ public object GetObjectJson(DataSet ds)
+ {
+ try
+ {
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ ///<summary>
+ ///鑷畾涔夐敊璇俊鎭柟娉曘��
+ ///鍙傛暟锛歴tring銆�
+ ///杩斿洖鍊硷細object銆�
+ ///</summary>
+ public object CustomError(string msg)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = msg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ///<summary>
+ ///缁熶竴姝ｇ‘淇℃伅鏂规硶銆�
+ ///鍙傛暟锛歴tring銆�
+ ///杩斿洖鍊硷細object銆�
+ ///</summary>
+ public object CustomCorrect(DataSet ds)
+ {
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 杩斿洖閫夋嫨鐢熶骇鐝粍鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_GetProductionTeamList_Json")]
+ [HttpGet]
+ public object MES_GetProductionTeamList_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("Select HItemID,HNumber 鐝粍浠ｇ爜,HName 鐝粍 from h_v_IF_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_IF_Group");
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖閫夋嫨鐢熶骇璧勬簮鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_GetProductionResourcesList_Json")]
+ [HttpGet]
+ public object MES_GetProductionResourcesList_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("Select HItemID,HNumber 鐢熶骇璧勬簮浠ｇ爜,HName 鐢熶骇璧勬簮 from Gy_Source where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source");
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 鎵潯鐮佹柟娉�(杩涚珯鎺ユ敹鍗曘�佸嚭绔欐眹鎶ュ崟)
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/TxtHBarCode_KeyDown")]
+ [HttpGet]
+ public object TxtHBarCode_KeyDown(string sBillBarCode)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sBillBarCode == null || sBillBarCode.Equals(""))
+ {
+ return CustomError("鏈緭鍏ユ潯褰㈢爜锛�");
+ }
+ else
+ {
+ //鎷嗗垎鏉″舰鐮�
+ string[] NewBarCode;
+ if (sBillBarCode.CompareTo("#") > 0)
+ {
+ NewBarCode = sBillBarCode.Split(Convert.ToChar("#"));
+ sBillBarCode = NewBarCode[0];
+ }
+ string sBillNo = sBillBarCode;
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "'", "h_v_Sc_ProcessExchangeBillList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ return CustomError("涓嶅瓨鍦ㄦ娴佽浆鍗″彿锛�");
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ }
+
+ /// <summary>
+ /// 娴佹按鍙峰洖杞︽柟娉�(杩涚珯鎺ユ敹鍗曘�佸嚭绔欐眹鎶ュ崟)
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/TxtHProcNo_KeyDown")]
+ [HttpGet]
+ public object TxtHProcNo_KeyDown(string sProcNo, string sBillNo)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sProcNo == null || sProcNo.Equals("") || sBillNo == null || sBillNo.Equals(""))
+ {
+ return CustomError("娴佹按鍙锋垨娴佽浆鍗″彿涓虹┖锛�");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "' and 涓嬮亾娴佽浆宸ュ簭<>'杞�' and 濮斿鏍囪=0 and 娴佽浆鏍囪=1 and 宸ュ簭鍙�='" + sProcNo + "'", "h_v_Sc_ProcessExchangeBillList");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ }
+
+ /// <summary>
+ /// 鎵祦杞崱鍙锋柟娉曪紙浜х嚎鍖呰鍗曘�佷骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁娴佽浆鍗″彿淇濆瓨鍒皌emp琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/SaveCirculationCard_Json")]
+ [HttpGet]
+ public object SaveCirculationCard_Json(string HBillNo, string HInterID, string HBillNo2, string HBarCode,
+ string HNumber, string HName, string HModel)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HBillNo == null || HBillNo.Equals("") || HInterID == null || HInterID.Equals("") || HBillNo2 == null || HBillNo2.Equals(""))
+ {
+ return CustomError("娴佽浆鍗″彿涓嶈兘涓虹┖锛�");
+ }
+ else
+ {
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ HBarCode = " ";
+ }
+ ds = oCN.RunProcReturn("exec Save_Sc_ProcessExchangeBillMainToTmp '" + HBillNo + "','" + HInterID + "','" + HBillNo2 + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "'", "Save_Sc_ProcessExchangeBillMainToTmp");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ //return ds.Tables[0].Rows;
+ }
+
+ /// <summary>
+ /// 鎵瓙浠舵潯鐮佹柟娉曪紙浜х嚎鍖呰鍗曘�佷骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁瀛愪欢鏉＄爜淇濆瓨鍒皌emp琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/SaveSubBarcode_Json")]
+ [HttpGet]
+ public object SaveSubBarcode_Json(string HBillNo, string SubBarcode, string HInterID, string HBillNo2,
+ string HBillType, string sMaker, string HBarCode, string HNumber, string HName, string HModel)
+ {
+ DataSet ds1;
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HBillNo == null || HBillNo.Equals("") || SubBarcode == null || SubBarcode.Equals("") || HInterID == null || HInterID.Equals("") || HBillNo2 == null || HBillNo2.Equals("") || HBillType == null || HBillType.Equals(""))
+ {
+ return CustomError("娴佽浆鍗″彿鎴栧瓙浠舵潯鐮佷笉鑳戒负绌猴紒");
+ }
+ else
+ {
+ ds1 = oCN.RunProcReturn("select * from KF_PonderationBillMain_Temp where HSourceBillNo = '" + SubBarcode + "' and HBillType = '" + HBillType + "'", "KF_PonderationBillMain_Temp");
+ if (ds1.Tables[0].Rows.Count > 0)
+ {
+ return CustomError("璇ュ瓙浠舵潯鐮佸凡瀛樺湪");
+ }
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ HBarCode = " ";
+ }
+ ds = oCN.RunProcReturn("exec h_p_Save_SubBarcodeToTmp '" + HBillNo + "','" + SubBarcode + "','" + HInterID + "','" + HBillNo2 + "','" + HBillType + "','" + sMaker + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "'", "h_p_Save_SubBarcodeToTmp");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ //return ds.Tables[0].Rows;
+ }
+
+ /// <summary>
+ /// 鏌ヨ鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶锛堜骇绾垮寘瑁呭崟锛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/Select_Gy_BarCodeBill_HQty")]
+ [HttpGet]
+ public object Select_Gy_BarCodeBill_HQty(string HBarCode)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ return CustomError("鍞竴鏉＄爜涓嶈兘涓虹┖锛�");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("select HQty from Gy_BarCodeBill where HBarCode = '" + HBarCode + "'", "Gy_BarCodeBill");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ //return ds.Tables[0].Rows;
+ }
+
+ /// <summary>
+ /// 鏇存柊鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶锛堜骇绾垮寘瑁呭崟锛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/Update_Gy_BarCodeBill_HQty")]
+ [HttpGet]
+ public object Update_Gy_BarCodeBill_HQty(string HBarCode,string HQty)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ return CustomError("鍞竴鏉＄爜涓嶈兘涓虹┖锛�");//h_p_Update_Gy_BarCodeBill_HQty
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Update_Gy_BarCodeBill_HQty " + HBarCode + "," + HQty + "", "Gy_BarCodeBill");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ //return ds.Tables[0].Rows;
+ }
+
+ /// <summary>
+ /// 鏇存柊鎵爜璁板綍鍒楄〃鏂规硶锛堜骇绾垮寘瑁呭崟銆佷骇绾跨粍瑁呰拷婧崟锛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/Update_HBillNo_SubBarcodeList_Json")]
+ [HttpGet]
+ public object Update_HBillNo_SubBarcodeList_Json(string HBillNo)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HBillNo == null || HBillNo.Equals(""))
+ {
+ return CustomError("娴佽浆鍗″彿涓嶈兘涓虹┖锛�");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_v_KF_PonderationBillMain_TempAddP '" + HBillNo + "'", "h_v_KF_PonderationBillMain_TempAddP");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ //return ds.Tables[0].Rows;
+ }
+
+ /// <summary>
+ /// 鎻愪氦-涓昏〃鏂规硶锛堜骇绾垮寘瑁呭崟锛�--鏍规嵁娴佷紶鍗″彿浠巘emp琛ㄤ繚瀛樺埌涓昏〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/SaveToSc_PackUnionBillMain")]
+ [HttpGet]
+ public object SaveToSc_PackUnionBillMain(string HBillNo, string HRemark)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HBillNo == null || HBillNo.Equals(""))
+ {
+ return CustomError("娴佽浆鍗″彿涓嶈兘涓虹┖锛�");
+ }
+ else
+ {
+ if (HRemark == null || HRemark.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain '" + HBillNo + "',''", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain '" + HBillNo + "','" + HRemark + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain");
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ //return ds.Tables[0].Rows;
+ }
+
+ /// <summary>
+ /// 鎻愪氦-瀛愯〃鏂规硶锛堜骇绾垮寘瑁呭崟锛�--鏍规嵁瀛愪欢鏉＄爜浠巘emp琛ㄤ繚瀛樺埌瀛愯〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/SaveToSc_PackUnionBillSub")]
+ [HttpGet]
+ public object SaveToSc_PackUnionBillSub(string HitemID, string HRemark)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HitemID == null || HitemID.Equals(""))
+ {
+ return CustomError("鏇存柊澶辫触HitemID涓虹┖锛�");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillSub '" + HitemID + "','" + HRemark + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillSub");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ //return ds.Tables[0].Rows;
+ }
+
+ /// <summary>
+ /// 鏇存柊temp琛ㄧ殑鏍囪瀛楁鏂规硶锛堜骇绾垮寘瑁呭崟锛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/Update_Flag_HRelationInterID")]
+ [HttpGet]
+ public object Update_Flag_HRelationInterID(string HitemID)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HitemID == null || HitemID.Equals(""))
+ {
+ return CustomError("鏇存柊澶辫触HitemID涓虹┖锛�");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Update_Flag_HRelationInterID '" + HitemID + "'", "h_p_Update_Flag_HRelationInterID");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ //return ds.Tables[0].Rows;
+ }
+
+ /// <summary>
+ /// 鎻愪氦-涓昏〃鏂规硶锛堜骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁娴佷紶鍗″彿浠巘emp琛ㄤ繚瀛樺埌涓昏〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/SaveToSc_AssemblyBillMain")]
+ [HttpGet]
+ public object SaveToSc_AssemblyBillMain(string HBillNo)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HBillNo == null || HBillNo.Equals(""))
+ {
+ return CustomError("娴佽浆鍗″彿涓嶈兘涓虹┖锛�");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_AssemblyBillMain '" + HBillNo + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_AssemblyBillMain");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ //return ds.Tables[0].Rows;
+ }
+
+ /// <summary>
+ /// 鎻愪氦-瀛愯〃鏂规硶锛堜骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁瀛愪欢鏉＄爜浠巘emp琛ㄤ繚瀛樺埌瀛愯〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/SaveToSc_AssemblyBillSub")]
+ [HttpGet]
+ public object SaveToSc_AssemblyBillSub(string HitemID)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HitemID == null || HitemID.Equals(""))
+ {
+ return CustomError("鏇存柊澶辫触HitemID涓虹┖锛�");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_AssemblyBillSub '" + HitemID + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_AssemblyBillSub");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ //return ds.Tables[0].Rows;
+ }
+
+ /// <summary>
+ /// 鐢熸垚鍞竴鏉＄爜鏂规硶锛堜骇绾垮寘瑁呭崟锛�--淇濆瓨鏃剁敓鎴愬敮涓�鏉＄爜
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/SaveBarCode_json")]
+ [HttpGet]
+ public object SaveBarCode_json(string sHMaterID, string sHUnitID, string sHBarcodeNo, string sHMaterName)
+ {
+ DataSet ds;
+ string sTMNumber = "";
+ string aDate = System.DateTime.Now.ToString();
+ string sDate = System.DateTime.Now.ToShortDateString();
+ string sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+ string sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ string sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+ int LSH = 0;
+ try
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ sTMNumber = sHMaterID + sYear + sPeriod + sDay;
+ ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(ds.Tables[0].Rows[0][0]);
+ LSH = LSH + 1;
+ string LSH2 = LSH.ToString();
+ while (LSH2.Length < 6) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ string TM = sTMNumber + LSH2;
+ oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+
+ string HBarCode = TM;
+ string HBarCodeType = "鍞竴鏉＄爜";
+ int HMaterID = ClsPub.isInt(sHMaterID);
+ int HUnitID = ClsPub.isInt(sHUnitID);
+ int HQty = 0;
+ string HBatchNo = "";
+ string HSupID = "0";
+ string HGroupID = "0";
+ string HMaker = ClsPub.CurUserName;
+ double HPrintQty = 0;
+ double HinitQty = 0;
+ string HSourceInterID = "0";
+ string HSourceEntryID = "0";
+ string HSourceBillNo = sHBarcodeNo;
+ string HSourceBillType = "";
+ double HEndQty = 0;
+ int HBarcodeQtys = 0;
+ int HBarcodeNo = 0;
+ string HDeptID = "0";
+ string HWhID = "0";
+ string HSPID = "0";
+ string HRemark = "";
+ string HCusID = "0";
+ string HCusType = "";
+ string HEndDate = sDate;
+ string HWorkLineName = "";
+ string HBarCodeDate = sDate;
+ string HSTOCKORGID = "0";
+ string HOWNERID = "0";
+ string HSeOrderBillNo = "";
+ string HMaterName = sHMaterName;
+ string HMaterModel = "";
+ string HPinfan = "";
+ string HAuxPropID = "0";
+ string HMTONo = "";
+ oCn.RunProc("insert into Gy_BarCodeBill "
+ + " (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,"
+ + " HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,"
+ + " HPrintQty,HinitQty,HSourceInterID,HSourceEntryID,HSourceBillNo,"
+ + " HSourceBillType,HEndQty,HBarcodeQtys,HBarcodeNo,HDeptID,"
+ + " HWhID,HSPID,HRemark,HCusID,HCusType,"
+ + " HEndDate,HWorkLineName,HBarCodeDate,HSTOCKORGID,HOWNERID,"
+ + "HSeOrderBillNo,HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo "
+ + ") values ('" + HBarCode + "','" + HBarCodeType + "','" + sHMaterID + "','" + sHUnitID + "','" + HQty + "','"
+ + HBatchNo + "','" + HSupID + "','" + HGroupID + "','" + HMaker + "',getdate(),'"
+ + HPrintQty + "','" + HinitQty + "','" + HSourceInterID + "','" + HSourceEntryID + "','" + HSourceBillNo + "','"
+ + HSourceBillType + "','" + HEndQty + "','" + HBarcodeQtys + "','" + HBarcodeNo + "','" + HDeptID + "','"
+ + HWhID + "','" + HSPID + "','" + HRemark + "','" + HCusID + "','" + HCusType + "','"
+ + HEndDate + "','" + HWorkLineName + "','" + HBarCodeDate + "','" + HSTOCKORGID + "'," + HOWNERID + ",'"
+ + HSeOrderBillNo + "','" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "','" + HAuxPropID + "','" + HMTONo + "')"
+ );
+ ds = oCn.RunProcReturn("select HBarCode from Gy_BarCodeBill where HSourceBillNo = '" + sHBarcodeNo + "' order by HMakeDate desc", "Gy_BarCodeBill");
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖浜х嚎鍖呰鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_ProductionLinePackagingList_Json")]
+ [HttpGet]
+ public object MES_ProductionLinePackagingList_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_ProductionLinePackagingList order by 鍞竴鏉＄爜 desc", "h_v_ProductionLinePackagingList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_ProductionLinePackagingList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ string sql2 = " order by 鍞竴鏉＄爜 desc";
+ sql = sql + sql2;
+ ds = oCN.RunProcReturn(sql, "h_v_ProductionLinePackagingList");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 鎵壒娆℃潯鐮佹柟娉曪紙浜х嚎缁勮杩芥函鍗曪級--鏍规嵁鎵规鏉＄爜鍒版潯鐮佹。妗堣〃涓幏鍙栨暟鎹繚瀛樺埌temp琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/Save_Gy_BarCodeBillToTmp_Json")]
+ [HttpGet]
+ public object Save_Gy_BarCodeBillToTmp_Json(string HInterID, string HBillNo2, string HBarCode)
+ {
+ DataSet ds1;
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HInterID == null || HInterID.Equals("") || HBillNo2 == null || HBillNo2.Equals("") || HBarCode == null || HBarCode.Equals(""))
+ {
+ return CustomError("娴佽浆鍗″彿鎴栧瓙浠舵潯鐮佷笉鑳戒负绌猴紒");
+ }
+ else
+ {
+ ds1 = oCN.RunProcReturn("select top 1 HBarCode from Gy_BarCodeBill where HBarCode = '" + HBarCode + "'", "Gy_BarCodeBill");
+ if (ds1.Tables[0].Rows.Count == 0)
+ {
+ return CustomError("鏃犳鎵规鏉＄爜");
+ }
+ ds = oCN.RunProcReturn("exec h_v_Save_Gy_BarCodeBillToTmp '" + HInterID + "','" + HBillNo2 + "','" + HBarCode + "'", "h_v_Save_Gy_BarCodeBillToTmp");
+
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ //return ds.Tables[0].Rows;
+ }
+
+ /// <summary>
+ /// 杩斿洖浜х嚎缁勮杩芥函鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_AssemblyTraceabilityList_Json")]
+ [HttpGet]
+ public object MES_AssemblyTraceabilityList_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_AssemblyTraceabilityList order by 鐢熶骇浠诲姟鍗曞崟鍙� desc,鏉＄爜绫诲瀷鎺掑簭瀛楁 ", "h_v_ProductionLinePackagingList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_AssemblyTraceabilityList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ string sql2 = " order by 鐢熶骇浠诲姟鍗曞崟鍙� desc,鏉＄爜绫诲瀷鎺掑簭瀛楁 ";
+ sql = sql + sql2;
+ ds = oCN.RunProcReturn(sql, "h_v_AssemblyTraceabilityList");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖浜х嚎缁勮杩芥函鍗曞垪琛�--杩囨护鏉′欢涓洪暛闆曟潯鐮佺殑涓撶敤鏂规硶
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_AssemblyTraceabilityList_E_Json")]
+ [HttpGet]
+ public object MES_AssemblyTraceabilityList_E_Json(string HICMOBillNo)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HICMOBillNo == null || HICMOBillNo.Equals(""))
+ {
+ return CustomError("娴佽浆鍗″彿鎴栧瓙浠舵潯鐮佷笉鑳戒负绌猴紒");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_v_AssemblyTraceabilityList_E " + HICMOBillNo, "h_v_AssemblyTraceabilityList_E");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return GetObjectJson(ds);
+ }
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user b/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user
index 8836b83..3846eae 100644
--- a/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user
@@ -172,13 +172,13 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>01/19/2021 23:08:17</publishTime>
+ <publishTime>01/21/2021 11:31:26</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/19/2021 23:08:17</publishTime>
+ <publishTime>01/21/2021 11:31:26</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>01/19/2021 23:08:21</publishTime>
+ <publishTime>01/21/2021 11:31:29</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 313f4c9..b9493a2 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -314,6 +314,7 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
+ <Compile Include="Controllers\LMESController.cs" />
<Compile Include="Controllers\NewApiController.cs" />
<Compile Include="Dapper\SqlHelper.cs" />
<Compile Include="Dapper\SqlPools.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 1d7d7d6..795b1e4 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -16,7 +16,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
- <ProjectView>ProjectFiles</ProjectView>
+ <ProjectView>ShowAllFiles</ProjectView>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup>
--
Gitblit v1.9.1