From 3f1a057e6843aa80630e90bfd4a6f646c870d09e Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 27 四月 2026 09:49:20 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs | 77 +++++++++++++++++++++++++++++++++-----
1 files changed, 67 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs b/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
index 842d524..5cb826b 100644
--- a/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
+++ b/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
@@ -23,7 +23,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- #region 鍒嗛〉鍒楄〃
+ #region 鍛樺伐绛惧埌璁板綍鍗� 鍒嗛〉鍒楄〃
[Route("Sc_EmployeeSignInNoteBillController/GetListPage")]
[HttpGet]
public object GetListPage(string sWhere, string user)
@@ -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;
@@ -95,7 +95,7 @@
- ds = oCN.RunProcReturn("select a.*,b.HUnitID from h_v_Gy_MaterialPackingRelationList_Edit a left JOIN Gy_Material b on a.HMaterID=b.HItemID where HDefaultSendPackFlag=1 and 瀹℃牳浜�='' and HMaterID in (" + ListMaterial + ")", "锘縣_v_Gy_MaterialPackingRelationList");
+ ds = oCN.RunProcReturn("select a.*,b.HUnitID from h_v_Gy_MaterialPackingRelationList_Edit a left JOIN Gy_Material b on a.HMaterID=b.HItemID where HDefaultSendPackFlag=1 and ISNULL(瀹℃牳浜�,'')<>'' and HMaterID in (" + ListMaterial + ")", "锘縣_v_Gy_MaterialPackingRelationList");
//娣诲姞鍒楀悕
@@ -126,7 +126,7 @@
#endregion
- #region 淇濆瓨/缂栬緫
+ #region 鍛樺伐绛惧埌璁板綍鍗� 淇濆瓨/缂栬緫
[Route("Sc_EmployeeSignInNoteBillController/SaveBill")]
[HttpPost]
@@ -237,7 +237,7 @@
#endregion
- #region[缂栬緫鏃惰幏鍙栨暟鎹甝
+ #region[鍛樺伐绛惧埌璁板綍鍗� 缂栬緫鏃惰幏鍙栨暟鎹甝
[Route("Sc_EmployeeSignInNoteBillController/Sc_EmployeeSignInNoteBilldetail")]
[HttpGet]
public ApiResult<DataSet> Sc_EmployeeSignInNoteBilldetail(string HID)
@@ -356,7 +356,7 @@
{
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)
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -381,7 +381,7 @@
{
DataSet ds = oCN.RunProcReturn("exec h_p_SB_HEquipHMould_Query '" + HInterID + "'", "h_p_SB_HEquipHMould_Query");
- if (ds != null || ds.Tables.Count > 0)
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -406,7 +406,7 @@
{
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)
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -419,13 +419,38 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "褰撳墠璁惧鏃犳ā鍏蜂俊鎭紒";
+ 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
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
objJsonResult.data = null;
return objJsonResult;
}
}
#endregion
-
#region 淇濆瓨/缂栬緫
@@ -603,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