| | |
|---|
| | | List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class); |
|---|
| | | if (!flowCardList.isEmpty()) { |
|---|
| | | for (FlowCard flowCard : flowCardList) { |
|---|
| | | if (lableType != 2){ |
|---|
| | | if (lableType != 2){//成品标签 |
|---|
| | | Map<String, Object> itemmap = new HashMap<>(); |
|---|
| | | itemmap.put("data", flowCardMapper.getRepairPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId())); |
|---|
| | | itemmap.put("data", flowCardMapper.getRepairPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber())); |
|---|
| | | list.add(itemmap); |
|---|
| | | } |
|---|
| | | else{ |
|---|
| | | else{//小片标签 |
|---|
| | | Map<String, Object> itemmap = new HashMap<>(); |
|---|
| | | itemmap.put("data", flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId())); |
|---|
| | | itemmap.put("data", flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber())); |
|---|
| | | list.add(itemmap); |
|---|
| | | } |
|---|
| | | |
|---|
| | |
|---|
| | | logService.saveLog(log); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | // } catch (Exception e) { |
|---|
| | | // TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); |
|---|
| | | // //将异常传入数据库 |
|---|
| | | // SysError sysError = new SysError(); |
|---|
| | | // sysError.setError(e.toString()); |
|---|
| | | // sysError.setFunc("updateCancelReviewSv"); |
|---|
| | | // sysErrorService.insert(sysError); |
|---|
| | | // saveState = false; |
|---|
| | | // |
|---|
| | | // } |
|---|
| | | |
|---|
| | | return saveState; |
|---|
| | | } |
|---|
