From 633a573ec886a2e2411480163f91091cf2b28cd0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 09:31:17 +0800
Subject: [PATCH] 合并冲突

---
 WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
index 2d264f4..1729c44 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -697,6 +697,18 @@
                 if (HItemID == 0)
                 {
                     oCN.BeginTran();
+                    //鍒ゆ柇浠g爜鏄惁閲嶅
+                    DataSet dss;
+                    dss = oCN.RunProcReturn("select * from Gy_WorkCenter where HNumber='" + HNumber + "'", "Gy_WorkCenter");
+                    //鍒ゆ柇鏄惁鍙紪杈�
+                    if (dss.Tables[0].Rows.Count != 0)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁浠g爜閲嶅涓嶅厑璁告柊澧�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
                     //淇濆瓨鍓嶆帶鍒�=========================================      
                     string sql1 = "exec h_p_Gy_WorkCenter_BeforeSaveCtrl " + HMaker + ",'" + 1 + "'";
                     ds = oCN.RunProcReturn(sql1, "h_p_Gy_WorkCenter_BeforeSaveCtrl");
@@ -767,7 +779,18 @@
                 {
                     //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
                     oCN.BeginTran();
-
+                    //宸插鏍镐笉鍏佽淇敼
+                    DataSet dss;
+                    dss = oCN.RunProcReturn("select * from Gy_WorkCenter where HItemID=" + HItemID, "Gy_WorkCenter");
+                    //鍒ゆ柇鏄惁鍙紪杈�
+                    if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
                     //淇濆瓨鍓嶆帶鍒�=========================================      
                     string sql1 = "exec h_p_Gy_WorkCenter_BeforeSaveCtrl " + HMaker + ",'" + 1 + "'";
                     ds = oCN.RunProcReturn(sql1, "h_p_Gy_WorkCenter_BeforeSaveCtrl");

--
Gitblit v1.9.1