|
|
@@ -473,6 +473,134 @@ class ReportingWork extends Api
|
|
|
// $this->success('报工成功');
|
|
|
// }
|
|
|
//
|
|
|
+// }// public function submitDailyProduction(){
|
|
|
+// if (Request::instance()->isPost() == false){
|
|
|
+// $this->error('非法请求');
|
|
|
+// }
|
|
|
+// $params = Request::instance()->post();
|
|
|
+// $time = date('Y-m-d 00:00:00',time()-86400);
|
|
|
+// if ($params['sczl_sj2']<date('Y-m-d 08:30:00',time()) && $params['sczl_sj2']>date('Y-m-d 00:00:00')){
|
|
|
+// $params['sczl_rq'] = $time;
|
|
|
+// }
|
|
|
+// $machine = $params['sczl_jtbh'].'#';
|
|
|
+// $batchData = []; //批次追踪数据
|
|
|
+// $batch = $params['bom'];
|
|
|
+// $data = $params;//产量数据
|
|
|
+// $data['sczl_type'] = $params['sczl_gxmc'];
|
|
|
+// $data['sczl_前工序废'] = $params['last_fp'];
|
|
|
+// $data['sczl_来料少数'] = $params['less_sl'];
|
|
|
+// $data['sczl_装版总工时'] = $params['zb_time'];
|
|
|
+// $data['sczl_打样总工时'] = $params['dy_time'];
|
|
|
+// $data['sczl_设备运行工时'] = $params['run_time'];
|
|
|
+// $data['sczl_jtbh'] = $machine;
|
|
|
+// $data['码包'] = $params['code'];
|
|
|
+// $data['主电表'] = $params['main_meter'];
|
|
|
+// $data['辅电表'] = $params['auxiliary_meter'];
|
|
|
+// unset($data['last_fp']);
|
|
|
+// unset($data['less_sl']);
|
|
|
+// unset($data['zb_time']);
|
|
|
+// unset($data['dy_time']);
|
|
|
+// unset($data['run_time']);
|
|
|
+// unset($data['code']);
|
|
|
+// unset($data['main_meter']);
|
|
|
+// unset($data['auxiliary_meter']);
|
|
|
+// unset($data['bom']);
|
|
|
+// $start_time = \db('设备_产量采集')->where('设备编号',$machine)->order('UniqId desc')->find();
|
|
|
+// if (!empty($start_time)){
|
|
|
+// $data['开工时间'] = $start_time['开工时间'];
|
|
|
+// }else{
|
|
|
+// $data['开工时间'] = '';
|
|
|
+// }
|
|
|
+// $sys_id = \db('设备_基本资料')->where('设备编号',$machine)->value('sys_sbID');
|
|
|
+// $data['sys_id'] = '['.$sys_id.'/'.$machine.']';
|
|
|
+// $UniqId = \db('设备_产量计酬')->order('UniqId desc')->value('UniqId');
|
|
|
+// if ($UniqId < 10000000){
|
|
|
+// $data['UniqId'] = 10000000;
|
|
|
+// }else{
|
|
|
+// $data['UniqId'] = $UniqId + 1;
|
|
|
+// }
|
|
|
+// $data['sczl_Pgcl'] = 0;
|
|
|
+// $data['sczl_oil'] = 0;
|
|
|
+// $data['sczl_计产系数'] = 0;
|
|
|
+// $data['sczl_工价系数'] = 0;
|
|
|
+// $data['sczl_装版工时'] = 0;
|
|
|
+// $data['sczl_保养工时'] = 0;
|
|
|
+// $data['sczl_打样工时'] = 0;
|
|
|
+// $data['sczl_异常停机工时'] = 0;
|
|
|
+// $data['sczl_异常工时1'] = 0;
|
|
|
+// $data['sczl_异常类型1'] = '';
|
|
|
+// $data['sczl_废品率系数'] = '';
|
|
|
+// $data['sczl_desc'] = '';
|
|
|
+// $data['sczl_wgsj'] = '1900-01-01 00:00:00';
|
|
|
+// $data['码开始行'] = $params['ma_start'];
|
|
|
+// $data['码结束行'] = $params['ma_end'];
|
|
|
+// $data['mod_rq'] = '1900-01-01 00:00:00';
|
|
|
+// $data['sys_rq'] = date('Y-m-d H:i:s');
|
|
|
+// unset($data['ma_start']);
|
|
|
+// unset($data['ma_end']);
|
|
|
+// if (!empty($batch)){
|
|
|
+// $batchData = explode(',',$batch);
|
|
|
+// $newData = [];
|
|
|
+// $batchUniqId = \db('物料_批次跟踪')->order('UniqId desc')->value('UniqId');
|
|
|
+// if ($batchUniqId < 10000000){
|
|
|
+// $batchUniqId = 10000000;
|
|
|
+// }
|
|
|
+// foreach ($batchData as $key=>$item){
|
|
|
+// $batchUniqId++;
|
|
|
+// $val = explode('-',$item);
|
|
|
+// $newData[$key]['wlbh'] = $val[0];
|
|
|
+// $newData[$key]['wlBatch'] = $val[1];
|
|
|
+// $newData[$key]['sczl_gdbh'] = $data['sczl_gdbh'];
|
|
|
+// $newData[$key]['sczl_yjno'] = $data['sczl_yjno'];
|
|
|
+// $newData[$key]['sczl_gxh'] = $data['sczl_gxh'];
|
|
|
+// $newData[$key]['sczl_gxmc'] = $data['sczl_gxmc'];
|
|
|
+// $newData[$key]['sczl_num'] = $data['sczl_num'];
|
|
|
+// $newData[$key]['sys_id'] = $data['sys_id'];
|
|
|
+// $newData[$key]['sys_rq'] = $data['sys_rq'];
|
|
|
+// $newData[$key]['UniqID'] = $batchUniqId;
|
|
|
+// }
|
|
|
+// }
|
|
|
+// if (!empty($data['sczl_装版总工时']) && $data['sczl_装版总工时'] !== 0){
|
|
|
+// $priData = [
|
|
|
+// 'gdbh' => $data['sczl_gdbh'] ?? '',
|
|
|
+// 'yjno' => $data['sczl_yjno'] ?? '',
|
|
|
+// 'gxh' => $data['sczl_gxh'] ?? '',
|
|
|
+// 'jtbh' => $data['sczl_jtbh'] ?? '',
|
|
|
+// 'startTime' => $data['sczl_sj1'] ?? '',
|
|
|
+// 'endTime' => $data['sczl_sj2'] ?? '',
|
|
|
+// '换版总工时' => $data['sczl_装版总工时'],
|
|
|
+// '换版联拼数' => $data['sczl_换版联拼数'] ?? 0,
|
|
|
+// '换版类型' => $data['换版类型'] ?? ''
|
|
|
+// ];
|
|
|
+// $priSql = \db('设备_装版工时')->fetchSql(true)->insert($priData);
|
|
|
+// $priRes = \db()->query($priSql);
|
|
|
+// }
|
|
|
+// unset($data['sczl_换版联拼数']);
|
|
|
+// unset($data['换版类型']);
|
|
|
+// $res = false;
|
|
|
+// $batch_res = false;
|
|
|
+// Db::startTrans();
|
|
|
+// try {
|
|
|
+// $sql = \db('设备_产量计酬')->fetchSql(true)->insert($data);
|
|
|
+// $res = Db::query($sql);
|
|
|
+// if (!empty($batch)){
|
|
|
+// $batch_sql = \db('物料_批次跟踪')->fetchSql(true)->insertAll($newData);
|
|
|
+// $batch_res = Db::query($batch_sql);
|
|
|
+// }else{
|
|
|
+// $batch_res = true;
|
|
|
+// }
|
|
|
+//
|
|
|
+// Db::commit();
|
|
|
+// cache('MachineProductReport-getList',null);
|
|
|
+// }catch (\Exception $e){
|
|
|
+// Db::rollback();
|
|
|
+// }
|
|
|
+// if ($res === false || $batch_res === false){
|
|
|
+// $this->error('报工失败');
|
|
|
+// }else{
|
|
|
+// $this->success('报工成功');
|
|
|
+// }
|
|
|
+//
|
|
|
// }
|
|
|
|
|
|
public function submitDailyProduction()
|
|
|
@@ -557,7 +685,13 @@ class ReportingWork extends Api
|
|
|
// 保留原始参数中的相关字段
|
|
|
$preserveFields = [
|
|
|
'sczl_gdbh', 'sczl_yjno', 'sczl_gxh', 'sczl_gxmc',
|
|
|
- 'sczl_num', 'sczl_sj1', 'sczl_sj2', 'sczl_rq'
|
|
|
+ 'sczl_num', 'sczl_sj1', 'sczl_sj2', 'sczl_rq','sczl_ls',
|
|
|
+ 'sczl_cl', 'sczl_zcfp', 'sczl_zccp', 'sczl_ms', 'sczl_dedh',
|
|
|
+ 'sczl_bzdh', '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_rate', 'sczl_bh98'
|
|
|
];
|
|
|
|
|
|
foreach ($preserveFields as $field) {
|
