From ba20f4bd2d4abca6fca80d88235095ec0a0a1cea Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 05 十二月 2022 00:58:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
index 7cb277f..2f592ec 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -321,6 +322,19 @@
string HBarCodeForBase = list[0].HBarCodeForBase;
long HDeptID = list[0].HDeptID;
long HProcID = list[0].HProcID;
+ int HUSEORGID = list[0].HUSEORGID;
+
+
+
+ long HWorkCenterID = list[0].HWorkCenterID; //宸ヤ綔涓績
+
+ long HBadWHID = list[0].HBadWHID; //涓嶈壇浠撳簱
+ long HWasterWHID = list[0].HWasterWHID; //鎶ュ簾浠撳簱
+ long HBadCountDevelopWHID = list[0].HBadCountDevelopWHID; //鐮斿彂涓嶈壇鍝佷粨搴�
+ long HWWBadWHID = list[0].HWWBadWHID; //濮斿涓嶈壇浠撳簱
+ long HWWWasterWHID = list[0].HWWWasterWHID; //濮斿鎶ュ簾浠撳簱
+ long HWHID = list[0].HWHID; //鑹搧浠撳簱
+
//鍒ゆ柇鏉冮檺
//if (!ClsPub.Security_Log("Gy_Process_Edit", 1, false, msg3))
@@ -358,12 +372,14 @@
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
- ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote) " +
+ ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote" +
+ ",HUSEORGID,HWorkCenterID,HBadWHID,HWasterWHID,HBadCountDevelopWHID,HWWBadWHID,HWWWasterWHID,HWHID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
"," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "','" + HSNo.ToString() +
"'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID +
",'" + HBarCode + "'," + HProcessID_K3 + ",'" +HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
- ",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ ",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "'" +
+ ","+ HUSEORGID + "," + HWorkCenterID + "," + HBadWHID + "," + HWasterWHID + "," + HBadCountDevelopWHID + "," + HWWBadWHID + "," + HWWWasterWHID + "," + HWHID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
@@ -394,6 +410,13 @@
",HFixPrice= " + HFixPrice +
",HOverFixPrice= " + HOverFixPrice +
",HProcMulID= " + HProcMulID +
+ ",HWorkCenterID= " + HWorkCenterID +
+ ",HBadWHID= " + HBadWHID +
+ ",HWasterWHID= " + HWasterWHID +
+ ",HBadCountDevelopWHID= " + HBadCountDevelopWHID +
+ ",HWWBadWHID= " + HWWBadWHID +
+ ",HWWWasterWHID= " + HWWWasterWHID +
+ ",HWHID= " + HWHID +
",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -428,6 +451,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//鏌ョ湅鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Gy_Process_Query", 1, false, user))
{
@@ -449,12 +473,21 @@
ds = oCN.RunProcReturn(sql, "h_v_Gy_ProcessList");
}
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
//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
--
Gitblit v1.9.1