From 2949236d726ae543c2341f66d70295e1dfd8fe35 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 24 三月 2026 11:08:56 +0800
Subject: [PATCH] 运单修复
---
WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs | 2
WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs | 64 ++++++++++++++++----------------
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
index 6ce3b0c..be28cd9 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
@@ -885,25 +885,25 @@
}
//瀹℃牳鍓嶆帶鍒�================================================================================
- //string sql = "exec h_p_StationEntrustOutBill_WW_BeforeCheckCtrl " + HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
- //ds = oCN.RunProcReturn(sql, "h_p_StationEntrustOutBill_WW_BeforeCheckCtrl");
- //if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ string sql = "exec h_p_StationEntrustOutBill_WW_BeforeCheckCtrl " + HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_StationEntrustOutBill_WW_BeforeCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
- //if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//================================================================================
//瀹℃牳
@@ -965,20 +965,20 @@
}
//瀹℃牳鍚庢帶鍒�================================================================================
- //string sql = "exec h_p_StationEntrustOutBill_WW_AfterCheckCtrl " + lngBillKey + ",'" + HBillNo + "','" + CurUserName + "'";
- //ds = oCN.RunProcReturn(sql, "h_p_StationEntrustOutBill_WW_AfterCheckCtrl");
- //if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
- //{
- // sReturn = "瀹℃牳杩囩▼涓嚭閿欙紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
- // oCN.RollBack();
- // return false;
- //}
- //if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
- //{
- // sReturn = ds.Tables[0].Rows[0]["HRemark"].ToString();
- // oCN.RollBack();
- // return false;
- //}
+ string sql = "exec h_p_StationEntrustOutBill_WW_AfterCheckCtrl " + lngBillKey + ",'" + HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_StationEntrustOutBill_WW_AfterCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "瀹℃牳杩囩▼涓嚭閿欙紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ oCN.RollBack();
+ return false;
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ sReturn = ds.Tables[0].Rows[0]["HRemark"].ToString();
+ oCN.RollBack();
+ return false;
+ }
//================================================================================
diff --git a/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs b/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
index 16259de..14cad40 100644
--- a/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
+++ b/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
@@ -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");
//娣诲姞鍒楀悕
--
Gitblit v1.9.1