排程产品名称显示

application/api/controller/Facility.php

@@ -335,40 +335,40 @@ class Facility extends Api
             $this->error('参数错误');
         }
         $sql = "SELECT
-                rtrim( b.Gy0_gdbh ) AS gdbh,
-                rtrim(b.质量要求) AS 质量信息,
-                rtrim( b.Gy0_yjno ) AS yjno,
-                rtrim( b.Gy0_gxh ) AS gxh,
-                rtrim( b.Gy0_gxmc ) AS gxmc,
-                rtrim( b.Add_gxmc ) AS add_gxmc,
-                rtrim( b.Gy0_辅助工时 ) AS 装版时数,
-                rtrim( b.Gy0_小时产能 ) AS 工序产能,
-                rtrim( b.Gy0_生产工时 ) AS 计划工时,
-                rtrim( b.Gy0_sj1 ) AS sj1,
-                rtrim( b.Gy0_sj2 ) AS sj2,
-                rtrim(b.工序备注) AS 排产备注,
+                rtrim( a.Gy0_gdbh ) AS gdbh,
+                rtrim(a.质量要求) AS 质量信息,
+                rtrim( a.Gy0_yjno ) AS yjno,
+                rtrim( a.Gy0_gxh ) AS gxh,
+                rtrim( a.Gy0_gxmc ) AS gxmc,
+                rtrim( a.Add_gxmc ) AS add_gxmc,
+                rtrim( a.Gy0_辅助工时 ) AS 装版时数,
+                rtrim( a.Gy0_小时产能 ) AS 工序产能,
+                rtrim( a.Gy0_生产工时 ) AS 计划工时,
+                rtrim( a.Gy0_sj1 ) AS sj1,
+                rtrim( a.Gy0_sj2 ) AS sj2,
+                rtrim(a.工序备注) AS 排产备注,
                 RTRIM(d.yj_yjmc) AS 印件名称,
-                RTRIM(a.Gd_cpmc) AS 产品名称,
-                RTRIM(a.成品代号) AS 产品代号,
+                RTRIM(b.Gd_cpmc) AS 产品名称,
+                RTRIM(b.成品代号) AS 产品代号,
                 SUM(E.sczl_cl) AS 已完成,
-                rtrim(b.Gy0_计划接货数) AS 计划接货数,
-                RTRIM(b.Gy0_ls) AS ls ,
-                rtrim(b.Gy0_班次安排) AS 班组,
-                rtrim(b.UniqId) AS UniqId,
-                rtrim(b.Gy0_最早开工时间) AS 最早开工时间
+                rtrim(a.Gy0_计划接货数) AS 计划接货数,
+                RTRIM(a.Gy0_ls) AS ls ,
+                rtrim(a.Gy0_班次安排) AS 班组,
+                rtrim(a.UniqId) AS UniqId,
+                rtrim(a.Gy0_最早开工时间) AS 最早开工时间
             FROM
-                `工单_基本资料` AS a
-                JOIN `工单_工艺资料` AS b ON a.Gd_gdbh = b.Gy0_gdbh 
-                JOIN `工单_印件资料` AS d ON a.Gd_gdbh = d.Yj_Gdbh
-                LEFT JOIN `设备_产量计酬` AS e ON e.sczl_gdbh = a.Gd_gdbh AND e.sczl_yjno = b.Gy0_yjno AND e.sczl_gxh = b.Gy0_gxh
+                `工单_工艺资料` AS a
+                JOIN `工单_印件资料` AS d ON a.Gy0_gdbh = d.Yj_Gdbh AND d.yj_Yjno = a.Gy0_yjno
+                JOIN `工单_基本资料` AS b ON b.Gd_gdbh = a.Gy0_gdbh AND b.Gd_cpdh = d.yj_Yjdh
+                LEFT JOIN `设备_产量计酬` AS e ON e.sczl_gdbh = a.Gy0_gdbh AND e.sczl_yjno = a.Gy0_yjno AND e.sczl_gxh = a.Gy0_gxh
             WHERE
-                a.gd_statu = '2-生产中' 
-                AND b.Gy0_sbbh LIKE '%{$machine}%' 
-                AND b.PD_WG = '1900-01-01 00:00:00' 
-                AND b.Gy0_sj1 <> '1900-01-01 00:00:00'
-                AND b.Gy0_sj1 < '2099-01-01 00:00:00' 
-            GROUP BY a.Gd_gdbh,b.Gy0_yjno, b.Gy0_gxh
-            ORDER BY b.Gy0_sj1";
+                b.gd_statu = '2-生产中' 
+                AND a.Gy0_sbbh LIKE '%{$machine}%' 
+                AND a.PD_WG = '1900-01-01 00:00:00' 
+                AND a.Gy0_sj1 <> '1900-01-01 00:00:00'
+                AND a.Gy0_sj1 < '2099-01-01 00:00:00' 
+            GROUP BY a.Gy0_gdbh,a.Gy0_yjno,a.Gy0_gxh
+            ORDER BY a.Gy0_sj1";
         $orderList = Db::query($sql);
         if (empty($orderList)){
             $this->success('未找到排产工单');