refactor(sales): 移除旧版发货审批ShipmentApproval相关代码并调整审批理由设置

zss

4 天以前 6e05d8ecd5e3502da74665629060a30385758b49

refactor(sales): 移除旧版发货审批ShipmentApproval相关代码并调整审批理由设置

 src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java

@@ -89,11 +89,6 @@
        if (CollectionUtils.isEmpty(sysUsers)) throw new RuntimeException("审核用户不存在");
        if (sysDept == null) throw new RuntimeException("部门不存在");
        if (sysUser == null) throw new RuntimeException("申请人不存在");
//        String today = LocalDate.now().format(DATE_FORMAT);
//        Long approveId = dailyRedisCounter.incrementAndGetByDb();
//        String formattedCount = String.format("%03d", approveId);
//        //流程 ID
//        String approveID = today + formattedCount;
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
        ApproveProcess approveProcess = new ApproveProcess();
        String no = OrderUtils.countTodayByCreateTime(approveProcessMapper, "", "approve_id");

 src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java

@@ -83,13 +83,6 @@
            if (item.getFutureTicketsAmount().compareTo(BigDecimal.ZERO) == 0) {
                item.setFutureTicketsAmount(BigDecimal.ZERO);
            }
//            ProcurementPageDto procurementDto = new ProcurementPageDto();
//            procurementDto.setSalesLedgerProductId(item.getId());
//            procurementDto.setProductCategory(item.getProductCategory());
//            IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(new Page<>(1,-1), procurementDto);
//            BigDecimal stockQuantity = stockUtils.getStockQuantity(item.getProductModelId()).get("stockQuantity");

//                ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
            if (item.getApproveStatus() != 2) {
                if (item.getHasSufficientStock() == 0) {
                    item.setApproveStatus(0);

 src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java

ÎļþÒÑɾ³ý

 src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java

@@ -61,7 +61,7 @@
        ApproveProcessVO approveProcessVO = new ApproveProcessVO();
        approveProcessVO.setApproveType(7);
        approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
        approveProcessVO.setApproveReason(req.getType() + ":" +sh);
        approveProcessVO.setApproveReason(sh);
        approveProcessVO.setApproveUserIds(req.getApproveUserIds());
        approveProcessVO.setApproveUser(loginUser.getUserId());
        approveProcessVO.setApproveTime(LocalDate.now().toString());

 src/main/java/com/ruoyi/sales/mapper/ShipmentApprovalMapper.java

ÎļþÒÑɾ³ý

 src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java

ÎļþÒÑɾ³ý

 src/main/java/com/ruoyi/sales/service/ShipmentApprovalService.java

ÎļþÒÑɾ³ý

 src/main/java/com/ruoyi/sales/service/impl/ShipmentApprovalServiceImpl.java

ÎļþÒÑɾ³ý

 src/main/resources/mapper/sales/ShipmentApprovalMapper.xml

ÎļþÒÑɾ³ý