完善

野心家

2025-06-11 efabdfaa625789fb29f77b3f07147e1ed478ec64

完善

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -62,7 +62,7 @@
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        String formattedDate = sdf.format(wrkMast.getModiTime());
        Config config=configService.selectConfigByCode("reportMes");
        if(config==null||!config.getValue().equals("Y")){
        if(config==null||!config.getValue().equals("Y")||wrkMast.getIoType()==110||wrkMast.getIoType()==10||wrkMast.getIoType()==11){
            if(wrkMast.getIoType() == 1){
                // 全板入库
                // 入库通知单
@@ -85,6 +85,9 @@
            if (!wrkMastService.deleteById(wrkMast)) {
                exceptionHandle("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());
            }
            if(wrkMast.getIoType()==110||wrkMast.getIoType()==10){

            }else{
            // 保存工作明细档历史档
            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
//                exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
@@ -94,6 +97,7 @@
//                exceptionHandle("删除工作明细档[workNo={0}]失败", wrkMast.getWrkNo());
            }
        }
        }else{
        try {
            LinkedHashMap<String, Object> map = new LinkedHashMap<String, Object>();
            String GnBm ="";
@@ -249,6 +253,8 @@
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
        }
        }

        return SUCCESS;
    }