|
@@ -711,7 +711,6 @@ class Manufacture extends Api
|
|
|
'Gy0_sj1' => date('Y-m-d H:i:s',strtotime($value['projectTime'])),
|
|
'Gy0_sj1' => date('Y-m-d H:i:s',strtotime($value['projectTime'])),
|
|
|
'Gy0_sj2' => date('Y-m-d HY-m-d',strtotime(($value['projectTime'])+(ceil($value['ProductionHours'])+ceil($value['AuxiliaryHours']))*3600)),
|
|
'Gy0_sj2' => date('Y-m-d HY-m-d',strtotime(($value['projectTime'])+(ceil($value['ProductionHours'])+ceil($value['AuxiliaryHours']))*3600)),
|
|
|
];
|
|
];
|
|
|
- halt($data);
|
|
|
|
|
$sql = Db::table('工单_工艺资料')
|
|
$sql = Db::table('工单_工艺资料')
|
|
|
->where('UniqId',$value['UniqId'])
|
|
->where('UniqId',$value['UniqId'])
|
|
|
->fetchSql(true)
|
|
->fetchSql(true)
|
|
@@ -727,4 +726,96 @@ class Manufacture extends Api
|
|
|
$this->error('失败');
|
|
$this->error('失败');
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ //机台显示工单
|
|
|
|
|
+
|
|
|
|
|
+ public function MachineWorkOrderList()
|
|
|
|
|
+ {
|
|
|
|
|
+ if ($this->request->isGet() === false){
|
|
|
|
|
+ $this->error('请求失败');
|
|
|
|
|
+ }
|
|
|
|
|
+ $param = $this->request->param();
|
|
|
|
|
+ if (empty($param)){
|
|
|
|
|
+ $this->error('参数错误');
|
|
|
|
|
+ }
|
|
|
|
|
+ if ($param['status'] === '制程'){
|
|
|
|
|
+ $where = "a.gd_statu = '2-生产中'
|
|
|
|
|
+ AND a.`行号` = '1'
|
|
|
|
|
+ AND b.Gy0_sbbh LIKE '%{$param['machine']}%'
|
|
|
|
|
+ AND b.PD_WG = '1900-01-01 00:00:00'
|
|
|
|
|
+ AND b.Gy0_sj1 != '1900-01-01 00:00:00' ";
|
|
|
|
|
+ }else{
|
|
|
|
|
+ $where = "a.gd_statu = '2-生产中'
|
|
|
|
|
+ AND a.`行号` = '1'
|
|
|
|
|
+ AND b.Gy0_sbbh LIKE '%{$param['machine']}%'
|
|
|
|
|
+ AND b.PD_WG = '1900-01-01 00:00:00'
|
|
|
|
|
+ AND b.Gy0_sj1 = '1900-01-01 00:00:00' ";
|
|
|
|
|
+ }
|
|
|
|
|
+ $sql = "SELECT
|
|
|
|
|
+ RTRIM( a.Gd_gdbh ) AS 工单编号,
|
|
|
|
|
+ RTRIM( a.`销售订单号` ) AS 销售订单号,
|
|
|
|
|
+ RTRIM( c.yj_yjmc ) 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.`工价系数` ) AS 产能系数,
|
|
|
|
|
+ RTRIM( b.`Gy0_生产工时` ) AS 生产工时,
|
|
|
|
|
+ RTRIM( b.Gy0_ls ) AS ls,
|
|
|
|
|
+ RTRIM( b.`Gy0_辅助工时` ) AS 辅助工时,
|
|
|
|
|
+ RTRIM( b.`Gy0_最早开工时间` ) AS 最早开工时间,
|
|
|
|
|
+ RTRIM( b.Gy0_sj1 ) AS 计划开工时间,
|
|
|
|
|
+ RTRIM( b.Gy0_sj2 ) AS 计划完工时间,
|
|
|
|
|
+ RTRIM( b.`Gy0_班次安排` ) AS 班次安排,
|
|
|
|
|
+ RTRIM( b.`工序备注` ) AS 排单备注,
|
|
|
|
|
+ RTRIM( a.Gd_cpmc ) AS 产品名称,
|
|
|
|
|
+ RTRIM( a.`成品名称` ) AS 成品名称,
|
|
|
|
|
+ RTRIM( a.`订单数量` ) AS 订单数量,
|
|
|
|
|
+ RTRIM( a.`计量单位` ) AS 计量单位,
|
|
|
|
|
+ RTRIM( a.`交货日期` ) AS 交货日期,
|
|
|
|
|
+ RTRIM( a.Gd_cpdh ) AS 产品代号,
|
|
|
|
|
+ RTRIM( a.`成品代号` ) AS 成品代号,
|
|
|
|
|
+ RTRIM( b.Gy0_sbbh ) AS 设备编号,
|
|
|
|
|
+ RTRIM( b.Gy0_SITE ) AS 车间名称,
|
|
|
|
|
+ RTRIM( b.UniqId ) AS GYUID,
|
|
|
|
|
+ SUM( d.sczl_cl ) AS 已完成产量
|
|
|
|
|
+ FROM
|
|
|
|
|
+ `工单_基本资料` AS a
|
|
|
|
|
+ JOIN `工单_工艺资料` AS b ON a.Gd_gdbh = b.Gy0_gdbh
|
|
|
|
|
+ JOIN `工单_印件资料` AS c ON c.Yj_Gdbh = a.Gd_gdbh
|
|
|
|
|
+ LEFT JOIN `设备_产量计酬` AS d ON a.Gd_gdbh = d.sczl_gdbh
|
|
|
|
|
+ AND b.Gy0_sbbh = d.sczl_jtbh
|
|
|
|
|
+ WHERE
|
|
|
|
|
+ ".$where."
|
|
|
|
|
+ GROUP BY
|
|
|
|
|
+ A.Gd_gdbh";
|
|
|
|
|
+ $list = \db()->query($sql);
|
|
|
|
|
+ if (empty($list)){
|
|
|
|
|
+ $this->success('',[]);
|
|
|
|
|
+ }
|
|
|
|
|
+ foreach ($list as $key=>$value){
|
|
|
|
|
+ if ((int)$value['yjno'] <10){
|
|
|
|
|
+ $value['yjno'] = '0'.rtrim($value['yjno']);
|
|
|
|
|
+ }
|
|
|
|
|
+ if ((int)$value['gxh'] <10){
|
|
|
|
|
+ $value['gxh'] = '0'.rtrim($value['gxh']);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (rtrim($value['Add_gxmc']) == ''){
|
|
|
|
|
+ $list[$key]['印件工序及名称'] = $value['yjno'].'-'.$value['gxh'].'-->'.rtrim($value['gxmc']);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ $list[$key]['印件工序及名称'] = $value['yjno'].'-'.$value['gxh'].'-->'.rtrim($value['gxmc']).'【'.rtrim($value['Add_gxmc']).'】';
|
|
|
|
|
+ }
|
|
|
|
|
+ unset($list[$key]['gxmc'],$list[$key]['Add_gxmc']);
|
|
|
|
|
+ if ($value['产品名称'] == ''){
|
|
|
|
|
+ $list[$key]['产品名称'] = $value['成品名称'];
|
|
|
|
|
+ }
|
|
|
|
|
+ if ($value['产品代号'] == ''){
|
|
|
|
|
+ $list[$key]['产品代号'] = $value['成品代号'];
|
|
|
|
|
+ }
|
|
|
|
|
+ unset($list[$key]['成品代号'],$list[$key]['成品名称']);
|
|
|
|
|
+ }
|
|
|
|
|
+ $this->success('成功',$list);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|