|
@@ -386,6 +386,39 @@ class Boss extends Start_Controller
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ $hb = $this->$fullorder_name->find_all("merge = '".$y['id']."' and id != '".$y['id']."'");
|
|
|
|
|
+ $update_arr = [];
|
|
|
|
|
+ $update_arr['waybill'] = $y['waybill'];
|
|
|
|
|
+ $update_arr['express'] = $y['express'];
|
|
|
|
|
+ $update_arr['printtype'] = $y['printtype'];
|
|
|
|
|
+ $update_arr['ioss'] = $y['ioss'];
|
|
|
|
|
+ $update_arr['review'] = 6;
|
|
|
|
|
+ $update_arr['bx'] = $y['bx'];
|
|
|
|
|
+ $update_arr['qm'] = $y['qm'];
|
|
|
|
|
+ $update_arr['js'] = $y['js'];
|
|
|
|
|
+ //$post['state'] = 216;
|
|
|
|
|
+ $update_arr['print'] = $y['print'];
|
|
|
|
|
+ $update_arr['printtime'] = $y['printtime'];
|
|
|
|
|
+ $update_arr['library'] = 2;
|
|
|
|
|
+ $update_arr['librarytime'] = $time;
|
|
|
|
|
+ $update_arr['libraryconfirm'] = 2;
|
|
|
|
|
+ $update_arr['librarynot'] = '';
|
|
|
|
|
+ foreach ($hb as $v)
|
|
|
|
|
+ {
|
|
|
|
|
+ $update_arr['state'] = $v['state'];
|
|
|
|
|
+ $vshop = $this->shop->read($v['shop']);
|
|
|
|
|
+ $vwarehouse = $this->warehouse->read($v['type']);
|
|
|
|
|
+ $this->$fullorder_name->save($update_arr,$v['id']);
|
|
|
|
|
+ //2025年1月25日发现翔文合并订单发现此问题
|
|
|
|
|
+ // if($warehouse['zd'] == '1'){
|
|
|
|
|
+ // $wh = $this->_fout_db($v,$warehouse,$bdck);
|
|
|
|
|
+ // foreach ($wh['sj'] as $vv)
|
|
|
|
|
+ // {
|
|
|
|
|
+ // $this->$bdck->save(array('state'=>1,'cktype'=>1,'orderinfo'=>$v['orderinfo'],'waybill'=>$y['waybill'],'outk'=>$time,'time'=>$time),$vv['id']);
|
|
|
|
|
+ // }
|
|
|
|
|
+ // }
|
|
|
|
|
+ }
|
|
|
if ($this->db->trans_status() === TRUE) {
|
|
if ($this->db->trans_status() === TRUE) {
|
|
|
$this->db->trans_commit();
|
|
$this->db->trans_commit();
|
|
|
echo json_encode(array('msg' => '操作成功！', 'success' => true));
|
|
echo json_encode(array('msg' => '操作成功！', 'success' => true));
|
