Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-09-06 d809ecd16cbb23f5aad86a6844f51ffea0455fe8

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

@@ -142,12 +142,25 @@
            List<PatchLog> patchLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("patchLog")), PatchLog.class);
            if (!patchLoglist.isEmpty()){
                for (PatchLog patchLog : patchLoglist) {
                    //审核
                   patchMapper.updateReplenish(patchLog,userName);
                    ReportingWork reportingWork = reportingWorkMapper
                            .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
                    //修改小片流程卡数量
                    patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
                    PatchLog patchLog1=patchMapper.selectOne(new QueryWrapper<PatchLog>().eq("id",patchLog.getId()));
                    //判断是否已经审核
                    if(patchLog1.getReviewStatus()==0){
                        ReportingWork reportingWork = reportingWorkMapper
                                .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
                        //修改小片流程卡数量
                        patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
                        //审核
                        patchMapper.updateReplenish(patchLog,userName);
                    }else{
                        saveState = false;
                    }

                    Log log = new Log();
                    log.setContent(object.toString());
                    log.setFunction("updateReplenish补片审核");
                    log.setOperatorId((String) object.get("userId"));
                    log.setOperator((String) object.get("userName"));
                    logService.saveLog(log);
                }
            }

@@ -156,7 +169,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("updateReplenish");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -191,16 +204,23 @@
        return map;
    }

    public Map<String, Object> getSelectPrintCustomLabelSv(String type, Map<String, Object> object) {
    public Map<String, Object> getSelectPrintCustomLabelSv(String type, Integer lableType, Map<String, Object> object) {
        Map<String, Object> map = new HashMap<>();
        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//最终结果
        List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
        if (!flowCardList.isEmpty()) {
            for (FlowCard flowCard : flowCardList) {
                if (lableType != 2){
                    Map<String, Object> itemmap = new HashMap<>();
                    itemmap.put("data", flowCardMapper.getRepairPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId()));
                    list.add(itemmap);
                }
                else{
                    Map<String, Object> itemmap = new HashMap<>();
                    itemmap.put("data", flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId()));
                    list.add(itemmap);
                }

                Map<String, Object> itemmap = new HashMap<>();
                itemmap.put("data", flowCardMapper.getRepairPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId()));
                list.add(itemmap);


            }
@@ -209,5 +229,113 @@
        map.put("title", flowCardMapper.getPrintTitle(type));
        return map;
    }

    public Boolean deleteReplenishSv(Map<String, Object> object) {
        boolean saveState = true;
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        try {
            String userName = "";
            String userId = "";
            if (object.get("userName") != null) {
                userName = object.get("userName").toString();
            }
            if (object.get("userId") != null) {
                userId = object.get("userId").toString();
            }
            //获取对象集合循环进行新增修改
            List<PatchLog> patchLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("patchLog")), PatchLog.class);
            if (!patchLoglist.isEmpty()){
                for (PatchLog patchLog : patchLoglist) {
                    PatchLog patchLog1=patchMapper.selectOne(new QueryWrapper<PatchLog>().eq("id",patchLog.getId()));
                    //判断是否已经审核
                    if(patchLog1.getReviewStatus()==0){
                        //删除补片表对应补片id数据
                        patchMapper.deleteReplenishMp(patchLog.getPatchId());
                        //修改次破明细表补片数量和状态
                        patchMapper.updatePatchDdMp(patchLog.getReportingWorkId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber(),patchLog.getPatchNum());
                        //修改报工明细表状态
                        patchMapper.updatePatchBgMp(patchLog.getReportingWorkId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber());

                    }
                    else{
                        saveState = false;
                    }
                }
            }

        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysErrorService.insert(sysError);
            saveState = false;

        }

        return saveState;
    }

    public Boolean updateCancelReviewSv(Map<String, Object> object) {
        boolean saveState = true;
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        //try {
            String userName = "";
            String userId = "";
            if (object.get("userName") != null) {
                userName = object.get("userName").toString();
            }
            if (object.get("userId") != null) {
                userId = object.get("userId").toString();
            }
            //获取对象集合循环进行新增修改
            List<PatchLog> patchLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("patchLog")), PatchLog.class);
            if (!patchLoglist.isEmpty()){
                for (PatchLog patchLog : patchLoglist) {
                    //查询流程卡工艺流程
                    String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(patchLog.getProcessId(), String.valueOf(patchLog.getTechnologyNumber()));
                    if (technologicalProcess!=null || !technologicalProcess.equals("")) {
                        String[] processList = technologicalProcess.split("->");
                        //获取工艺流程第一个工序
                        String interceptProcess = processList[0];
                        Integer firstStep=reportingWorkMapper.getFirstStep(patchLog.getProcessId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber(),interceptProcess);
                          if (firstStep>=patchLog.getPatchNum()){
                              ReportingWork reportingWork = reportingWorkMapper
                                      .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
                              //修改小片流程卡数量
                              patchMapper.updateOrderProcessDetailCancel(patchLog,reportingWork);
                              //审核
                              patchMapper.updateReplenishCancel(patchLog);
                          }
                          else {
                              saveState = false;
                          }
                    }else{
                        saveState = false;
                    }

                    Log log = new Log();
                    log.setContent(object.toString());
                    log.setFunction("updateCancelReviewSv补片反审");
                    log.setOperatorId((String) object.get("userId"));
                    log.setOperator((String) object.get("userName"));
                    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;
    }
}