yys 1.销售，采购台账产品反着来 2.产品图纸带到生产订单来

云

23 小时以前 4bcd26a4975d6722bff65690e7a8331cd0afd520

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

@@ -15,6 +15,7 @@
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.dto.ProductWorkOrderDto;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductOrderService;
@@ -33,6 +34,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -101,8 +103,71 @@
            // 附件
            productOrderDto.setSalesLedgerFiles(commonFileService.getFileListByBusinessId(productOrderDto.getId()
            , FileNameType.PRODUCT_ORDER.getValue()));
            // 获取对应工单记录
            ProductWorkOrderDto productWorkOrder = new ProductWorkOrderDto();
            productWorkOrder.setProductOrderId(productOrderDto.getId());
            List<ProductWorkOrderDto> productWorkOrders = productWorkOrderMapper.getProductWorkOrderList(productWorkOrder);
            if(CollectionUtils.isNotEmpty(productWorkOrders)){
                productOrderDto.setProductWorkOrders(calculateColor(productWorkOrders));
            }

        });
        return productOrderDtoIPage;
    }

    /**
     * 自动计算颜色（核心方法）
     * @param productWorkOrders
     */
    public List<ProductWorkOrderDto> calculateColor(List<ProductWorkOrderDto> productWorkOrders) {
        List<ProductWorkOrderDto> result = new java.util.ArrayList<>();
        for (int i = 0; i < productWorkOrders.size(); i++) {
            ProductWorkOrderDto current = productWorkOrders.get(i);
            // 判断是否存在下一道工单 + 下一道工单是否有完成数量
            boolean nextOrderHasComplete = false;  // 黄色
            boolean nextOrderHasScrap = false; // 红色
            // 如果不是最后一条，就取下一条判断
            for (int j = i + 1; j < productWorkOrders.size(); j++) {
                if (i < productWorkOrders.size() - 1) {
                    ProductWorkOrderDto next = productWorkOrders.get(j);
                    BigDecimal nextComplete = next.getCompleteQuantity() == null ? BigDecimal.ZERO : next.getCompleteQuantity();
                    BigDecimal nextScrap = next.getPlanQuantity() == null ? BigDecimal.ZERO : next.getPlanQuantity();
                    // 下一道工单完成数量 > 0
                    nextOrderHasComplete = nextComplete.compareTo(BigDecimal.ZERO) > 0;

                    nextOrderHasScrap = nextComplete.compareTo(nextScrap) == 0;
                    break;
                }
            }
            // =============== 核心：计算颜色并赋值 ===============
            BigDecimal planQty = current.getPlanQuantity() == null ? BigDecimal.ZERO : current.getPlanQuantity();
            BigDecimal completeQty = current.getCompleteQuantity() == null ? BigDecimal.ZERO : current.getCompleteQuantity();

            // 1. 当前工序完成数量等于0 且 下一道工序已完成 → 红色(4)
            if (completeQty.compareTo(BigDecimal.ZERO) == 0
                    && nextOrderHasScrap) {
                current.setColor(4);
            }
            // 2. 需求数量 > 完成数量（未完成） 且 下一道工序完成数量 > 0 → 黄色(2)
            else if (planQty.compareTo(completeQty) > 0
                    && nextOrderHasComplete) {
                current.setColor(2);
            }
            // 3. 完成数量=0 → 灰色(1)
            else if (completeQty.compareTo(BigDecimal.ZERO) == 0) {
                current.setColor(1);
            }
            // 4. 完成数量=需求数量 → 绿色(3)
            else if (completeQty.compareTo(planQty) == 0) {
                current.setColor(3);
            }
            // 其他情况默认灰色（可选）
            else {
                current.setColor(1);
            }
            result.add(current);
        }
        return result;
    }

    @Override
@@ -116,11 +181,13 @@
        productProcessRoute.setBomId(processRoute.getBomId());
        productProcessRouteMapper.insert(productProcessRoute);
        // 绑定生产bom清单
        List<ProductStructureRecord> productStructureDtos = productOrder.getProductStructureRecords();
        productStructureDtos.forEach(item ->{
            item.setProductOrderId(productOrder.getId());
            productStructureRecordMapper.insert(item);
        });
        if(CollectionUtils.isNotEmpty(productOrder.getProductStructureRecords())){
            List<ProductStructureRecord> productStructureDtos = productOrder.getProductStructureRecords();
            productStructureDtos.forEach(item ->{
                item.setProductOrderId(productOrder.getId());
                productStructureRecordMapper.insert(item);
            });
        }
        //新增生产订单下的工艺路线子表
        List<ProductProcessRouteItem> processRouteItems = productOrder.getProcessRouteItems();
        // 生成当前日期的前缀：年月日
@@ -137,8 +204,7 @@
                ProductWorkOrder productWorkOrder = new ProductWorkOrder();
                productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
                productWorkOrder.setProductOrderId(productOrder.getId());
                ProductOrder order = productOrderMapper.selectById(productOrder.getId());
                productWorkOrder.setPlanQuantity(order.getQuantity());
                productWorkOrder.setPlanQuantity(BigDecimal.valueOf(productProcessRouteItem.getPlanNum()));
                productWorkOrder.setWorkOrderNo(workOrderNoStr);
                productWorkOrder.setPlanStartTime(productProcessRouteItem.getPlanStartTime());
                productWorkOrder.setPlanEndTime(productProcessRouteItem.getPlanEndTime());
@@ -197,14 +263,14 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean delete(Long[] ids) {
    public Boolean delete(Long[] idList) {
        //批量查询productOrder
        List<ProductOrder> productOrders = productOrderMapper.selectList(
                new LambdaQueryWrapper<ProductOrder>()
                        .in(ProductOrder::getId, ids)
                        .in(ProductOrder::getId, Arrays.asList(idList))
        );
        if (!org.springframework.util.CollectionUtils.isEmpty(productOrders)) {

            List<Long> ids = productOrders.stream().map(ProductOrder::getId).collect(Collectors.toList());

            // 批量查询processRouteItems
            List<ProductProcessRouteItem> allRouteItems = productProcessRouteItemMapper.selectList(
@@ -240,7 +306,7 @@
                    // 删除产出表、投入表数据
                    if (!com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(productMainIds)) {
                        productionProductOutputMapper.deleteByProductMainIds(productMainIds);
                        productionProductInputMapper.deleteByProductMainIds(productMainIds);
                        productionProductInputMapper.deleteByProductMainIds(ids);
                        List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(
                                new LambdaQueryWrapper<QualityInspect>()
                                        .in(QualityInspect::getProductMainId, productMainIds)
@@ -283,7 +349,7 @@
            productOrderMapper.delete(new LambdaQueryWrapper<ProductOrder>()
                    .in(ProductOrder::getId, ids));
            // 删除附件
            commonFileService.deleteByBusinessIds(Arrays.asList(ids), FileNameType.PRODUCT_ORDER.getValue());
            commonFileService.deleteByBusinessIds(ids, FileNameType.PRODUCT_ORDER.getValue());
            // 删除生产订单-物料清单
            productStructureRecordMapper.delete(new LambdaQueryWrapper<ProductStructureRecord>()
                    .in(ProductStructureRecord::getProductOrderId, ids));