From 122e343b705b057e71f1ef677d18237900844a16 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 12 九月 2025 10:51:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/LMESController.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 92493fa..b2e69ba 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -647,6 +647,7 @@
sql = "select top 1000 * from h_v_Sc_ProcessExchangeArrangementList_PG where 1 = 1 " + sWhere;
}
}
+ sql = "select top 1000 * from h_v_Sc_ProcessExchangeArrangementList_PG where 1 = 1 " + sWhere + " ";
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeArrangementList_PG");
@@ -3374,6 +3375,31 @@
return CustomCorrect(ds);
}
+ [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]
@@ -3428,6 +3454,31 @@
else
{
ds = oCN.RunProcReturn("exec h_p_Update_Flag_HRelationInterID '" + HitemID + "'", "h_p_Update_Flag_HRelationInterID");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ }
+
+ [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");
}
}
@@ -3608,11 +3659,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 top 1000 * 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;
--
Gitblit v1.9.1