From f90783cd8f0be70c660385e05c74b7f66a060197 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 22 七月 2025 13:29:29 +0800
Subject: [PATCH] 合并分支
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 4a38771..2784ca3 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -583,6 +583,18 @@
}
else
{
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Material where HItemID=" + oBill.oModel.HItemID, "Gy_Material");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
bResult = oBill.ModifyByID(oBill.oModel.HItemID);
}
if (bResult)
@@ -848,6 +860,7 @@
string msg2 = sArray[1].ToString();
string msg_HUSEORGID = sArray[2].ToString();
string msg_itemIdList = sArray[3].ToString();
+ string msg_UpdateInfo = sArray[4].ToString();
bool bResult = false;
Int64 HItemID = 0;
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -880,7 +893,7 @@
msg1 = msg1.Replace("\\", "");
msg1 = msg1.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_Gy_Material(msg1);
- JObject jobject = JObject.Parse(msg1);
+ JObject jobject = JObject.Parse(msg_UpdateInfo);
var paramStr = "";
foreach (var property in jobject.Properties())
{
@@ -889,10 +902,12 @@
// 鎷兼帴鏍煎紡: key=value
paramStr += string.Format("{0}='{1}',", key, value);
+ // 鍒犻櫎鏈�鍚庝竴涓�楀彿
+
}
- LogService.Write(paramStr);
+ paramStr = paramStr.Substring(0, paramStr.Length - 1);
- bResult = oBill.ModifyByIDListDynamic(msg_itemIdList, paramStr);
+ bResult = oBill.ModifyByIDListDynamic(msg_itemIdList, paramStr, lsmain);
if (bResult)
@@ -2650,6 +2665,7 @@
int HNowSPID = mainList[0].HNowSPID;
string HMouldUseStatus = mainList[0].HMouldUseStatus;
int HUSEORGID = mainList[0].HUSEORGID;
+ DateTime HNextMainDate = mainList[0].HNextMainDate;
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
@@ -2730,6 +2746,7 @@
",HNowWHID=" + HNowWHID +
",HNowSPID=" + HNowSPID +
",HInitLife='" + HInitLife +
+ ",HNextMainDate='" + HNextMainDate +
"',HMouldUseStatus='" + HMouldUseStatus +
"' where HInterID=" + HInterID.ToString());
@@ -2949,6 +2966,17 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID = " + hmainid + " and ISNULL(HChecker,'') <> ''", "Gy_MouldFileMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佸崟鎹凡瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
{
oCN.BeginTran();
--
Gitblit v1.9.1