From 75c5becc5cbf2d00c77082bdbe9bc6a08703ffb1 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 23 七月 2024 14:09:23 +0800
Subject: [PATCH] 条码自动生成：断线重连
---
WebAPI/Controllers/LMESController.cs | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 8c31fa0..80a45d3 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -510,7 +510,16 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ ds = oCN.RunProcReturn(@"select * from Sc_ICMOBillStatus_Tmp where HSourceInterID='"+ HInterID + "' and HSourceEntryID='"+ HEntryID + "'", "Sc_ICMOBillStatus_Tmp");
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇ュ伐搴忓凡娲惧崟,涓嶅厑璁搁噸澶嶆帓鍗曪紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
oCN.BeginTran();
oCN.RunProc("update Sc_ProcessExchangeBillSub set HSourceID=" + HSourceID + " where HInterID=" + HInterID + " and HEntryID=" + HEntryID);
@@ -1667,11 +1676,7 @@
return GetObjectJson(ds);
}
- /// <summary>
- /// 杩斿洖宸ュ簭娴佽浆鍗″垪琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #region 宸ュ簭娴佽浆鍗′笅鎺ㄧ敓浜ц川閲忔眹鎶ュ崟
[Route("LEMS/MES_IF_ProcessBillList_Json")]
[HttpGet]
public object MES_IF_ProcessBillList_Json(string hinterid, string HEntryID, string user)
@@ -1692,6 +1697,30 @@
}
return GetObjectJson(ds);
}
+ #endregion
+
+ #region 宸ュ簭娴佽浆鍗′笅鎺ㄨ澶囩偣妫�鍙傛暟琛�
+ [Route("LEMS/MES_IF_EquipICMOTechParamList_Json")]
+ [HttpGet]
+ public object MES_IF_EquipICMOTechParamList_Json(string hinterid, string HEntryID, string user)
+ {
+ DataSet ds;
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery_TechParam where hmainid ='" + hinterid + "' and HEntryID='" + HEntryID + "'", "h_v_Sc_ProcessExchangeBillQuerySub");
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+ #endregion
#region 鐢熶骇璁㈠崟 涓嬫煡
/// <summary>
--
Gitblit v1.9.1