feat(approve): 实现审批流程或签会签功能并优化数据库配置

云

2 天以前 f350465db70d6f9db9494483ee0cec7793a9007b

 src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java

@@ -18,6 +18,7 @@
import com.ruoyi.production.service.ProductProcessService;
import com.ruoyi.production.service.ProductWorkOrderService;
import com.ruoyi.production.service.ProductionPrintOrderService;
import com.ruoyi.production.service.ProductionProductMainService;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -68,6 +69,8 @@
    private SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;
    @Autowired
    private StockUtils stockUtils;
    @Autowired
    private ProductionProductMainService productionProductMainService;

    @Override
    public IPage<ProductOrderDto> pageProductOrder(Page page, ProductOrderDto productOrder) {
@@ -116,6 +119,7 @@
            productProcessRouteItem.setProductOrderId(productOrder.getId());
            productProcessRouteItem.setProductRouteId(productProcessRoute.getId());
            productProcessRouteItem.setDragSort(processRouteItem.getDragSort());
            productProcessRouteItem.setIsQuality(processRouteItem.getIsQuality());
            int insert = productProcessRouteItemMapper.insert(productProcessRouteItem);
            if (insert > 0) {

@@ -129,6 +133,8 @@
                productWorkOrderMapper.insert(productWorkOrder);
            }
        }
        // 排产下达后自动触发第一道需质检工序的过程检验
        productionProductMainService.preGenerateQualityInspectForOrder(productOrder.getId());
        return productOrderMapper.updateById(productOrder);
    }

@@ -166,6 +172,9 @@
            if (productionProductMains.size() > 0) {
                throw new RuntimeException("生产订单已经开始生产,不能删除");
            }
            // 清理排产预生成的质检单
            productionProductMainService.cleanPreGeneratedQualityInspects(
                    productWorkOrders.stream().map(ProductWorkOrder::getId).collect(Collectors.toList()));
            //删除工单
            productWorkOrderMapper.delete(Wrappers.<ProductWorkOrder>lambdaQuery().in(ProductWorkOrder::getProductOrderId, ids));
        }
@@ -213,8 +222,8 @@
        return "SC" + datePrefix + formatOrderSequence(datePrefix);
    }

    public String generateNextOrderByContractNo(String datePrefix, String contractNo) {
        return contractNo + formatOrderSequence(datePrefix);
    public String generateNextOrderByContractNo(String contractNo) {
        return contractNo + formatOrderSequenceByContractNo(contractNo);
    }

    private String formatOrderSequence(String datePrefix) {
@@ -233,4 +242,12 @@
        return String.format("%04d", sequence);
    }


    private String formatOrderSequenceByContractNo(String contractNo) {
        LambdaQueryWrapper<ProductOrder> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.likeRight(ProductOrder::getNpsNo, contractNo);
        Long count = productOrderMapper.selectCount(queryWrapper);
        return String.format("%04d", count+1);
    }

}