同步优化

application/api/controller/Facility.php

@@ -360,7 +360,7 @@ class Facility extends Api
                 `工单_基本资料` 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_jtbh = b.Gy0_sbbh
+                LEFT JOIN `设备_产量计酬` AS e ON e.sczl_gdbh = a.Gd_gdbh AND e.sczl_jtbh = b.Gy0_sbbh AND e.sczl_yjno = b.Gy0_yjno AND e.sczl_gxh = b.Gy0_gxh
             WHERE
                 a.gd_statu = '2-生产中' 
                 AND b.Gy0_sbbh = '{$machine}' 

application/api/controller/Synchronization.php

@@ -557,7 +557,7 @@ class Synchronization extends Api
         $i = 0;
         foreach ($OrganizationalDataList as $key=>$value){
             $code = substr($value['物料代码'],0,3);
-            if ($code === 'Y10' || $code === 'Y14'){
+            if ($code === 'Y10' || $code === 'Y14' || $code === 'Y12'){
                 //插入产品资料
                 $productData = \db('产品_基本资料')
                     ->where('产品编号',$value['物料代码'])