mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修改報表生产工单报表预览参数为空的问题

Browse Source
This commit is contained in:
yanshikui 2024-11-18 17:52:30 +08:00
parent e4eae92436
commit b09e6ce058
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ktg-mes/src/main/java/com/ktg/mes/report/bean/PmReportBean.java
View File

@ -1,6 +1,7 @@
package com.ktg.mes.report.bean;
import com.alibaba.fastjson.JSON;
import com.github.pagehelper.util.StringUtil;
import com.ktg.mes.pro.domain.ProWorkorder;
import com.ktg.mes.pro.service.IProWorkorderService;
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.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
@ -28,6 +30,9 @@ public class PmReportBean {
public List<ProWorkorder> getData(String dsName, String datasetName, Map<String, Object> parameters) {
String id = MapUtils.getString(parameters, "id");
if (StringUtil.isEmpty(id)) {
id = "0";
}
ProWorkorder proWorkorder = proWorkorderService.selectProWorkorderByWorkorderId(Long.parseLong(id));
List<ProWorkorder> list = new ArrayList<>();
@ -38,7 +43,9 @@ public class PmReportBean {
public List<ProWorkorder> getChildData(String dsName, String datasetName, Map<String, Object> parameters) {
String id = MapUtils.getString(parameters, "id");
if (StringUtil.isEmpty(id)) {
id = "0";
}
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) {
String id = MapUtils.getString(parameters, "id");
if (StringUtil.isEmpty(id)) {
id = "0";
}
WmBarcode wmBarcode = new WmBarcode();
wmBarcode.setBarcodeId(Long.parseLong(id));