From bb1d2ec526b451d8b8173fe7bb4020a0f106951f Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期三, 17 十二月 2025 13:18:26 +0800
Subject: [PATCH] 修复工序显示的问题，添加了动态显示列
---
WebAPI/Controllers/基础资料/基础资料/Gy_RepairBillController.cs | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs"
index 16f2414..c4e2f46 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs"
@@ -33,7 +33,7 @@
try
{
List<object> columnNameList = new List<object>();
- if (!DBUtility.ClsPub.Security_Log("Gy_Repair", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Gy_Repair_List", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -52,23 +52,12 @@
}
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
}
catch (Exception e)
{
@@ -339,10 +328,21 @@
return objJsonResult;
}
+ // 浠ｇ爜 闄ゅ幓鑷韩澶� 涓嶈兘閲嶅
+ var dsHNumberCheck = oCN.RunProcReturn($@"
+ select top 1 HItemID from Gy_Repair where HStopflag = 0 and HNumber = '{HNumber}' and HItemID != {HItemID}
+ ", "Gy_Repair");
+ if (dsHNumberCheck.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
-
//淇濆瓨鍓嶆帶鍒�=========================================
DataSet ds = oCN.RunProcReturn("Exec h_p_Gy_Repair_BeforeSaveCtrl " + msg3 + ",'1'", "h_p_Gy_Repair_BeforeSaveCtrl");
@@ -477,7 +477,19 @@
return objJsonResult;
}
+ // 浠ｇ爜涓嶈兘閲嶅
+ var dsHNumberCheck = oCN.RunProcReturn($@"
+ select top 1 HItemID from Gy_Repair where HStopflag = 0 and HNumber = '{HNumber}'
+ ", "Gy_Repair");
+ if (dsHNumberCheck.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
@@ -991,10 +1003,10 @@
error += "娌℃湁鎵惧埌銆愮粍缁囧悕绉般�戠殑鏍囬,";
if (!tb2.Columns.Contains("缁翠慨椤圭洰浠ｇ爜"))
- error += "娌℃湁鎵惧埌銆愮偣妫�椤圭洰浠ｇ爜銆戠殑鏍囬,";
+ error += "娌℃湁鎵惧埌銆愮淮淇」鐩唬鐮併�戠殑鏍囬,";
if (!tb2.Columns.Contains("缁翠慨椤圭洰鍚嶇О"))
- error += "娌℃湁鎵惧埌銆愮偣妫�椤圭洰鍚嶇О銆戠殑鏍囬,";
+ error += "娌℃湁鎵惧埌銆愮淮淇」鐩悕绉般�戠殑鏍囬,";
if (error.Length > 0)
{
--
Gitblit v1.9.1