From 5286b614c84f8f82f81772cdb32c2dc5a0d26e0f Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 28 十一月 2025 16:59:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
index 5c8e537..3ff72c3 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
@@ -363,7 +363,7 @@
",'"+ HLevel + "','0','" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "','"+ HUseFlag + "','"+ HQCCheckClassID + "','" + HDefaultResult +
"','" + HAnalysisMethod + "','" + HDefectLevel + "'," + HUnitID + "," + HDestructInspect + "," + HKeyInspect + "," + HQualityStdID +
"," + HInspectMethodID + "," + HInspectInstruMentID + "," + HInspectBasisID + "," + HSampleSchemeID + "," + HISsystemSet + "" +
- ",'" + HMakeEmp + "',getdate()," + HUSEORGID + "," + HCREATEORGID + ")");
+ ",'" + HMakeEmp + "',getdate(),'" + HUSEORGID + "','" + HCREATEORGID + "')");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
if (list[0].HItemID.ToString() != "")
{
@@ -1536,13 +1536,13 @@
{
res.code = CodeConstant.FAIL;
res.count = CountConstant.FAIL;
- res.Message = "绗�" + line + "琛�,妫�楠岄」鐩笉瀛樺湪锛�";
+ res.Message = "绗�" + line + "琛�,妫�楠岄」鐩垎绫讳笉瀛樺湪锛�";
res.data = null;
return res;
}
else
{
- provisional.Rows[i]["HQCCheckClassID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ provisional.Rows[i]["HQCCheckClassID"] = checkClass.Tables[0].Rows[0]["HItemID"].ToString();
}
}
else
@@ -1681,8 +1681,9 @@
if (ds.Tables[0].Rows.Count == 0)
{
- string sql = "insert into Gy_QCCheckItem (HName,HNumber,HUSEORGID,HCREATEORGID,HShortNumber,HQCCheckClassID,HLevel,HHelpCode,HParentID,HStopflag,HUseFlag,HRemark, HMakeTime,HMakeEmp)" +
- $"values('{HName}', '{HNumber}', {HUSEORGID}, {HUSEORGID}, '{sShortNumber}','{HQCCheckClassID}',{HLevel},'',0,0,'鏈娇鐢�','{HRemark}', '{System.DateTime.Now.ToString("G")}', '{user}')";
+ string sql = "insert into Gy_QCCheckItem (HName,HNumber,HUSEORGID,HCREATEORGID,HShortNumber,HQCCheckClassID,HLevel,HEndFlag,HHelpCode,HParentID,HStopflag,HUseFlag,HAnalysisMethod,HDefaultResult,HDefectLevel,HRemark, HMakeTime,HMakeEmp)" +
+ $"values('{HName}', '{HNumber}', {HUSEORGID}, {HUSEORGID}, '{sShortNumber}','{HQCCheckClassID}',{HLevel},1,'',0,0,'鏈娇鐢�','1','鍚堟牸','3','{HRemark}','{System.DateTime.Now.ToString("G")}', '{user}')";
+ LogService.Write(sql);
oCN.RunProc(sql);
}
else
--
Gitblit v1.9.1