mes优化

application/api/controller/EmployeeDailySalary.php

@@ -53,8 +53,7 @@ class EmployeeDailySalary extends Api
             usort($data[$k], function($a, $b) {
                 $order = array(
                     '胶印车间',
-                    '凹印车间',
-                    '丝印车间',
+                    '凹丝印车间',
                     '模切车间',
                     '检验车间',
                     '精品试验车间',

application/api/controller/Facility.php

@@ -99,7 +99,7 @@ class Facility extends Api
         rtrim(sczl_sj2) as sj2,rtrim(sczl_cl) as 产量,rtrim(sczl_bzdh) as bzdh,IF(sczl_zcfp = 0, "",sczl_zcfp) as 制程废品,IF(sczl_zccp = 0, "",sczl_zccp) as 制程次品,IF(sczl_前工序废 = 0, "",sczl_前工序废) as 前工序废,IF(sczl_来料少数 = 0, "",sczl_来料少数) as 来料异常,
         IF(sczl_装版工时 = 0, "",sczl_装版工时) as 装版工时, IF(sczl_保养工时 = 0, "",sczl_保养工时) as 保养工时,IF(sczl_打样工时 = 0, "",sczl_打样工时) as 打样工时,IF(sczl_异常停机工时 = 0, "",sczl_异常停机工时) as 异常总工时,IF(sczl_设备运行工时 = 0, "",sczl_设备运行工时) as 通电工时,
         IF(码开始行 = 0, "",码开始行) as 码开始行,IF(码结束行 = 0, "",码结束行) as 码结束行,IF(码包 = 0, "",码包) as 码包,IF(主电表 = 0, "",主电表) as 主电表,IF(辅电表 = 0, "",辅电表) as 辅电表,IF(sczl_ms = 0, "",sczl_ms) as 色度数,
-        rtrim(sys_id) as 用户,rtrim(mod_rq) as 更新时间,IF(sczl_异常工时1 = 0, "",sczl_异常工时1) as 异常补时,IF(sczl_异常类型1 = 0, "",sczl_异常类型1) as 异常类型,sczl_bh1,sczl_bh2,
+        rtrim(sys_id) as 用户,rtrim(sys_rq) as 更新时间,IF(sczl_异常工时1 = 0, "",sczl_异常工时1) as 异常补时,IF(sczl_异常类型1 = 0, "",sczl_异常类型1) as 异常类型,sczl_bh1,sczl_bh2,
         sczl_bh3,sczl_bh4,sczl_bh5,sczl_bh6,sczl_bh7,sczl_bh8,sczl_bh9,sczl_bh10,sczl_rate1,sczl_rate2,sczl_rate3,sczl_rate4,sczl_rate5,sczl_rate6,sczl_rate7,
         sczl_rate8,sczl_rate9,sczl_rate10,sczl_bh98,rtrim(UniqId) as UniqId,rtrim(sczl_工价系数) as 难度系数,rtrim(sczl_dedh) as 定额代号';
         //机台信息
@@ -1933,6 +1933,7 @@ class Facility extends Api
         $param['mod_rq'] = date('Y-m-d H:i:s',time());
         $data = $param;
         unset($data['UniqId']);
+        unset($data['sczl_rq']);
         $sql = \db('设备_产量计酬')
             ->where('UniqId',$param['UniqId'])
             ->fetchSql(true)
@@ -2030,6 +2031,7 @@ class Facility extends Api
         $param['mod_rq'] = date('Y-m-d H:i:s',time());
         $UnidId = $param['UniqId'];
         unset($param['UniqId']);
+        unset($param['sczl_rq']);
         $sql = \db('设备_产量计酬')->where('UniqId',$UnidId)->fetchSql(true)->update($param);
         $res = \db()->query($sql);
         if ($res !== false){
@@ -2432,6 +2434,7 @@ class Facility extends Api
         $data = $params;
         $data['sczl_装版总工时'] = $params['sczl_装版工时'];
         unset($data['UniqId']);
+        unset($data['sczl_rq']);
         $sql = \db('设备_产量计酬')->where('UniqId',$params['UniqId'])->fetchSql(true)->update($data);
         $res = \db()->query($sql);
         if ($res === false){
@@ -2525,4 +2528,17 @@ class Facility extends Api
         $list['totalB'] = $totalB;
         $this->success('成功',$list);
     }
+
+    //设备运行跟踪月度数据导出
+//    public function MouthDataOutput()
+//    {
+//        if ($this->request->isGet() === false){
+//            $this->error('参数错误');
+//        }
+//        $param = $this->request->param();
+//        if (empty($param)){
+//            $this->error('参数错误');
+//        }
+//        $filed = "工单编号,产品名称,流程单号,印件号,工序号,机台编号,日期,工序产量,工序名称,机长工号,机长名称,";
+//    }
 }

application/api/controller/Manufacture.php

@@ -178,7 +178,7 @@ class Manufacture extends Api
                         OR a.`成品名称` LIKE '%{$param['search']}%' 
                     ";
         }
-        if ($param['status'] === '排程中'){
+        if ($param['status'] === '制程中'){
             $list = db('工单_基本资料')->alias('a')
                 ->field([
                     'rtrim(a.Gd_gdbh)' => '工单编号',
@@ -197,15 +197,10 @@ class Manufacture extends Api
                 ->join('工单_工艺资料 b', 'a.Gd_gdbh = b.Gy0_gdbh')
                 ->where([
                     'a.gd_statu' => '2-生产中',
-                    'a.行号' => '1',
                     'b.PD_WG' => '1900-01-01 00:00:00',
+                    'b.Gy0_sj1' => ['<>', '1900-01-01 00:00:00'],
                 ])
                 ->where($where)
-//                ->whereNotExists(function ($query) {
-//                    $query->table('工单_工艺资料')->alias('b2')
-//                        ->where('b2.Gy0_gdbh = a.Gd_gdbh')
-//                        ->where('b2.Gy0_sj1 <> "1900-01-01 00:00:00"');
-//                })
                 ->group('a.Gd_gdbh')
                 ->select();
         }else{
@@ -227,11 +222,14 @@ class Manufacture extends Api
                 ->join('工单_工艺资料 b', 'a.Gd_gdbh = b.Gy0_gdbh')
                 ->where([
                     'a.gd_statu' => '2-生产中',
-                    'a.行号' => '1',
                     'b.PD_WG' => '1900-01-01 00:00:00',
-                    'b.Gy0_sj1' => ['<>', '1900-01-01 00:00:00'],
                 ])
                 ->where($where)
+//                ->whereNotExists(function ($query) {
+//                    $query->table('工单_工艺资料')->alias('b2')
+//                        ->where('b2.Gy0_gdbh = a.Gd_gdbh')
+//                        ->where('b2.Gy0_sj1 <> "1900-01-01 00:00:00"');
+//                })
                 ->group('a.Gd_gdbh')
                 ->select();
         }
@@ -827,7 +825,7 @@ class Manufacture extends Api
                 'RTRIM( b.`销售订单号` )' => '销售订单号',
             ])
             ->join('工单_印件资料 c','c.Yj_Gdbh = a.Gy0_gdbh AND c.yj_Yjno = a.Gy0_yjno')
-            ->join('工单_基本资料 b','b.Gd_gdbh = a.Gy0_gdbh')
+            ->join('工单_基本资料 b','b.Gd_gdbh = a.Gy0_gdbh AND b.行号 = a.Gy0_yjno')
             ->join('设备_产量计酬 d','a.Gy0_gdbh = d.sczl_gdbh AND a.Gy0_yjno = d.sczl_yjno AND a.Gy0_gxh = d.sczl_gxh AND a.Gy0_sbbh = d.sczl_jtbh','LEFT')
             ->where([
                 'b.gd_statu' => '2-生产中',

application/api/controller/Product.php

@@ -233,8 +233,8 @@ class Product extends Api
             if (!empty($value['ms_coe'])){
                 $data['Gy0_Ms'] = $value['ms_coe'];
             }
-            if (!empty($value['workshop'])){
-                $data['Gy0_site'] = $value['workshop'];
+            if (!empty($value['Gy0_site'])){
+                $data['Gy0_site'] = $value['Gy0_site'];
             }
             $sql = db('产品_工艺资料')->where('UniqID',$value['UniqID'])->fetchSql(true)->update($data);
             $res = Db::query($sql);

application/api/controller/Synchronization.php

@@ -450,6 +450,7 @@ class Synchronization extends Api
             $this->error('人事资料同步失败');
         }else{
             $this->success('人事资料同步成功');
+            //14906570@qq.com
         }
     }
 
@@ -1093,31 +1094,31 @@ class Synchronization extends Api
 
 
     //工单核检单同步
-    public function copy()
-    {
-        $param = $this->request->param();
-        $db5 = \db()->connect(config('database.db5'));
-        $list = $db5->name('db_qczl')
-            ->where('qczl_gdbh',$param['order'])
-            ->where('qczl_yjno',$param['yjno'])
-            ->select();
-        foreach ($list  as $key=>$value){
-            for ($i=1;$i<14;$i++){
-                if (!empty($value['fp_bh'.$i])){
-                    $name = \db('人事_基本资料')
-                        ->where('mn_员工编号',$value['fp_bh'.$i])
-                        ->order('Uniqid')
-                        ->value('员工编号');
-                    if (empty($name)){
-                        $name = '0000';
-                    }
-                    $list[$key]['fp_bh'.$i] = $name;
-                }
-            }
-        }
-        $sql = \db('db_qczl')->fetchSql(true)->insertAll($list);
-        \db()->query($sql);
-    }
+//    public function copy()
+//    {
+//        $param = $this->request->param();
+//        $db5 = \db()->connect(config('database.db5'));
+//        $list = $db5->name('db_qczl')
+//            ->where('qczl_gdbh',$param['order'])
+//            ->where('qczl_yjno',$param['yjno'])
+//            ->select();
+//        foreach ($list  as $key=>$value){
+//            for ($i=1;$i<14;$i++){
+//                if (!empty($value['fp_bh'.$i])){
+//                    $name = \db('人事_基本资料')
+//                        ->where('mn_员工编号',$value['fp_bh'.$i])
+//                        ->order('Uniqid')
+//                        ->value('员工编号');
+//                    if (empty($name)){
+//                        $name = '0000';
+//                    }
+//                    $list[$key]['fp_bh'.$i] = $name;
+//                }
+//            }
+//        }
+//        $sql = \db('db_qczl')->fetchSql(true)->insertAll($list);
+//        \db()->query($sql);
+//    }
 
     /**
      * 美浓工单数据同步
@@ -1437,7 +1438,7 @@ class Synchronization extends Api
         $db7 = \db()->connect(config('database.db7'));
         $OrganizationalDataList = $db7->name('U8_04物料编码')
             ->where('YX接收时间',null)
-            ->where('YX接收状态','0')
+            ->where('YX接收状态',null)
             ->select();
         if (empty($OrganizationalDataList)){
             $this->success('未找到新的物料编码');

application/api/controller/WorkOrder.php

@@ -1145,8 +1145,9 @@ class WorkOrder extends Api
             $this->error('参数错误');
         }
         $list = \db('设备_基本资料')
-            ->where('存放地点',$param['address'])
+            ->where('使用部门',$param['address'])
             ->field('rtrim(设备编号) as 设备编号,rtrim(设备名称) as 设备名称')
+            ->order('设备编组,设备编号')
             ->select();
         if (empty($list)){
             $this->success('未找到该车间机台');
@@ -1291,7 +1292,7 @@ class WorkOrder extends Api
                 `工单_基本资料` AS a
                 JOIN `工单_印件资料` AS b ON b.Yj_Gdbh = a.Gd_gdbh 
             WHERE
-                a.Gd_gdbh = '{$workOrder}' AND a.行号 = 1 AND b.yj_Yjno = '{$yjno}'";
+                a.Gd_gdbh = '{$workOrder}' AND b.yj_Yjno = '{$yjno}'";
         $list = Db::query($sql);
         if (empty($list)){
             $this->success('未找到订单数据');
@@ -2204,6 +2205,12 @@ class WorkOrder extends Api
                     ->fetchSql(true)
                     ->update(['行号'=>$value['yj_yjno']]);
                 \db()->query($sql);
+                $bomSql = \db('工单_bom资料')
+                    ->where('BOM_工单编号',$param['workorder'])
+                    ->where('BOM_产品编号',$value['yj_yjdh'])
+                    ->fetchSql(true)
+                    ->update(['BOM_工单行号'=>$value['yj_yjno']]);
+                \db()->query($bomSql);
             }
             unset($PrintList[$key]['mod_rq'],$PrintList[$key]['sys_rq'],$PrintList[$key]['sys_id'],$PrintList[$key]['KgToPages'],$PrintList[$key]['yj_tll'],$PrintList[$key]['yj_yjdh'],$PrintList[$key]['yj_yjno'],$PrintList[$key]['UniqId']);
         }