From be6c4a362a7dec697733cf07734f441e58dff46d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 06 八月 2024 17:30:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CJGL/ProductionPlanReportController.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/ProductionPlanReportController.cs b/WebAPI/Controllers/CJGL/ProductionPlanReportController.cs
index 81dd391..49fccb7 100644
--- a/WebAPI/Controllers/CJGL/ProductionPlanReportController.cs
+++ b/WebAPI/Controllers/CJGL/ProductionPlanReportController.cs
@@ -27,8 +27,13 @@
public DateTime HEndDate;
public string HICMOBillNo;
public string HWorkShopID;
- public string HSeOrderBillNo;
+ public string F_BSV_WYID;
+ public string HBillNo;
public string HMaterNumber;
+ public int IsTrue;
+ public int HState;
+ public int HSTATUS;
+ public string sWhere1;
}
[Route("ProductionPlanReport/ProductionPlanReportList")]
[HttpGet]
@@ -40,7 +45,7 @@
ProductionPlanReport com = JsonConvert.DeserializeObject<ProductionPlanReport>(sWhere.ToString());
ds = oCN.RunProcReturn($"exec h_p_Cj_ProductionPlanReportList {com.HOrgID},'{com.HBeginDate}','{com.HEndDate}'" +
- $",'{com.HICMOBillNo}',{com.HWorkShopID},'{com.HSeOrderBillNo}','{com.HMaterNumber}'", "h_p_Cj_ProductionPlanReportList");
+ $",'{com.HICMOBillNo}',{com.HWorkShopID},'{com.F_BSV_WYID}','{com.HMaterNumber}','{com.HBillNo}',{com.IsTrue},'{com.HState}','{com.HSTATUS}','{com.sWhere1}'", "h_p_Cj_ProductionPlanReportList");
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1