|
|
@@ -409,7 +409,6 @@ class ExportController extends AddonController
|
|
|
->field('large.code lcode,large.code_cp1 lcode_cp1,large.code_cp2 lcode_cp2,small.code scode,small.code_cp1 scode_cp1,small.code_cp2 scode_cp2')
|
|
|
->where('small.large_id in ('.$id.') and small.status = 0')
|
|
|
->select();
|
|
|
-
|
|
|
$return = $this->excelExport1($data);
|
|
|
|
|
|
if($return['status']==1){
|
|
|
@@ -973,7 +972,7 @@ $data['s_weight'] = $data['s_weight']/1000;
|
|
|
$add['num'] = $data['box_num'];
|
|
|
$add['mater_type'] = 1;
|
|
|
}else{
|
|
|
- $add['num'] = $data['s_weight'];
|
|
|
+ $add['num'] = $data['s_weight']*1000;
|
|
|
$add['mater_type'] = 2;
|
|
|
}
|
|
|
$add['userid'] = $session_config['user_auth']['uid'];
|
|
|
@@ -1084,6 +1083,7 @@ $data['s_weight'] = $data['s_weight']/1000;
|
|
|
$model = new \Think\Model();
|
|
|
$data = M('goods')->find($id);
|
|
|
$export_ids = explode(',',$data['export_ids']);
|
|
|
+
|
|
|
$arr = [];
|
|
|
foreach($export_ids as $v){
|
|
|
$arr[] = M('qcode_export')->find($v);
|
