流程卡合并标记打印

廖井涛

2025-02-17 2e5fe8dc8e213e4928013684d930f68fbd86b157

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java

@@ -187,10 +187,15 @@
        if(Objects.equals(type, "补片")){
            alias="BP";
        }
        //查询当天的最大数量
        Integer maximum=patchMapper.getMaximum();
        //查询当天最新的编号
        String str=patchMapper.getMaximum();
        if (str == null){
            str="00";
        }
        String maximum = str.substring(str.length() - 2);
        int lastTwoInteger = Integer.parseInt(maximum);
        //设置两位不够补0
        String formattedNumber = String.format("%02d", maximum+1);
        String formattedNumber = String.format("%02d", lastTwoInteger+1);
        //格式化当前日期
        Date currentDate = new Date();
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
@@ -212,14 +217,14 @@
        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);
                }

@@ -330,17 +335,6 @@
                    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;
    }