|
|
@@ -763,55 +763,54 @@ class Manufacture extends Api
|
|
|
$where = '';
|
|
|
if (isset($param['search'])){
|
|
|
$where = "
|
|
|
- a.Gd_gdbh LIKE '%{$param['search']}%'
|
|
|
- OR a.`成品名称` LIKE '%{$param['search']}%'
|
|
|
+ b.Gd_gdbh LIKE '%{$param['search']}%'
|
|
|
+ OR b.`成品名称` LIKE '%{$param['search']}%'
|
|
|
";
|
|
|
}
|
|
|
- $list = \db('工单_基本资料')
|
|
|
+ $list = \db('工单_工艺资料')
|
|
|
->alias('a')
|
|
|
->field([
|
|
|
- 'RTRIM( a.Gd_gdbh )' => '工单编号',
|
|
|
- 'RTRIM( a.`销售订单号` )' => '销售订单号',
|
|
|
+ 'RTRIM( a.Gy0_yjno )' =>'yjno',
|
|
|
+ 'RTRIM( a.Gy0_gxh )' => 'gxh',
|
|
|
+ 'RTRIM( a.Gy0_gxmc )' => 'gxmc',
|
|
|
+ 'RTRIM( a.Add_gxmc )' => 'Add_gxmc',
|
|
|
'RTRIM( c.yj_yjmc )' => '印件名称',
|
|
|
- 'RTRIM( b.Gy0_yjno )' =>'yjno',
|
|
|
- 'RTRIM( b.Gy0_gxh )' => 'gxh',
|
|
|
- 'RTRIM( b.Gy0_gxmc )' => 'gxmc',
|
|
|
- 'RTRIM( b.Add_gxmc )' => 'Add_gxmc',
|
|
|
- 'RTRIM( b.`Gy0_计划接货数` )' => '计划接货数',
|
|
|
- 'RTRIM( b.`Gy0_小时产能` )' => '小时产能',
|
|
|
- 'RTRIM( b.`工价系数` )' => '产能系数',
|
|
|
- 'RTRIM( b.`Gy0_生产工时` )' => '生产工时',
|
|
|
- 'RTRIM( b.Gy0_ls )' => 'ls',
|
|
|
- 'RTRIM( b.`Gy0_辅助工时` )' => '辅助工时',
|
|
|
- 'RTRIM( b.`Gy0_最早开工时间` )' => '最早开工时间',
|
|
|
- 'RTRIM( b.Gy0_sj1 )' => '计划开工时间',
|
|
|
- 'RTRIM( b.Gy0_sj2 )' => '计划完工时间',
|
|
|
- 'RTRIM( b.`Gy0_班次安排` )' => '班次安排',
|
|
|
- 'RTRIM( b.`工序备注` )' => '排单备注',
|
|
|
- 'RTRIM( a.Gd_cpmc )' => '产品名称',
|
|
|
- 'RTRIM( a.`成品名称` )' => '成品名称',
|
|
|
- 'RTRIM( a.`订单数量` )' => '订单数量',
|
|
|
- 'RTRIM( a.`计量单位` )' => '计量单位',
|
|
|
- 'RTRIM( a.`交货日期` )' => '交货日期',
|
|
|
- 'RTRIM( a.Gd_cpdh )' => '产品代号',
|
|
|
- 'RTRIM( a.`成品代号` )' => '成品代号',
|
|
|
- 'RTRIM( b.Gy0_sbbh )' => '设备编号',
|
|
|
- 'RTRIM( b.Gy0_SITE )' => '车间名称',
|
|
|
- 'RTRIM( b.UniqId )' => 'GYUID',
|
|
|
- 'RTRIM( a.Uniqid )' => 'UNIQID',
|
|
|
- 'SUM( d.sczl_cl )' => '已完成产量'
|
|
|
+ 'RTRIM( a.`Gy0_计划接货数` )' => '计划接货数',
|
|
|
+ 'RTRIM( a.`Gy0_小时产能` )' => '小时产能',
|
|
|
+ 'RTRIM( a.`工价系数` )' => '产能系数',
|
|
|
+ 'RTRIM( a.`Gy0_生产工时` )' => '生产工时',
|
|
|
+ 'RTRIM( a.Gy0_ls )' => 'ls',
|
|
|
+ 'RTRIM( a.`Gy0_辅助工时` )' => '辅助工时',
|
|
|
+ 'RTRIM( a.`Gy0_最早开工时间` )' => '最早开工时间',
|
|
|
+ 'RTRIM( a.Gy0_sj1 )' => '计划开工时间',
|
|
|
+ 'RTRIM( a.Gy0_sj2 )' => '计划完工时间',
|
|
|
+ 'RTRIM( a.`Gy0_班次安排` )' => '班次安排',
|
|
|
+ 'RTRIM( a.`工序备注` )' => '排单备注',
|
|
|
+ 'RTRIM( b.Gd_cpmc )' => '产品名称',
|
|
|
+ 'RTRIM( b.`成品名称` )' => '成品名称',
|
|
|
+ 'RTRIM( b.`订单数量` )' => '订单数量',
|
|
|
+ 'RTRIM( b.`计量单位` )' => '计量单位',
|
|
|
+ 'RTRIM( b.`交货日期` )' => '交货日期',
|
|
|
+ 'RTRIM( b.Gd_cpdh )' => '产品代号',
|
|
|
+ 'RTRIM( b.`成品代号` )' => '成品代号',
|
|
|
+ 'RTRIM( a.Gy0_sbbh )' => '设备编号',
|
|
|
+ 'RTRIM( a.Gy0_SITE )' => '车间名称',
|
|
|
+ 'RTRIM( a.UniqId )' => 'GYUID',
|
|
|
+ 'RTRIM( b.Uniqid )' => 'UNIQID',
|
|
|
+ 'SUM( d.sczl_cl )' => '已完成产量',
|
|
|
+ 'RTRIM( b.Gd_gdbh )' => '工单编号',
|
|
|
+ 'RTRIM( b.`销售订单号` )' => '销售订单号',
|
|
|
])
|
|
|
- ->join('工单_工艺资料 b','a.Gd_gdbh = b.Gy0_gdbh')
|
|
|
- ->join('工单_印件资料 c','c.Yj_Gdbh = a.Gd_gdbh')
|
|
|
- ->join('设备_产量计酬 d','a.Gd_gdbh = d.sczl_gdbh AND b.Gy0_sbbh = d.sczl_jtbh','LEFT')
|
|
|
+ ->join('工单_印件资料 c','c.Yj_Gdbh = a.Gy0_gdbh AND c.yj_Yjno = a.Gy0_yjno')
|
|
|
+ ->join('工单_基本资料 b','b.Gd_gdbh = a.Gy0_gdbh AND b.Gd_cpdh = c.yj_Yjdh')
|
|
|
+ ->join('设备_产量计酬 d','a.Gy0_gdbh = d.sczl_gdbh AND a.Gy0_sbbh = d.sczl_jtbh','LEFT')
|
|
|
->where([
|
|
|
- 'a.gd_statu' => '2-生产中',
|
|
|
- 'a.行号'=> '1',
|
|
|
- 'b.Gy0_sbbh' => ['LIKE','%'.$param['machine'].'%'],
|
|
|
- 'b.PD_WG' => '1900-01-01 00:00:00',
|
|
|
+ 'b.gd_statu' => '2-生产中',
|
|
|
+ 'a.Gy0_sbbh' => ['LIKE','%'.$param['machine'].'%'],
|
|
|
+ 'a.PD_WG' => '1900-01-01 00:00:00',
|
|
|
])
|
|
|
->where($where)
|
|
|
- ->group('a.Gd_gdbh,b.Gy0_yjno,b.Gy0_gxh')
|
|
|
+ ->group('a.Gy0_gdbh,a.Gy0_yjno,a.Gy0_gxh')
|
|
|
->order('Gy0_sj1')
|
|
|
->select();
|
|
|
if (empty($list)){
|