From e1cc2eabf9699c8fb601ff42cf8ce34ad536bc76 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 27 四月 2023 14:56:06 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
index 105b64e..4ee1994 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;
@@ -304,7 +305,7 @@
bool HTypeCount = list[0].HTypeCount;
string HDeptNumber = "";
long HLevel = ClsPub.GetLevel(list[0].HNumber.Trim());
- bool HEndFlag = false;
+ bool HEndFlag = true;
long HProcessID_K3 = list[0].HProcessID_K3;
string HBillSubType = list[0].HType;
bool HAutoTrunFlag = list[0].HAutoTrunFlag;
@@ -312,7 +313,7 @@
string HOverFixPrice = list[0].HOverFixPrice;
string HSNo = list[0].HSNo;
string HBarCode = list[0].HBarCode;
- string HProcMulID = list[0].HProcMulID;
+ string HProcMulID = list[0].HProcMulID==null?"0": list[0].HProcMulID;
string HProcCheckNote = list[0].HProcCheckNote;
string HRemark = list[0].HRemark;
bool HStopflag = list[0].HStopflag;
@@ -322,10 +323,18 @@
long HDeptID = list[0].HDeptID;
long HProcID = list[0].HProcID;
int HUSEORGID = list[0].HUSEORGID;
+ bool HTProcessFlag = list[0].HTProcessFlag;
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; //鑹搧浠撳簱
//鍒ゆ柇鏉冮檺
@@ -365,13 +374,13 @@
",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote" +
- ",HUSEORGID,HWorkCenterID) " +
+ ",HUSEORGID,HWorkCenterID,HBadWHID,HWasterWHID,HBadCountDevelopWHID,HWWBadWHID,HWWWasterWHID,HWHID,HTProcessFlag) " +
" 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) +
+ ",'" + HBarCode + "'," + HProcessID_K3 + ",'" + HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "'" +
- ","+ HUSEORGID + "," + HWorkCenterID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + HUSEORGID + "," + HWorkCenterID + "," + HBadWHID + "," + HWasterWHID + "," + HBadCountDevelopWHID + "," + HWWBadWHID + "," + HWWWasterWHID + "," + HWHID + "," + Convert.ToString(HTProcessFlag ? 1 : 0) + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
@@ -392,10 +401,11 @@
",HSNo= " + HSNo +
",HLevel= " + HLevel +
",HEndFlag= '" + HEndFlag + "'" +
+ ",HTProcessFlag= '" + HTProcessFlag + "'" +
",HStopflag= '" + HStopflag + "'" +
",HRemark='" + HRemark + "'" +
",HDeptID= " + HDeptID +
- ",HBarCodeForBase='" + HBarCodeForBase + "'" +
+ ",HBarCodeForBase='" + HBarCode + "'" +
",HProcessID_K3= " + HProcessID_K3 +
",HBillSubType='" + HBillSubType + "'" +
",HAutoTrunFlag= '" + HAutoTrunFlag + "'" +
@@ -403,6 +413,12 @@
",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);
@@ -437,6 +453,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//鏌ョ湅鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Gy_Process_Query", 1, false, user))
{
@@ -458,12 +475,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
@@ -525,7 +551,7 @@
return objJsonResult;
}
}
- /// <summary>Gy_Process/cx
+ /// <summary>
/// 宸ュ簭鍒楄〃鍒犻櫎鍔熻兘
/// </summary>
/// <returns></returns>
--
Gitblit v1.9.1