From 4ba9609d75b835d8d2ef361ca0fe68fa72dfe5e2 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期一, 14 十一月 2022 18:16:10 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/CJGL/ProductionPlanReportController.cs | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/WebAPI/Controllers/CJGL/ProductionPlanReportController.cs b/WebAPI/Controllers/CJGL/ProductionPlanReportController.cs index 81dd391..8585599 100644 --- a/WebAPI/Controllers/CJGL/ProductionPlanReportController.cs +++ b/WebAPI/Controllers/CJGL/ProductionPlanReportController.cs @@ -27,8 +27,11 @@ 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; } [Route("ProductionPlanReport/ProductionPlanReportList")] [HttpGet] @@ -40,7 +43,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}'", "h_p_Cj_ProductionPlanReportList"); objJsonResult.code = "1"; objJsonResult.count = 1; -- Gitblit v1.9.1