From 82de67c48acaf472a6f8bb8b53f3f4feec9f5e54 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 17 十月 2025 10:42:18 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/LMESController.cs | 58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 997813f..823aac9 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -3039,13 +3039,12 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
//澧ㄨタ鍝ョ櫧鏍囩敓鎴�
[Route("LEMS/SaveCirculationCard_Json_MXG")]
[HttpGet]
- public object SaveCirculationCard_Json_MXG(string HBillNo, string HInterID, string HBillNo2, string HBarCode,string HNumber, string HName, string HModel)
+ public object SaveCirculationCard_Json_MXG(string HBillNo, string HInterID, string HBillNo2, string HBarCode,string HNumber, string HName, string HModel,string NBXMH, string HOrgID)
{
DataSet ds;
try
@@ -3055,7 +3054,7 @@
{
HBarCode = " ";
}
- ds = oCN.RunProcReturn("exec Save_Sc_ProcessExchangeBillMainToTmp_MXG '" + HBillNo + "','" + HInterID + "','" + HBillNo2 + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "'", "Save_Sc_ProcessExchangeBillMainToTmp_MXG");
+ ds = oCN.RunProcReturn("exec Save_Sc_ProcessExchangeBillMainToTmp_MXG '" + HBillNo + "','" + HInterID + "','" + HBillNo2 + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "','" + NBXMH + "','" + HOrgID + "'", "Save_Sc_ProcessExchangeBillMainToTmp_MXG");
}
catch (Exception e)
@@ -3193,7 +3192,6 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
#endregion
@@ -3252,9 +3250,7 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
-
#endregion
@@ -3305,7 +3301,7 @@
[Route("LEMS/SaveToSc_PackUnionBillMain_MXG")]
[HttpGet]
- public object SaveToSc_PackUnionBillMain(string HBillNo, string HRemark, string HProjectNum, string zxQty, string BBM, string LDM, string HMaterNumber, string HBarCode_White,string HOrgID)
+ public object SaveToSc_PackUnionBillMain_MXG(string HBillNo, string HRemark, string HProjectNum, string zxQty, string BBM, string LDM, string HMaterNumber, string HBarCode_White,string HOrgID,string NBXMH)
{
DataSet ds;
DataSet dsHSNum;
@@ -3316,7 +3312,7 @@
{
if (LDM != "鍏朵粬" && BBM != "鍏朵粬")
{
- ds = oCN.RunProcReturn($"exec h_p_MES_HBarCode_White_SMR_MXG {zxQty},'{BBM}','{HMaterNumber}','{HBillNo}'", "h_p_MES_HBarCode_White_SMR_MXG");
+ ds = oCN.RunProcReturn($"exec h_p_MES_HBarCode_White_SMR_MXG {zxQty},'{BBM}','{HMaterNumber}','{HBillNo}','{NBXMH}','{HOrgID}'", "h_p_MES_HBarCode_White_SMR_MXG");
HBarCode_White = ds.Tables[0].Rows[0]["HBarCode_White"].ToString();
}
}
@@ -3547,7 +3543,6 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
#endregion
@@ -3645,7 +3640,6 @@
}
#endregion
-
#region 浜х嚎鍖呰鍗曞垪琛ㄦ煡璇�
@@ -3808,6 +3802,48 @@
#endregion
+ #region 鑾峰彇鐧芥爣椤圭洰鍙�
+
+ [Route("LEMS/GetHProject_MXG")]
+ [HttpGet]
+ public object GetHProject_MXG(string HOrgID)
+ {
+ DataSet ds;
+ DataSet dsHSNum;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ ds = oCN.RunProcReturn("select HInterID,HSupBarCodeNumber HName from Sc_PackUnionBillBarCode_temp where HUSEORGID='" + HOrgID + "'", "Sc_PackUnionBillBarCode_temp");
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ 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;
+ }
+ }
+ #endregion
+
#region 鏍规嵁ID鍒犻櫎缂撳瓨琛ㄤ腑鎵爜璁板綍-浜х嚎鍖呰鍗�
@@ -3911,7 +3947,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "锛�";
+ objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "锛�";
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1