From 29b96ccc6047d2234aa042bb38f1c1e0b5505901 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期一, 19 一月 2026 15:43:51 +0800
Subject: [PATCH] 托数问题修复
---
WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs | 23 +++++++----
WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs | 22 ++++++----
WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs | 21 ++++++----
WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs | 19 ++++++---
4 files changed, 52 insertions(+), 33 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}";
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs
index 6d28daa..ff7017c 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs
@@ -503,6 +503,7 @@
#region 鍣ㄥ叿鍑哄簱鐢宠鍗� - 鎵樻暟鍙樻洿鍔熻兘
[Route("Sc_MouldOutRequestBillController/UpdatePallet")]
[HttpPost]
+
public object UpdatePallet([FromBody] JObject data)
{
try
@@ -517,24 +518,28 @@
if (newPallet <= 0)
return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
- // 妫�鏌ユ槸鍚﹀凡瀹℃牳
+
string checkAuditSql = $@"
- SELECT COUNT(*) as HasAudit
+ SELECT HBillStatus
FROM Sc_MouldOutRequestBillMain
- WHERE HInterID = {hmainid}
- AND HChecker IS NOT NULL
- AND HCheckDate IS NOT NULL";
+ 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"]);
+ // 鉁� 姝ｇ‘鐨勫垽鏂細HBillStatus = 2 琛ㄧず宸插鏍�
+ if (hBillStatus == 2)
{
return new { code = "0", count = 0, Message = "鍗曟嵁宸插鏍革紝涓嶈兘淇敼鎵樻暟锛�" };
}
}
+ else
+ {
+ return new { code = "0", count = 0, Message = "鍗曟嵁涓嶅瓨鍦紒" };
+ }
+
// 鐩存帴鏇存柊鎵樻暟
string updateSql = $@"
UPDATE Sc_MouldOutRequestBillMain
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs
index 56b38a8..c5f9787 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs
@@ -398,6 +398,7 @@
#region 鍣ㄥ叿棰嗙敤閫�搴撳崟 - 鎵樻暟鍙樻洿鍔熻兘
[Route("Sc_MouldProdBackBillController/UpdatePallet")]
[HttpPost]
+
public object UpdatePallet([FromBody] JObject data)
{
try
@@ -412,27 +413,31 @@
if (newPallet <= 0)
return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
- // 妫�鏌ユ槸鍚﹀凡瀹℃牳
+
string checkAuditSql = $@"
- SELECT COUNT(*) as HasAudit
+ SELECT HBillStatus
FROM Sc_MouldStockBillMain
- WHERE HInterID = {hmainid}
- AND HChecker IS NOT NULL
- AND HCheckDate IS NOT NULL";
+ 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_MouldStockBillMain
+ UPDATE Sc_MouldStockBillMain
SET HPackQtys = {newPallet}
WHERE HInterID = {hmainid}";
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs
index 4038d9b..9e86f3a 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs
@@ -339,6 +339,7 @@
#region 鍣ㄥ叿棰嗙敤鍑哄簱鍗� - 鎵樻暟鍙樻洿鍔熻兘
[Route("Sc_MouldProdOutBill/UpdatePallet")]
[HttpPost]
+
public object UpdatePallet([FromBody] JObject data)
{
try
@@ -353,24 +354,28 @@
if (newPallet <= 0)
return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
- // 妫�鏌ユ槸鍚﹀凡瀹℃牳
+
string checkAuditSql = $@"
- SELECT COUNT(*) as HasAudit
- FROM Sc_MouldStockBillMain
- WHERE HInterID = {hmainid}
- AND HChecker IS NOT NULL
- AND HCheckDate IS NOT NULL";
+ SELECT HBillStatus
+ FROM Sc_MouldStockBillMain
+ 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_MouldStockBillMain
--
Gitblit v1.9.1