|
|
@@ -51,6 +51,7 @@ class Fullorder extends Start_Controller {
|
|
|
$this->load->_model("Model_logic_order","logic_order");
|
|
|
$this->load->_model("Model_logic_ding","logic_ding");
|
|
|
$this->load->_model("Model_fullordererrors","fullordererrors");
|
|
|
+ $this->load->_model("Model_logic_whlabel","logic_whlabel");
|
|
|
}
|
|
|
//定义方法的调用规则 获取URI第二段值
|
|
|
public function _remap($arg,$arg_array)
|
|
|
@@ -1498,6 +1499,24 @@ class Fullorder extends Start_Controller {
|
|
|
}
|
|
|
}
|
|
|
$fpdata = $this->logic_order->checkOrderProduct($fpdata);
|
|
|
+ $tmp_features = array_column($fpdata,0);
|
|
|
+ $do_trans_pms = [];
|
|
|
+ foreach ($tmp_features as $k=>$v) {
|
|
|
+ if(strpos($v,",") === false){
|
|
|
+ $do_trans_pms[] = [
|
|
|
+ 'features'=>$v
|
|
|
+ ];
|
|
|
+ }else{
|
|
|
+ $tmp_arr = explode(",",$v);
|
|
|
+ $do_trans_pms[] = [
|
|
|
+ 'features'=>$tmp_arr[1].$tmp_arr[0]."-"
|
|
|
+ ];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $r = $this->logic_whlabel->dataTran($do_trans_pms,['pm']);
|
|
|
+ foreach ($fpdata as $k=>$v) {
|
|
|
+ $fpdata[$k]['pm'] = $r[$k]['pm'];
|
|
|
+ }
|
|
|
$this->data['fpdata'] = $fpdata;
|
|
|
$thfpdataxs = array();
|
|
|
if($fullorder['thfpdata'] != '')
|
|
|
@@ -2054,6 +2073,24 @@ class Fullorder extends Start_Controller {
|
|
|
}
|
|
|
}
|
|
|
$this->data['fpdata'] = $fpdata;
|
|
|
+ $tmp_features = array_column($fpdata,0);
|
|
|
+ $do_trans_pms = [];
|
|
|
+ foreach ($tmp_features as $k=>$v) {
|
|
|
+ if(strpos($v,",") === false){
|
|
|
+ $do_trans_pms[] = [
|
|
|
+ 'features'=>$v
|
|
|
+ ];
|
|
|
+ }else{
|
|
|
+ $tmp_arr = explode(",",$v);
|
|
|
+ $do_trans_pms[] = [
|
|
|
+ 'features'=>$tmp_arr[1].$tmp_arr[0]."-"
|
|
|
+ ];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $r = $this->logic_whlabel->dataTran($do_trans_pms,['pm']);
|
|
|
+ foreach ($fpdata as $k=>$v) {
|
|
|
+ $fpdata[$k]['pm'] = $r[$k]['pm'];
|
|
|
+ }
|
|
|
$this->data['fpdata'] = $fpdata;
|
|
|
$thfpdataxs = array();
|
|
|
if($fullorder['thfpdata'] != '')
|