From f187e2cfc181982090b6ab0e8458113dba6ad47b Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 13 九月 2024 11:30:00 +0800
Subject: [PATCH] 1.取样单增加打印功能 2.模具/设备的pda点检:两条进行提示,一条自动带出点检内容 3.设备工艺参数趋势图:根据流转卡的子表进站出站时间查询工艺参数(增加一个选择框 采集来源:(设备采集,手动输入))

---
 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