优化接口请求方式

application/api/controller/Machine.php

@@ -25,7 +25,7 @@ class Machine extends Api
     /**
      *工种定额及比例管理接口
      *
-     * @ApiMethod POST
+     * @ApiMethod GET
      *@params string department
     */
     public function getMachineInfo(){

application/api/controller/Product.php

@@ -95,10 +95,13 @@ class Product extends Api
             $this->error('参数不能为空');
         }
         //工艺资料
-        $option['Gy0_cpdh'] = $code;
-        $gy_field = 'rtrim(Gy0_方案) as 方案,Gy0_yjno,Gy0_gxh,rtrim(gy0_gxmc) as gy0_gxmc,rtrim(Add_gxmc) as add_gxmc,Gy0_Ks,Gy0_ls,rtrim(工序备注) as 备注,工价系数,损耗系数,Gy0_Ms,
-                     人工检_正品板,人工检_次品板,人工检_废检,机检_正品板,机检_次品板,机检_废检,rtrim(Gy0_sbmc) as Gy0_sbmc,rtrim(Sys_id) as Sys_id,Sys_rq,Mod_rq';
-        $gyRes = Db::name('产品_工艺资料')->where($option)->field($gy_field)->order('Gy0_gxh asc')->select();
+        $option['a.Gy0_cpdh'] = $code;
+        $gy_field = 'rtrim(a.Gy0_方案) as 方案,a.Gy0_yjno,a.Gy0_gxh,rtrim(a.gy0_gxmc) as gy0_gxmc,rtrim(a.Add_gxmc) as add_gxmc,a.Gy0_Ks,a.Gy0_ls,rtrim(a.工序备注) as 备注,
+        a.工价系数,a.损耗系数,a.Gy0_Ms,a.人工检_正品板,a.人工检_次品板,a.人工检_废检,a.机检_正品板,a.机检_次品板,a.机检_废检,rtrim(a.Gy0_sbmc) as Gy0_sbmc,rtrim(a.Sys_id) as Sys_id,
+        a.Sys_rq,a.Mod_rq,b.sys_rate0 as 基础损耗,b.sys_rate1 as 损耗率';
+        $gyRes = Db::name('产品_工艺资料')->alias('a')
+            ->join('dic_lzsh b','a.Gy0_shdh = b.sys_bh','left')
+            ->where($option)->field($gy_field)->order('a.Gy0_yjno asc,a.Gy0_gxh asc')->select();
         //印件资料
         $where['yj_cpdh'] = $code;
         $field = 'yj_yjno,rtrim(yj_yjdh) as yj_yjdh,yj_yjmc,rtrim(yj_zzdh) as yj_zzdh,rtrim(yj_zzmc) as yj_zzmc,rtrim(yj_tlgg) as yj_tlgg,