| | |
|---|
| | | //流程卡表头表尾数据 |
|---|
| | | //是否传入合并层数 |
|---|
| | | if (printMerge.equals("")||printMerge.equals("null") ){ |
|---|
| | | itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess())); |
|---|
| | | //是否包含切割 |
|---|
| | | boolean containsCutting = flowCard.getProcess().contains("切割"); |
|---|
| | | if(String.valueOf(flowCard.getTechnologyNumber()).length()>1 && containsCutting){ |
|---|
| | | List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getProcess()); |
|---|
| | | //boolean containsCutting = flowCard.getProcess().contains("切割"); |
|---|
| | | String processSub=flowCard.getProcess().substring(0, 2); |
|---|
| | | if(processSub.equals("夹胶") || processSub.equals("中空")){ |
|---|
| | | itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess())); |
|---|
| | | |
|---|
| | | List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getProcess()); |
|---|
| | | itemmap.put("detailList", detailList); |
|---|
| | | } |
|---|
| | | else { |
|---|
| | | List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getProcess()); |
|---|
| | | itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess())); |
|---|
| | | |
|---|
| | | List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getProcess()); |
|---|
| | | itemmap.put("detailList", detailList); |
|---|
| | | } |
|---|
| | | |
|---|
