From ae6a3504b8d2bec8b036a8087ca4cf808dc852ae Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 01 四月 2023 10:41:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
index 2f592ec..d616eeb 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -305,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;
@@ -313,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;
@@ -403,7 +403,7 @@
",HStopflag= '" + HStopflag + "'" +
",HRemark='" + HRemark + "'" +
",HDeptID= " + HDeptID +
- ",HBarCodeForBase='" + HBarCodeForBase + "'" +
+ ",HBarCodeForBase='" + HBarCode + "'" +
",HProcessID_K3= " + HProcessID_K3 +
",HBillSubType='" + HBillSubType + "'" +
",HAutoTrunFlag= '" + HAutoTrunFlag + "'" +
@@ -549,7 +549,7 @@
return objJsonResult;
}
}
- /// <summary>Gy_Process/cx
+ /// <summary>
/// 宸ュ簭鍒楄〃鍒犻櫎鍔熻兘
/// </summary>
/// <returns></returns>
--
Gitblit v1.9.1