包装计划卡控产成品改成产成品交接数据

wwwroot/mes/mst/packingform/packingform.ashx

@@ -513,8 +513,8 @@ public class packingform : IHttpHandler, IReadOnlySessionState
                                                                     AND PP.LOGOID = @LOGOID@
                                                                     AND PP.BEGINTIME <= SYSDATE
                                                                     AND PP.ENDTIME > SYSDATE AND PP.CONTROLRANGE = 2 AND PP.VALUEFLAG = 1) PLANS1 ON PLANS1.GOODSID = FP.GOODSID AND PLANS1.LOGOID = FP.LOGOID
-                                                        WHERE  FP.CREATETIME >= PLANS1.BEGINTIME
-                                                        AND FP.CREATETIME < PLANS1.ENDTIME
+                                                        WHERE  FP.FHTIME >= PLANS1.BEGINTIME
+                                                        AND FP.FHTIME < PLANS1.ENDTIME
                                                         AND FP.VALUEFLAG = 1
                                                         AND NOT EXISTS (SELECT S.BARCODE
                                                                         FROM TP_PM_LOGOCHANGEDRECORD S
@@ -634,8 +634,8 @@ public class packingform : IHttpHandler, IReadOnlySessionState
                                                                     AND PP.LOGOID = @LOGOID@
                                                                     AND PP.BEGINTIME <= SYSDATE
                                                                     AND PP.ENDTIME > SYSDATE AND PP.CONTROLRANGE = 2 AND PP.VALUEFLAG = 1) PLANS1 ON PLANS1.GOODSID = FP.GOODSID AND PLANS1.LOGOID = FP.LOGOID
-                                                        WHERE  FP.CREATETIME >= PLANS1.BEGINTIME
-                                                        AND FP.CREATETIME < PLANS1.ENDTIME
+                                                        WHERE  FP.FHTIME >= PLANS1.BEGINTIME
+                                                        AND FP.FHTIME < PLANS1.ENDTIME
                                                         AND FP.VALUEFLAG = 1
                                                         AND NOT EXISTS (SELECT S.BARCODE
                                                                         FROM TP_PM_LOGOCHANGEDRECORD S
@@ -1317,8 +1317,8 @@ public class packingform : IHttpHandler, IReadOnlySessionState
                                                                     AND PP.LOGOID = @LOGOID@
                                                                     AND PP.BEGINTIME <= SYSDATE
                                                                     AND PP.ENDTIME > SYSDATE AND PP.CONTROLRANGE = 2 AND PP.VALUEFLAG = 1) PLANS1 ON PLANS1.GOODSID = FP.GOODSID AND PLANS1.LOGOID = FP.LOGOID
-                                                        WHERE  FP.CREATETIME >= PLANS1.BEGINTIME
-                                                        AND FP.CREATETIME < PLANS1.ENDTIME
+                                                        WHERE  FP.FHTIME >= PLANS1.BEGINTIME
+                                                        AND FP.FHTIME < PLANS1.ENDTIME
                                                         AND FP.VALUEFLAG = 1
                                                         AND NOT EXISTS (SELECT S.BARCODE
                                                                         FROM TP_PM_LOGOCHANGEDRECORD S
@@ -1444,8 +1444,8 @@ public class packingform : IHttpHandler, IReadOnlySessionState
                                                                     AND PP.LOGOID = @LOGOID@
                                                                     AND PP.BEGINTIME <= SYSDATE
                                                                     AND PP.ENDTIME > SYSDATE AND PP.CONTROLRANGE = 2 AND PP.VALUEFLAG = 1) PLANS1 ON PLANS1.GOODSID = FP.GOODSID AND PLANS1.LOGOID = FP.LOGOID
-                                                        WHERE  FP.CREATETIME >= PLANS1.BEGINTIME
-                                                        AND FP.CREATETIME < PLANS1.ENDTIME
+                                                        WHERE  FP.FHTIME >= PLANS1.BEGINTIME
+                                                        AND FP.FHTIME < PLANS1.ENDTIME
                                                         AND FP.VALUEFLAG = 1
                                                         AND NOT EXISTS (SELECT S.BARCODE
                                                                         FROM TP_PM_LOGOCHANGEDRECORD S

wwwroot/mes/pc/productionPlanReport/productionPlanReport.ashx

@@ -78,14 +78,14 @@ FROM (
                 WHEN 2 THEN '包装'
             END AS 控制范围,
             pp.xuhao as 顺序,
-            -- 包装数量（优化后的相关子查询）
+            -- 产成品交接数量（优化后的相关子查询）
             (SELECT COUNT(DISTINCT fp.barcode)
              FROM tp_pm_finishedproduct fp
              WHERE fp.goodsid = pp.goodsid 
                AND fp.logoid = pp.logoid
-               AND fp.createtime >= pp.begintime
-               AND fp.createtime < pp.endtime
-               AND fp.valueflag = 1) AS 包装数量,
+               AND fp.Fhtime >= pp.begintime
+               AND fp.Fhtime < pp.endtime
+               AND fp.valueflag = 1 AND fp.Fhusercode IS NOT NULL) AS 包装数量,
             -- 商标切换统计（优化后的相关子查询）
             (SELECT COUNT(DISTINCT lc.barcode)
              FROM date_range dr,