From 999e1007eb2b1d4a1f5b19a0addc686b2e30ef2d Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 26 十一月 2025 16:44:52 +0800
Subject: [PATCH] 优化
---
WebAPI/Controllers/LMESController.cs | 371 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 236 insertions(+), 135 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index fd1247a..aa92a84 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -633,15 +633,10 @@
}
}
- /// <summary>
- /// 鎵祦杞崱鍙锋柟娉曪紙浜х嚎鍖呰鍗曘�佷骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁娴佽浆鍗″彿淇濆瓨鍒皌emp琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #region 鎵祦杞崱鍙锋柟娉曪紙浜х嚎鍖呰鍗曘�佷骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁娴佽浆鍗″彿淇濆瓨鍒皌emp琛�
[Route("LEMS/SaveCirculationCard_Json")]
[HttpGet]
- public object SaveCirculationCard_Json(string HBillNo, string HInterID, string HBillNo2, string HBarCode,
- string HNumber, string HName, string HModel)
+ public object SaveCirculationCard_Json(string HBillNo, string HInterID, string HBillNo2, string HBarCode, string HNumber, string HName, string HModel)
{
DataSet ds;
try
@@ -666,8 +661,11 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
+
+ #endregion
+
+ #region 澧ㄨタ鍝ョ櫧鏍囩敓鎴愭煡璇�
//澧ㄨタ鍝ョ櫧鏍囨煡璇�
[Route("MES/MES_BarcodeWhiteLabelReport")]
@@ -686,14 +684,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
@@ -703,7 +699,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)
@@ -711,18 +707,15 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鎵瓙浠舵潯鐮佹柟娉曪紙浜х嚎鍖呰鍗曘�佷骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁瀛愪欢鏉＄爜淇濆瓨鍒皌emp琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 鎵瓙浠舵潯鐮佹柟娉曪紙浜х嚎鍖呰鍗曘�佷骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁瀛愪欢鏉＄爜淇濆瓨鍒皌emp琛�
+
[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)
+ public object SaveSubBarcode_Json(string HBillNo, string SubBarcode, string HInterID, string HBillNo2, string HBillType, string sMaker, string HBarCode, string HNumber, string HName, string HModel, string HOrgID)
{
DataSet ds1;
DataSet ds;
@@ -744,7 +737,7 @@
{
HBarCode = " ";
}
- ds = oCN.RunProcReturn("exec h_p_Save_SubBarcodeToTmp '" + HBillNo + "','" + SubBarcode + "','" + HInterID + "','" + HBillNo2 + "','" + HBillType + "','" + sMaker + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "'", "h_p_Save_SubBarcodeToTmp");
+ ds = oCN.RunProcReturn("exec h_p_Save_SubBarcodeToTmp '" + HBillNo + "','" + SubBarcode + "','" + HInterID + "','" + HBillNo2 + "','" + HBillType + "','" + sMaker + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "','" + HOrgID + "'", "h_p_Save_SubBarcodeToTmp");
LogService.Write("ID:" + HInterID + ",娴佽浆鍗″彿:" + HBillNo + ",鍗曟嵁鍙�:" + HBillNo2 + ",鏉＄爜:" + SubBarcode + ",鎵樻潯鐮�:" + HBarCode);
}
@@ -754,8 +747,38 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
+
+ [Route("LEMS/SaveSubBarcode_Json_MXG")]
+ [HttpGet]
+ public object SaveSubBarcode_Json_MXG(string HBillNo, string SubBarcode, string HInterID, string HBillNo2, string HBillType, string sMaker, string HBarCode, string HNumber, string HName, string HModel, string HOrgID)
+ {
+ DataSet ds1;
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ 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 + "','" + HOrgID + "'", "h_p_Save_SubBarcodeToTmp");
+ LogService.Write("ID:" + HInterID + ",娴佽浆鍗″彿:" + HBillNo + ",鍗曟嵁鍙�:" + HBillNo2 + ",鏉＄爜:" + SubBarcode + ",鎵樻潯鐮�:" + HBarCode);
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ }
+
+
+ #endregion
[Route("LEMS/SaveSubBarcode_Json_MXG")]
@@ -788,11 +811,8 @@
//return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鏌ヨ鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶锛堜骇绾垮寘瑁呭崟锛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #region 鏌ヨ鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶锛堜骇绾垮寘瑁呭崟锛�
+
[Route("LEMS/Select_Gy_BarCodeBill_HQty")]
[HttpGet]
public object Select_Gy_BarCodeBill_HQty(string HBarCode)
@@ -816,17 +836,15 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鏇存柊鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶锛堜骇绾垮寘瑁呭崟锛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 鏇存柊鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶锛堜骇绾垮寘瑁呭崟锛�
+
[Route("LEMS/Update_Gy_BarCodeBill_HQty")]
[HttpGet]
- public object Update_Gy_BarCodeBill_HQty(string HBarCode,string HQty)
+ public object Update_Gy_BarCodeBill_HQty(string HBarCode, string HQty)
{
DataSet ds;
try
@@ -834,11 +852,11 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (HBarCode == null || HBarCode.Equals(""))
{
- return CustomError("鍞竴鏉＄爜涓嶈兘涓虹┖锛�");//h_p_Update_Gy_BarCodeBill_HQty
+ return CustomError("鍞竴鏉＄爜涓嶈兘涓虹┖锛�");
}
else
{
- ds = oCN.RunProcReturn("exec h_p_Update_Gy_BarCodeBill_HQty " + HBarCode + "," + HQty + "", "Gy_BarCodeBill");
+ ds = oCN.RunProcReturn("exec h_p_Update_Gy_BarCodeBill_HQty " + HBarCode + "," + HQty + "", "h_p_Update_Gy_BarCodeBill_HQty");
}
}
@@ -846,15 +864,13 @@
{
ds = null;
}
- return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
+ return CustomCorrect(ds); ;
}
- /// <summary>
- /// 鏇存柊鎵爜璁板綍鍒楄〃鏂规硶锛堜骇绾垮寘瑁呭崟銆佷骇绾跨粍瑁呰拷婧崟锛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 鏇存柊鎵爜璁板綍鍒楄〃鏂规硶锛堜骇绾垮寘瑁呭崟銆佷骇绾跨粍瑁呰拷婧崟锛�
+
[Route("LEMS/Update_HBillNo_SubBarcodeList_Json")]
[HttpGet]
public object Update_HBillNo_SubBarcodeList_Json(string HBillNo)
@@ -878,17 +894,15 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鎻愪氦-涓昏〃鏂规硶锛堜骇绾垮寘瑁呭崟锛�--鏍规嵁娴佷紶鍗″彿浠巘emp琛ㄤ繚瀛樺埌涓昏〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 鎻愪氦-涓昏〃鏂规硶锛堜骇绾垮寘瑁呭崟锛�--鏍规嵁娴佷紶鍗″彿浠巘emp琛ㄤ繚瀛樺埌涓昏〃
+
[Route("LEMS/SaveToSc_PackUnionBillMain")]
[HttpGet]
- public object SaveToSc_PackUnionBillMain(string HBillNo, string HRemark,string HProjectNum,string zxQty, string BBM, string LDM, string HMaterNumber)
+ public object SaveToSc_PackUnionBillMain(string HBillNo, string HRemark, string HProjectNum, string zxQty, string BBM, string LDM, string HMaterNumber, string HOrgID)
{
DataSet ds;
DataSet dsHSNum;
@@ -896,7 +910,7 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string HBarCode_White = "";
- if (LDM != "鍏朵粬" && BBM != "鍏朵粬" )
+ if (LDM != "鍏朵粬" && BBM != "鍏朵粬")
{
ds = oCN.RunProcReturn($"exec h_p_MES_HBarCode_White_SMR {zxQty},'{BBM}','{HMaterNumber}','{HBillNo}'", "h_p_MES_HBarCode_White_SMR");
HBarCode_White = ds.Tables[0].Rows[0]["HBarCode_White"].ToString();
@@ -907,14 +921,14 @@
oCN.RunProc("exec h_p_WMS_SetMaxNo '" + HProjectNum + "'");
int HSNum = ClsPub.isInt(dsHSNum.Tables[0].Rows[0][0]) + 1;
//璋冪敤杩涘埗杞崲鏂规硶鎶婃祦姘村彿杞崲鎴愭祦姘村彿2
- string HSNum2 = GetNewCodeByNum(HSNum,1,2);
+ string HSNum2 = GetNewCodeByNum(HSNum, 1, 2);
if (HBillNo == null || HBillNo.Equals(""))
{
return CustomError("[0000-1-057]娴佽浆鍗″彿涓嶈兘涓虹┖锛�");
}
else
{
- ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain '" + HBillNo + "','" + HRemark + "'," + HSNum + ",'" + HSNum2 + "','" + HBarCode_White + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain");
+ ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain '" + HBillNo + "','" + HRemark + "'," + HSNum + ",'" + HSNum2 + "','" + HBarCode_White + "','" + HOrgID + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain");
}
}
catch (Exception e)
@@ -926,26 +940,26 @@
return objJsonResult;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
[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)
+ 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;
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- //HBarCode_White = "";
- //if (LDM != "鍏朵粬" && BBM != "鍏朵粬")
- //{
- // ds = oCN.RunProcReturn($"exec h_p_MES_HBarCode_White_SMR {zxQty},'{BBM}','{HMaterNumber}','{HBillNo}'", "h_p_MES_HBarCode_White_SMR");
- // HBarCode_White = ds.Tables[0].Rows[0]["HBarCode_White"].ToString();
- //}
-
+ if (HBarCode_White != "")
+ {
+ if (LDM != "鍏朵粬" && BBM != "鍏朵粬")
+ {
+ 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();
+ }
+ }
//椤圭洰鍙疯幏鍙栨祦姘村彿
dsHSNum = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HProjectNum + "'", "h_p_WMS_GetMaxNo");
oCN.RunProc("exec h_p_WMS_SetMaxNo '" + HProjectNum + "'");
@@ -958,7 +972,7 @@
}
else
{
- ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain_MXG '" + HBillNo + "','" + HRemark + "'," + HSNum + ",'" + HSNum2 + "','" + HBarCode_White + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain_MXG");
+ ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain_MXG '" + HBillNo + "','" + HRemark + "'," + HSNum + ",'" + HSNum2 + "','" + HBarCode_White + "','" + HOrgID + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain_MXG");
}
}
catch (Exception e)
@@ -970,15 +984,13 @@
return objJsonResult;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
+ #endregion
- /// <summary>
- /// 鎻愪氦-瀛愯〃鏂规硶锛堜骇绾垮寘瑁呭崟锛�--鏍规嵁瀛愪欢鏉＄爜浠巘emp琛ㄤ繚瀛樺埌瀛愯〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+
+ #region 鎻愪氦-瀛愯〃鏂规硶锛堜骇绾垮寘瑁呭崟锛�--鏍规嵁瀛愪欢鏉＄爜浠巘emp琛ㄤ繚瀛樺埌瀛愯〃
+
[Route("LEMS/SaveToSc_PackUnionBillSub")]
[HttpGet]
public object SaveToSc_PackUnionBillSub(string HitemID, string HRemark)
@@ -1002,9 +1014,33 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
+
+ [Route("LEMS/SaveToSc_PackUnionBillSub_Batch")]
+ [HttpGet]
+ public object SaveToSc_PackUnionBillSub_Batch(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_Batch '" + HitemID + "','" + HRemark + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillSub_Batch");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ }
//鏇存柊娌℃湁鍙嶅啓鐨勬暟鎹�
[Route("LEMS/SaveToSc_PackUnionBillSub_Back")]
[HttpGet]
@@ -1037,14 +1073,13 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+
}
- /// <summary>
- /// 鏇存柊temp琛ㄧ殑鏍囪瀛楁鏂规硶锛堜骇绾垮寘瑁呭崟锛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 鏇存柊temp琛ㄧ殑鏍囪瀛楁鏂规硶锛堜骇绾垮寘瑁呭崟锛�
+
[Route("LEMS/Update_Flag_HRelationInterID")]
[HttpGet]
public object Update_Flag_HRelationInterID(string HitemID)
@@ -1068,14 +1103,37 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鎻愪氦-涓昏〃鏂规硶锛堜骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁娴佷紶鍗″彿浠巘emp琛ㄤ繚瀛樺埌涓昏〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ [Route("LEMS/Update_Flag_HRelationInterID_Batch")]
+ [HttpGet]
+ public object Update_Flag_HRelationInterID_Batch(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_Batch '" + HitemID + "'", "h_p_Update_Flag_HRelationInterID_Batch");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ }
+
+ #endregion
+
+ #region 鎻愪氦-涓昏〃鏂规硶锛堜骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁娴佷紶鍗″彿浠巘emp琛ㄤ繚瀛樺埌涓昏〃
+
[Route("LEMS/SaveToSc_AssemblyBillMain")]
[HttpGet]
public object SaveToSc_AssemblyBillMain(string HBillNo)
@@ -1099,14 +1157,11 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鎻愪氦-瀛愯〃鏂规硶锛堜骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁瀛愪欢鏉＄爜浠巘emp琛ㄤ繚瀛樺埌瀛愯〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+ #region 鎻愪氦-瀛愯〃鏂规硶锛堜骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁瀛愪欢鏉＄爜浠巘emp琛ㄤ繚瀛樺埌瀛愯〃
+
[Route("LEMS/SaveToSc_AssemblyBillSub")]
[HttpGet]
public object SaveToSc_AssemblyBillSub(string HitemID)
@@ -1130,17 +1185,15 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鐢熸垚鍞竴鏉＄爜鏂规硶锛堜骇绾垮寘瑁呭崟锛�--淇濆瓨鏃剁敓鎴愬敮涓�鏉＄爜
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 鐢熸垚鍞竴鏉＄爜鏂规硶锛堜骇绾垮寘瑁呭崟锛�--淇濆瓨鏃剁敓鎴愬敮涓�鏉＄爜
+
[Route("LEMS/SaveBarCode_json")]
[HttpGet]
- public object SaveBarCode_json(string sHMaterID, string sHUnitID, string sHBarcodeNo, string sHMaterName)
+ public object SaveBarCode_json(string sHMaterID, string sHUnitID, string sHBarcodeNo, string sHMaterName, string HOrgID)
{
DataSet ds;
string sTMNumber = "";
@@ -1195,7 +1248,7 @@
string HEndDate = sDate;
string HWorkLineName = "";
string HBarCodeDate = sDate;
- string HSTOCKORGID = "0";
+ string HSTOCKORGID = HOrgID;
string HOWNERID = "0";
string HSeOrderBillNo = "";
string HMaterName = sHMaterName;
@@ -1210,7 +1263,7 @@
+ " HSourceBillType,HEndQty,HBarcodeQtys,HBarcodeNo,HDeptID,"
+ " HWhID,HSPID,HRemark,HCusID,HCusType,"
+ " HEndDate,HWorkLineName,HBarCodeDate,HSTOCKORGID,HOWNERID,"
- + "HSeOrderBillNo,HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo "
+ + "HSeOrderBillNo,HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo"
+ ") values ('" + HBarCode + "','" + HBarCodeType + "','" + sHMaterID + "','" + sHUnitID + "','" + HQty + "','"
+ HBatchNo + "','" + HSupID + "','" + HGroupID + "','" + HMaker + "',getdate(),'"
+ HPrintQty + "','" + HinitQty + "','" + HSourceInterID + "','" + HSourceEntryID + "','" + HSourceBillNo + "','"
@@ -1228,11 +1281,10 @@
return CustomCorrect(ds);
}
- /// <summary>
- /// 杩斿洖浜х嚎鍖呰鍗曞垪琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 浜х嚎鍖呰鍗曞垪琛ㄦ煡璇�
+
[Route("LEMS/MES_ProductionLinePackagingList_Json")]
[HttpGet]
public object MES_ProductionLinePackagingList_Json(string sWhere)
@@ -1243,11 +1295,11 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 1000 * from h_v_ProductionLinePackagingList order by 鎵爜鏃ユ湡 desc, 鍞竴鏉＄爜 desc", "h_v_ProductionLinePackagingList");
+ ds = oCN.RunProcReturn("select top 300 * from h_v_ProductionLinePackagingList order by 鎵爜鏃ユ湡 desc, 鍞竴鏉＄爜 desc", "h_v_ProductionLinePackagingList");
}
else
{
- string sql1 = "select * from h_v_ProductionLinePackagingList where 1 = 1 ";
+ string sql1 = "select top 300 * from h_v_ProductionLinePackagingList where 1 = 1 ";
string sql = sql1 + sWhere;
string sql2 = " order by 鎵爜鏃ユ湡 desc, 鍞竴鏉＄爜 desc";
sql = sql + sql2;
@@ -1262,11 +1314,10 @@
return GetObjectJson(ds);
}
- /// <summary>
- /// 鍒犻櫎瀵瑰簲鐨勫寘瑁呭崟
- /// </summary>
- /// <param name="sWhere"></param>
- /// <returns></returns>
+ #endregion
+
+ #region 鍒犻櫎瀵瑰簲鐨勫寘瑁呭崟
+
[Route("LEMS/DelMES_ProductionLinePackagingList")]
[HttpGet]
public object DelMES_ProductionLinePackagingList(string HInterID)
@@ -1292,11 +1343,11 @@
return objJsonResult;
}
}
- /// <summary>
- /// 鎵壒娆℃潯鐮佹柟娉曪紙浜х嚎缁勮杩芥函鍗曪級--鏍规嵁鎵规鏉＄爜鍒版潯鐮佹。妗堣〃涓幏鍙栨暟鎹繚瀛樺埌temp琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+
+ #endregion
+
+ #region 鎵壒娆℃潯鐮佹柟娉曪紙浜х嚎缁勮杩芥函鍗曪級--鏍规嵁鎵规鏉＄爜鍒版潯鐮佹。妗堣〃涓幏鍙栨暟鎹繚瀛樺埌temp琛�
+
[Route("LEMS/Save_Gy_BarCodeBillToTmp_Json")]
[HttpGet]
public object Save_Gy_BarCodeBillToTmp_Json(string HInterID, string HBillNo2, string HBarCode)
@@ -1327,14 +1378,12 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
- /// <summary>
- /// 杩斿洖浜х嚎缁勮杩芥函鍗曞垪琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 浜х嚎缁勮杩芥函鍗曞垪琛ㄦ煡璇�
+
[Route("LEMS/MES_AssemblyTraceabilityList_Json")]
[HttpGet]
public object MES_AssemblyTraceabilityList_Json(string sWhere)
@@ -1364,11 +1413,10 @@
return GetObjectJson(ds);
}
- /// <summary>
- /// 杩斿洖浜х嚎缁勮杩芥函鍗曞垪琛�--杩囨护鏉′欢涓洪暛闆曟潯鐮佺殑涓撶敤鏂规硶
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 杩斿洖浜х嚎缁勮杩芥函鍗曞垪琛�--杩囨护鏉′欢涓洪暛闆曟潯鐮佺殑涓撶敤鏂规硶
+
[Route("LEMS/MES_AssemblyTraceabilityList_E_Json")]
[HttpGet]
public object MES_AssemblyTraceabilityList_E_Json(string HICMOBillNo)
@@ -1394,10 +1442,55 @@
return GetObjectJson(ds);
}
- //鏍规嵁ID鍒犻櫎缂撳瓨琛ㄤ腑鎵爜璁板綍-浜х嚎鍖呰鍗�
+ #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鍒犻櫎缂撳瓨琛ㄤ腑鎵爜璁板綍-浜х嚎鍖呰鍗�
+
[Route("LEMS/DelProductionLinePackagingTable")]
[HttpGet]
- public object DelProductionLinePackagingTable(long sHInterID,string HSourceBillNo)
+ public object DelProductionLinePackagingTable(long sHInterID, string HSourceBillNo)
{
try
{
@@ -1418,6 +1511,9 @@
return objJsonResult;
}
}
+
+ #endregion
+
//鍒ゆ柇鏉＄爜鏄惁鏄笉鑹殑鐘舵��
[Route("LEMS/HbadStaus")]
@@ -1542,7 +1638,8 @@
}
- //09椤圭洰鍒ゆ柇閰嶄欢鏉＄爜 妯″叿绌村彿鏄惁鍖归厤
+ #region 09椤圭洰鍒ゆ柇閰嶄欢鏉＄爜 妯″叿绌村彿鏄惁鍖归厤
+
[Route("LEMS/h_p_CJ_SNBarCodeBillMouldBathSelect")]
[HttpGet]
public object h_p_CJ_SNBarCodeBillMouldBathSelect(string SubBarcode, string HProcExchBillNo, string HBillType)
@@ -1588,7 +1685,10 @@
}
}
- //鍒ゆ柇鎬荤殑鍖呰鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
+ #endregion
+
+ #region 鍒ゆ柇鎬荤殑鍖呰鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
+
[Route("LEMS/h_p_Sc_ProductionLinePackaging_Checkqty")]
[HttpGet]
public object h_p_Sc_ProductionLinePackaging_Checkqty(long HInterID)
@@ -1625,11 +1725,10 @@
}
}
- /// <summary>
- /// 缂撳瓨琛ㄥ寘瑁呭崟璁板綍
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 缂撳瓨琛ㄥ寘瑁呭崟鍒楄〃
+
[Route("LEMS/PackUnionCacheList")]
[HttpGet]
public object PackUnionCacheList(string sWhere)
@@ -1640,7 +1739,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 5000 * from h_v_PackUnionBillCacheList order by 鎵爜鏃堕棿 desc", "h_v_PackUnionBillCacheList");
+ ds = oCN.RunProcReturn("select top 500 * from h_v_PackUnionBillCacheList order by 鎵爜鏃堕棿 desc", "h_v_PackUnionBillCacheList");
}
else
{
@@ -1678,6 +1777,8 @@
}
}
+ #endregion
+
#region 鎵撳嵃鏌ヨ鏁版嵁
[Route("Gy_SOPBillList/WindowPrintList")]
[HttpGet]
--
Gitblit v1.9.1