|
|
@@ -952,32 +952,23 @@ class WorkOrder extends Api
|
|
|
}
|
|
|
$rate = Db::table('dic_lzsh')->where('sys_bh',$param['shdh'])->field('rtrim(sys_rate0) as rate0,rtrim(sys_rate1) as rate1')->find();
|
|
|
$data = [
|
|
|
- 'Gy0_yjno' => isset($param['yjno'])?$param['yjno']:'',
|
|
|
- 'Gy0_gxh' => isset($param['gxh'])?$param['gxh']:'',
|
|
|
'重点工序' => isset($param['zdgx'])?$param['zdgx']:'',
|
|
|
- 'Gy0_ks' => isset($param['ks'])?$param['ks']:'',
|
|
|
- 'Gy0_ls' => isset($param['ls'])?$param['ls']:'',
|
|
|
- 'Gy0_SITE' => isset($param['site'])?$param['site']:'',
|
|
|
- 'Gy0_gxmc' => isset($param['gxmc'])?$param['gxmc']:'',
|
|
|
- 'Add_gxmc' => isset($param['add_gxmc'])?$param['add_gxmc']:'',
|
|
|
- 'Gy0_ms' => isset($param['ms'])?$param['ms']:'',
|
|
|
+ '备选工序' => isset($param['bxgx'])?$param['bxgx']:'',
|
|
|
'Gy0_sbbh' => isset($param['sbbh'])?$param['sbbh']:'',
|
|
|
'Gy0_Rate0' => $rate['rate0'],
|
|
|
'Gy0_Rate1' => $rate['rate1'],
|
|
|
- 'Gy0_辅助工时' => isset($param['fzgs'])?$param['fzgs']:'',
|
|
|
- 'Gy0_小时产能' => isset($param['xscn'])?$param['xscn']:'',
|
|
|
'Gy0_shdh' => isset($param['shdh'])?$param['shdh']:'',
|
|
|
'损耗系数' => isset($param['shxs'])?$param['shxs']:'',
|
|
|
'工价系数' => isset($param['ndxs'])?$param['ndxs']:'',
|
|
|
- '印刷方式' => isset($param['ysfs'])?$param['ysfs']:'',
|
|
|
- '版距' => isset($param['bj'])?$param['bj']:'',
|
|
|
- '工序备注' => isset($param['gxbz'])?$param['gxbz']:'',
|
|
|
- '质量要求' => isset($param['zlyq'])?$param['zlyq']:'',
|
|
|
- '质量隐患' => isset($param['sbyh'])?$param['sbyh']:'',
|
|
|
'Mod_rq' => date('Y-m-d H:i:s',time()),
|
|
|
];
|
|
|
$sql = Db::table('工单_工艺资料')->where('UniqId',$param['UniqId'])->fetchSql(true)->update($data);
|
|
|
$res = Db::query($sql);
|
|
|
+ $status = Db::table('工单_基本资料')->where('Gd_gdbh',$param['workOrder'])->field('rtrim(gd_statu) as status')->find();
|
|
|
+ if ($status['status'] !== '2-生产中'){
|
|
|
+ $statusSql = Db::table('工单_基本资料')->where('Gd_gdbh',$param['workOrder'])->fetchSql(true)->update(['gd_statu'=>'2-生产中']);
|
|
|
+ Db::query($statusSql);
|
|
|
+ }
|
|
|
if ($res !== false){
|
|
|
$this->success('成功');
|
|
|
}else{
|
|
|
@@ -985,6 +976,36 @@ class WorkOrder extends Api
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 工艺资料编辑->机台列表获取
|
|
|
+ * @return void
|
|
|
+ * @throws \think\db\exception\DataNotFoundException
|
|
|
+ * @throws \think\db\exception\ModelNotFoundException
|
|
|
+ * @throws \think\exception\DbException
|
|
|
+ */
|
|
|
+ public function MachineList()
|
|
|
+ {
|
|
|
+ if ($this->request->isGet() === false){
|
|
|
+ $this->error('请求错误');
|
|
|
+ }
|
|
|
+ $param = $this->request->param();
|
|
|
+ if (empty($param)){
|
|
|
+ $this->error('参数错误');
|
|
|
+ }
|
|
|
+ $list = Db::table('设备_基本资料')
|
|
|
+ ->where('存放地点',$param['address'])
|
|
|
+ ->field('rtrim(设备编号) as 设备编号,rtrim(设备名称) as 设备名称')
|
|
|
+ ->select();
|
|
|
+ if (empty($list)){
|
|
|
+ $this->error('未找到该车间机台');
|
|
|
+ }
|
|
|
+ $data = [];
|
|
|
+ foreach ($list as $key=>$value){
|
|
|
+ $data[$key] = $value['设备编号'].'-->'.$value['设备名称'];
|
|
|
+ }
|
|
|
+ $this->success('成功',$data);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 打印作业通知单
|
|
|
* @ApiMethod (POST)
|