From 1e5c4412216cdba315ab37ebc8e85644f39a7df1 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 11 七月 2025 16:50:02 +0800
Subject: [PATCH] PDA校验扫描物料条码方法修改，增加校验模块免扫物料条码系统参数
---
WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs b/WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs
index 7964e88..63e4918 100644
--- a/WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs
@@ -247,6 +247,7 @@
DateTime HMakeTime = list[0].HMakeTime;
string HMakeEmp = list[0].HMakeEmp;
+
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
objJsonResult.code = "0";
@@ -323,7 +324,9 @@
DateTime HMakeTime = list[0].HMakeTime;
string HMakeEmp = list[0].HMakeEmp;
long HUSEORGID = list[0].HUSEORGID;
- long HCREATEORGID = list[0].HCREATEORGID;
+ long HCREATEORGID = list[0].HCREATEORGID;
+ long HUnitID = list[0].HUnitID;
+ long HClassID = list[0].HClassID;
//鍒ゆ柇鏉冮檺
if (!ClsPub.Security_Log("Gy_TechnologyParameter_Edit", 1, false, msg3))
@@ -343,6 +346,8 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+
//if (oDept.HavSameNumber(HItemID, HNumber))
//{
@@ -357,6 +362,8 @@
if (HItemID == 0)
{
oCN.BeginTran();
+
+
//淇濆瓨鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_TechnologyParameter_BeforeSaveCtrl " + HMakeEmp + ",'" + 1 + "'";
@@ -380,14 +387,25 @@
oCN.RollBack();
return objJsonResult;
}
+
+ string _sql = "select HItemID from Gy_TechnologyParameter where HNumber = N'" + HNumber + "'";
+ DataSet _ds = oCN.RunProcReturn(_sql, "Gy_TechnologyParameter");
+ if (_ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触: 宸ヨ壓浠ｇ爜閲嶅!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//==================================================================================
oCN.RunProc("Insert into Gy_TechnologyParameter " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID,HLevel" +
- ",HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HMakeEmp,HUSEORGID,HCREATEORGID) " +
+ ",HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HMakeEmp,HUSEORGID,HCREATEORGID, HClassID, HUnitID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID.ToString() +
- "','" + HLevel.ToString() + "','" + HEndFlag + "','" + HStopflag + "','" + HRemark + "','" + HUseFlag + "',getdate(),'" + HMakeEmp + "','" + HUSEORGID + "','" + HCREATEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ "','" + HLevel.ToString() + "','" + HEndFlag + "','" + HStopflag + "','" + HRemark + "','" + HUseFlag + "',getdate(),'" + HMakeEmp + "','" + HUSEORGID + "','" + HCREATEORGID + "','" + HClassID + "','" + HUnitID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
// Convert.ToString(HEndFlag ? 1 : 0); Convert.ToString(HStopflag ? 1 : 0);HUseFlag
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_TechnologyParameter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -461,6 +479,9 @@
",HUseFlag='" + HUseFlag + "'" +
",HModifyTime= getdate()" +
",HModifyEmp='" + HMakeEmp + "'" +
+ ",HClassID='" + HClassID + "'" +
+ ",HUnitID='" + HUnitID + "'" +
+ ",HUSEORGID='" + HUSEORGID + "'" +
",HRemark='" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1