超节损列表

application/api/controller/OrderSuperLoss.php

@@ -48,7 +48,8 @@ class OrderSuperLoss extends Api
                 WHERE   
                     a.jjcp_sj >= DATE_SUB(CURDATE(), INTERVAL 12 MONTH)  -- Direct date comparison  
                     AND (a.jjcp_smb IN ('末 板', '末板'))  -- Cleaner syntax for conditions  
-                    AND a.`成品编码` != ''   
+                    AND a.`成品编码` != ''
+                    AND a.jjcp_sj >= '2025-01-01 00:00:00'
                 GROUP BY   
                     DATE_FORMAT(a.jjcp_sj, '%Y-%m'),  -- Group by formatted date  
                     RTRIM(b.`编号`)   
@@ -1704,7 +1705,7 @@ class OrderSuperLoss extends Api
         b.`实际投料`,  
         b.`计量单位`,  
         DATE(a.jjcp_sj) AS warehousing_date,  
-        SUM(a.jjcp_sl) AS warehousing_num,  
+        `入仓数量` AS warehousing_num, 
         SUM(DISTINCT b.`计划损耗`) AS `工单计划损耗`,  
         b.`废品合计`,  
         SUM(b.`CjsJe`) AS reward_money,  
@@ -2025,23 +2026,23 @@ class OrderSuperLoss extends Api
 
 
     //循环插入超节损数据
-//    public function orderLossData()
-//    {
-//        $param = $this->request->param();
-//        $list = \db('成品入仓')
-//            ->alias('a')
-//            ->join('设备_产量计酬 b','a.jjcp_gdbh = b.sczl_gdbh AND a.jjcp_yjno = b.sczl_yjno')
-//            ->join('物料_收发记录 c','a.jjcp_gdbh = c.st_gdbh AND a.jjcp_cpdh = c.cpdh')
-//            ->where('a.jjcp_sj','like',$param['mouth'].'%')
-//            ->where('a.jjcp_smb','like','末%')
-//            ->field('a.jjcp_gdbh,a.jjcp_yjno')
-//            ->group('a.jjcp_gdbh,a.jjcp_yjno')
-//            ->select();
-//
-//        foreach ($list as $item){
-//            $this->OneOrderSuperLoss($item['jjcp_gdbh'],$item['jjcp_yjno']);
-//        }
-//    }
+    public function orderLossData()
+    {
+        $param = $this->request->param();
+        $list = \db('成品入仓')
+            ->alias('a')
+            ->join('设备_产量计酬 b','a.jjcp_gdbh = b.sczl_gdbh AND a.jjcp_yjno = b.sczl_yjno')
+            ->join('物料_收发记录 c','a.jjcp_gdbh = c.st_gdbh AND a.jjcp_cpdh = c.cpdh')
+            ->where('a.jjcp_sj','like',$param['mouth'].'%')
+            ->where('a.jjcp_smb','like','末%')
+            ->field('a.jjcp_gdbh,a.jjcp_yjno')
+            ->group('a.jjcp_gdbh,a.jjcp_yjno')
+            ->select();
+
+        foreach ($list as $item){
+            $this->OneOrderSuperLoss($item['jjcp_gdbh'],$item['jjcp_yjno']);
+        }
+    }
 }