From 2ba5117206c152cece2e5ac40067a6232dfb2870 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:12:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebApi/Gs.Ww/WWTBlDJManager.cs | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/WebApi/Gs.Ww/WWTBlDJManager.cs b/WebApi/Gs.Ww/WWTBlDJManager.cs
index fc54f1e..f9056f4 100644
--- a/WebApi/Gs.Ww/WWTBlDJManager.cs
+++ b/WebApi/Gs.Ww/WWTBlDJManager.cs
@@ -145,6 +145,44 @@
dynamic m = new ExpandoObject();
m.outSum = -1;
m.outMsg = "";
+ // 褰撳鏍告椂锛坃inFieldValue涓�"1"鏃讹級妫�鏌ヤ粨搴�
+ if (_inFieldValue == "1")
+ {
+ try
+ {
+ string warehouseCheckSql = @"
+ SELECT COUNT(1)
+ FROM MES_INV_ITEM_IN_C_DETAILS b
+ LEFT JOIN MES_INV_ITEM_INS h ON h.GUID = b.ITEM_IN_ID
+ LEFT JOIN (
+ SELECT h.ORDER_NO, b1.MATERIAL_CODE, b1.WAREHOUSE, h.ERP_PRODUCTION_ORDER_NO
+ FROM PRODUCTION_ORDER_SUB b1
+ LEFT JOIN PRODUCTION_ORDER h ON h.ERP_PRODUCTION_ENTRY_CODE = b1.ERP_PRODUCTION_ENTRY_CODE
+ ) d ON h.work_no = d.ERP_PRODUCTION_ORDER_NO AND d.MATERIAL_CODE = b.item_id
+ WHERE b.item_in_id = @inFieldValue
+ AND (d.WAREHOUSE IS NULL OR d.WAREHOUSE = '' OR d.WAREHOUSE = '0')";
+
+ var parameters = new[] {
+ new SqlParameter("@inFieldValue", _guid)
+ };
+
+ var emptyWarehouseCount = DbHelperSQL.GetSingle(warehouseCheckSql, parameters);
+
+ if (emptyWarehouseCount != null && Convert.ToInt32(emptyWarehouseCount) > 0)
+ {
+ m.outSum = -1;
+ m.outMsg = "瀵瑰簲鐨勫澶栧崟鐨勪粨搴撲负绌猴紝鏃犳硶瀹℃牳锛�";
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Exception, m.outMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), "浠撳簱妫�鏌ュけ璐ワ細" + ex.Message);
+ m.outSum = -1;
+ m.outMsg = "浠撳簱妫�鏌ュけ璐ワ細" + ex.Message;
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Exception, m.outMsg);
+ }
+ }
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand("prc_ww_tbldj_Submit", conn))
--
Gitblit v1.9.3