From 78549fbacdf433bb0026a2c2f41351e9638cb3d4 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 09 三月 2026 01:49:24 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs | 128 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 116 insertions(+), 12 deletions(-)
diff --git a/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs b/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
index f13c2bd..16259de 100644
--- a/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
+++ b/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
@@ -62,7 +62,7 @@
objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.count = ds.Tables[0].Rows.Count;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
@@ -78,7 +78,6 @@
}
}
#endregion
-
#region 鏍规嵁婧愬崟浼犵墿鏂欏垪琛�
[Route("WLYayBillController/GetMesByOrginBill_1")]
@@ -350,22 +349,97 @@
#endregion
#region app鎵爜妯″潡
- [Route("Sc_EmployeeSignInNoteBillController/APP_Edit_json")]
+ //鑾峰彇璁惧淇℃伅
+ [Route("Sc_EmployeeSignInNoteBillController/txtHBarCode_KeyDown")]
[HttpGet]
- public object APP_Edit_json(int HInterID, string HBarCode)
+ public object txtHBarCode_KeyDown(string HBarCode)
{
- oCN.BeginTran();
- DataSet ds = oCN.RunProcReturn("exec h_p_getMESByEquipmentCode_app '" + HBarCode+"'", "h_p_getMESByEquipmentCode_app");
- //DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain where HBarCode='" + HBarCode + "'", "Gy_EquipFileBillMain");
+ DataSet ds = oCN.RunProcReturn("select * from h_v_Gy_EquipFileBill_KeyDown_PDA where 鏉″舰鐮�= '" + HBarCode+"'", "h_v_Gy_EquipFileBill_KeyDown_PDA");
+
if (ds != null || ds.Tables.Count > 0)
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鎴愬姛";
- objJsonResult.data = ds.Tables;
- oCN.Commit();
+ objJsonResult.Message = "鏌ヨ鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璁惧妗ｆ鏈壘鍒版潯鐮佸搴旂殑璁惧淇℃伅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鑾峰彇妯″叿淇℃伅
+ [Route("Sc_EmployeeSignInNoteBillController/Get_HMouldList")]
+ [HttpGet]
+ public object Get_HMouldList(int HInterID,string UserNmae)
+ {
+ DataSet ds = oCN.RunProcReturn("exec h_p_SB_HEquipHMould_Query '" + HInterID + "'", "h_p_SB_HEquipHMould_Query");
+
+ if (ds != null || ds.Tables.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠璁惧鏃犳ā鍏蜂俊鎭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鑾峰彇宸ュ崟淇℃伅
+ [Route("Sc_EmployeeSignInNoteBillController/Get_HIcmoList")]
+ [HttpGet]
+ public object Get_HIcmoList(int HInterID, string UserNmae)
+ {
+ DataSet ds = oCN.RunProcReturn("exec h_p_Sc_ICMOBillStatus_Tmp_QD '" + HInterID + "'", "h_p_Sc_ICMOBillStatus_Tmp_QD");
+
+ if (ds != null || ds.Tables.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠璁惧鏃犳ā鍏蜂俊鎭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ [Route("Sc_EmployeeSignInNoteBillController/Get_equipmentMes")]
+ [HttpGet]
+ public object Get_MouldMes(int HInterID, string HBarCode)
+ {
+
+
+ DataSet dss = oCN.RunProcReturn("select HInterID from Gy_EquipFileBillMain where HBarCode='"+ HBarCode + "'", "Gy_EquipFileBillMain");
+ DataSet ds = oCN.RunProcReturn("exec h_p_SB_HEquipHMould_Query '" + dss.Tables[0].Rows[0]["HInterID"] + "'", "h_p_SB_HEquipHMould_Query");
+ if (ds != null || ds.Tables.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
}
else
{
@@ -375,10 +449,8 @@
objJsonResult.data = null;
return objJsonResult;
}
- return objJsonResult;
}
#endregion
-
#region 淇濆瓨/缂栬緫
@@ -556,5 +628,37 @@
}
}
#endregion
+
+
+ #region 鍑虹珯鍗� 鏌ヨ褰撳墠鏈哄彴鐨勬搷浣滃憳銆佹ā鍏峰伐銆佹満淇� 锛堝崕鑸燂級
+ [Route("Sc_EmployeeSignInNoteBillController/Get_HSourceRoulsList")]
+ [HttpGet]
+ public object Get_HSourceRoulsList(int HSourceID)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+
+ ds = oCN.RunProcReturn("exec h_p_Cj_StationOutBill_Roules_HZ '" + HSourceID + "'", "h_p_Cj_StationOutBill_Roules_HZ");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds;
+ objJsonResult.list = null;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
--
Gitblit v1.9.1