Merge branch 'master' of https://git.7in6.com/Minong/mes-server-api

application/api/controller/WorkOrder.php

@@ -255,4 +255,44 @@ class WorkOrder extends Api
         }
         $this->success('成功',$list);
     }
+
+
+    /**
+     * 编辑页面展示
+     * @ApiMethod (GET)
+     * @param string $workOrder   工单编号
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function DataCorrection()
+    {
+        if ($this->request->isGet() === false){
+            $this->error('请求错误');
+        }
+        $workOrder = input('Gd_gdbh');
+        if (empty($workOrder)){
+            $this->error('参数错误');
+        }
+        $field = 'rtrim(Gd_lx) as 重点工单,rtrim(Gd_gdbh) as 工单编号,rtrim(Gd_生产分类) as 生产类型,rtrim(Gd_khdh) as 客户代号,rtrim(Gd_客户名称) as 客户名称,
+        rtrim(Gd_cpdh) as 产品代号,rtrim(Gd_cpmc) as 产品名称,rtrim(开单日期) as 开单日期,rtrim(订单数量) as 订单数量,rtrim(交货日期) as 交货日期,
+        rtrim(投料率) as 投料率,rtrim(实际投料) as 万小张,rtrim(计量单位) as 单位,rtrim(投料大箱) as 投料大箱,rtrim(排产时库存) as 库存大箱,rtrim(警语版面) as 警语版面,
+        rtrim(销售订单号) as 销售订单号,rtrim(产品版本号) as 版本号,rtrim(客户ERP编码) as 客户ERP编码,rtrim(码源数量) as 码源数量,rtrim(进程备注) as 进程备注,rtrim(Gd_desc) as 备注';
+        $list = Db::table('工单_基本资料')->where('Gd_gdbh',$workOrder)->field($field)->find();
+        if (empty($list)){
+            $this->error('未找到该工单信息');
+        }
+        $printData = Db::table('工单_印件资料')
+            ->where('Yj_Gdbh',$workOrder)
+            ->field('rtrim(yj_yjmc) as 印件名称,rtrim(yj_Yjdh) as 印件代号,rtrim(yj_平张投料) as 平张投料')
+            ->find();
+        if (empty($printData)){
+            $this->error('未找到该工单印件资料');
+        }
+        $list['印件名称'] = $printData['印件名称'];
+        $list['印件代号'] = $printData['印件代号'];
+        $list['平张投料'] = $printData['平张投料'];
+        $this->success('成功',$list);
+    }
 }