fix:修改報表生产工单报表预览参数为空的问题
This commit is contained in:
parent
e4eae92436
commit
b09e6ce058
@ -1,6 +1,7 @@
|
|||||||
package com.ktg.mes.report.bean;
|
package com.ktg.mes.report.bean;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
|
import com.github.pagehelper.util.StringUtil;
|
||||||
import com.ktg.mes.pro.domain.ProWorkorder;
|
import com.ktg.mes.pro.domain.ProWorkorder;
|
||||||
import com.ktg.mes.pro.service.IProWorkorderService;
|
import com.ktg.mes.pro.service.IProWorkorderService;
|
||||||
import com.ktg.mes.wm.domain.WmBarcode;
|
import com.ktg.mes.wm.domain.WmBarcode;
|
||||||
@ -10,6 +11,7 @@ import org.apache.commons.collections.MapUtils;
|
|||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -28,6 +30,9 @@ public class PmReportBean {
|
|||||||
public List<ProWorkorder> getData(String dsName, String datasetName, Map<String, Object> parameters) {
|
public List<ProWorkorder> getData(String dsName, String datasetName, Map<String, Object> parameters) {
|
||||||
|
|
||||||
String id = MapUtils.getString(parameters, "id");
|
String id = MapUtils.getString(parameters, "id");
|
||||||
|
if (StringUtil.isEmpty(id)) {
|
||||||
|
id = "0";
|
||||||
|
}
|
||||||
ProWorkorder proWorkorder = proWorkorderService.selectProWorkorderByWorkorderId(Long.parseLong(id));
|
ProWorkorder proWorkorder = proWorkorderService.selectProWorkorderByWorkorderId(Long.parseLong(id));
|
||||||
|
|
||||||
List<ProWorkorder> list = new ArrayList<>();
|
List<ProWorkorder> list = new ArrayList<>();
|
||||||
@ -38,7 +43,9 @@ public class PmReportBean {
|
|||||||
public List<ProWorkorder> getChildData(String dsName, String datasetName, Map<String, Object> parameters) {
|
public List<ProWorkorder> getChildData(String dsName, String datasetName, Map<String, Object> parameters) {
|
||||||
|
|
||||||
String id = MapUtils.getString(parameters, "id");
|
String id = MapUtils.getString(parameters, "id");
|
||||||
|
if (StringUtil.isEmpty(id)) {
|
||||||
|
id = "0";
|
||||||
|
}
|
||||||
List<ProWorkorder> proWorkorders = proWorkorderService.selectProWorkorderListByParentId(Long.parseLong(id));
|
List<ProWorkorder> proWorkorders = proWorkorderService.selectProWorkorderListByParentId(Long.parseLong(id));
|
||||||
|
|
||||||
|
|
||||||
@ -50,6 +57,9 @@ public class PmReportBean {
|
|||||||
public List<WmBarcode> getQc(String dsName, String datasetName, Map<String, Object> parameters) {
|
public List<WmBarcode> getQc(String dsName, String datasetName, Map<String, Object> parameters) {
|
||||||
|
|
||||||
String id = MapUtils.getString(parameters, "id");
|
String id = MapUtils.getString(parameters, "id");
|
||||||
|
if (StringUtil.isEmpty(id)) {
|
||||||
|
id = "0";
|
||||||
|
}
|
||||||
WmBarcode wmBarcode = new WmBarcode();
|
WmBarcode wmBarcode = new WmBarcode();
|
||||||
wmBarcode.setBarcodeId(Long.parseLong(id));
|
wmBarcode.setBarcodeId(Long.parseLong(id));
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user