From 6866dbd4b0b8703811872669179a68841eea803d Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 24 三月 2026 18:28:50 +0800
Subject: [PATCH] 合并
---
WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
index cce07cd..66c973d 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
@@ -141,7 +141,7 @@
}
else
{
- objJsonResult.code = "0";
+ objJsonResult.code = "1";
objJsonResult.count = 1; //鎴愬姛锛�
objJsonResult.Message = DBUtility.ClsPub.isStrNull(BeforeSave.Tables[0].Rows[0]["HRemark"]);
objJsonResult.data = null;
@@ -171,7 +171,7 @@
}
else
{
- objJsonResult.code = "0";
+ objJsonResult.code = "1";
objJsonResult.count = 1; //鎴愬姛锛�
objJsonResult.Message = DBUtility.ClsPub.isStrNull(AfterSave.Tables[0].Rows[0]["HRemark"]);
objJsonResult.data = null;
@@ -1131,7 +1131,7 @@
}
else
{
- objJsonResult.code = "0";
+ objJsonResult.code = "1";
objJsonResult.count = 1; //鎴愬姛锛�
objJsonResult.Message = DBUtility.ClsPub.isStrNull(BeforeSave.Tables[0].Rows[0]["HRemark"]);
objJsonResult.data = null;
@@ -1161,7 +1161,7 @@
}
else
{
- objJsonResult.code = "0";
+ objJsonResult.code = "1";
objJsonResult.count = 1; //鎴愬姛锛�
objJsonResult.Message = DBUtility.ClsPub.isStrNull(AfterSave.Tables[0].Rows[0]["HRemark"]);
objJsonResult.data = null;
@@ -1294,7 +1294,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = null;
+ objJsonResult.Message = "";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2013,11 +2013,16 @@
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "褰撳墠妯″叿鏈仛涓婃ā鍗�,鏌ヨ澶辫触锛�";
- objJsonResult.data = null;
- return objJsonResult;
+ ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFile_Query where 1=1" + sWhere, "h_v_Gy_MouldFile_Query");
+
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠妯″叿鏈仛涓婃ā鍗�,鏌ヨ澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
objJsonResult.code = "1";
@@ -2396,7 +2401,7 @@
if (OperationType == 1) // 鏂板
{
objJsonResult = AfterSave_MouldLowerBill(HInterID, HBillNo, 1);
- if (objJsonResult.count == 0)
+ if (objJsonResult.code == "0")
{
oCN.RollBack();
objJsonResult.code = "0";
@@ -2408,7 +2413,7 @@
else // 淇敼/澶嶅埗
{
objJsonResult = AfterSave_MouldLowerBill(HInterID, HBillNo, 2);
- if (objJsonResult.count == 0)
+ if (objJsonResult.code == "0")
{
oCN.RollBack();
objJsonResult.code = "0";
--
Gitblit v1.9.1