From 8a29c0f8babf1f9e2d3c21c344bce4180d5f20a5 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 19 一月 2026 16:04:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs
index fdba6e0..d877a7d 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs
@@ -353,27 +353,31 @@
if (newPallet <= 0)
return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
- // 妫�鏌ユ槸鍚﹀凡瀹℃牳
+
string checkAuditSql = $@"
- SELECT COUNT(*) as HasAudit
- FROM Sc_MouldInRequestBillMain
- WHERE HInterID = {hmainid}
- AND HChecker IS NOT NULL
- AND HCheckDate IS NOT NULL";
+ SELECT HBillStatus
+ FROM Sc_MouldInRequestBillMain
+ WHERE HInterID = {hmainid}";
DataSet dsAudit = oCn.RunProcReturn(checkAuditSql, "CheckAudit");
if (dsAudit != null && dsAudit.Tables[0].Rows.Count > 0)
{
- int hasAudit = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HasAudit"]);
- if (hasAudit > 0)
+ int hBillStatus = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HBillStatus"]);
+
+ if (hBillStatus == 2)
{
return new { code = "0", count = 0, Message = "鍗曟嵁宸插鏍革紝涓嶈兘淇敼鎵樻暟锛�" };
}
}
+ else
+ {
+ return new { code = "0", count = 0, Message = "鍗曟嵁涓嶅瓨鍦紒" };
+ }
+
// 鐩存帴鏇存柊鎵樻暟
string updateSql = $@"
- UPDATE Sc_MouldInRequestBillMain
+ UPDATE Sc_MouldInRequestBillMain
SET HPackQtys = {newPallet}
WHERE HInterID = {hmainid}";
--
Gitblit v1.9.1