From 63610047f4921b0bdcb0042f54c5197b62746446 Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期二, 15 八月 2023 14:28:42 +0800 Subject: [PATCH] 异常工时申请单:添加子表重复校验,子表做颜色区分,子表单元格根据宽度隐藏内容,取消分页,添加合计行,根据职员带出工作中,取消上一行下一行 --- 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