产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liding
2026-04-23 8e4456bfa6dc84a1c37c13ee515fa9d6347cc480 
 src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java


@@ -15,60 +15,24 @@


import com.ruoyi.common.exception.ServiceException;


import com.ruoyi.production.bean.dto.ProductionOrderDto;


import com.ruoyi.production.bean.vo.ProductionOrderVo;


import com.ruoyi.production.mapper.ProductionBomStructureMapper;


import com.ruoyi.production.mapper.ProductionOperationTaskMapper;


import com.ruoyi.production.mapper.ProductionOrderBomMapper;


import com.ruoyi.production.mapper.ProductionOrderMapper;


import com.ruoyi.production.mapper.ProductionOrderPickMapper;


import com.ruoyi.production.mapper.ProductionOrderPickRecordMapper;


import com.ruoyi.production.mapper.ProductionOrderRoutingMapper;


import com.ruoyi.production.mapper.ProductionOrderRoutingOperationMapper;


import com.ruoyi.production.mapper.ProductionOrderRoutingOperationParamMapper;


import com.ruoyi.production.mapper.ProductionPlanMapper;


import com.ruoyi.production.mapper.ProductionProductMainMapper;


import com.ruoyi.production.pojo.ProductionOrderPick;


import com.ruoyi.production.pojo.ProductionOrderPickRecord;


import com.ruoyi.production.pojo.ProductionBomStructure;


import com.ruoyi.production.pojo.ProductionOperationTask;


import com.ruoyi.production.pojo.ProductionOrder;


import com.ruoyi.production.pojo.ProductionOrderBom;


import com.ruoyi.production.pojo.ProductionOrderRouting;


import com.ruoyi.production.pojo.ProductionOrderRoutingOperation;


import com.ruoyi.production.pojo.ProductionOrderRoutingOperationParam;


import com.ruoyi.production.pojo.ProductionPlan;


import com.ruoyi.production.pojo.ProductionProductMain;


import com.ruoyi.production.enums.ProductOrderStatusEnum;


import com.ruoyi.production.mapper.*;


import com.ruoyi.production.pojo.*;


import com.ruoyi.production.service.ProductionOrderService;


import com.ruoyi.sales.mapper.SalesLedgerMapper;


import com.ruoyi.sales.mapper.SalesLedgerProductMapper;


import com.ruoyi.sales.pojo.SalesLedger;


import com.ruoyi.sales.pojo.SalesLedgerProduct;


import com.ruoyi.production.service.ProductionOrderService;


import com.ruoyi.technology.mapper.TechnologyBomMapper;


import com.ruoyi.technology.mapper.TechnologyBomStructureMapper;


import com.ruoyi.technology.mapper.TechnologyRoutingMapper;


import com.ruoyi.technology.mapper.TechnologyRoutingOperationMapper;


import com.ruoyi.technology.mapper.TechnologyRoutingOperationParamMapper;


import com.ruoyi.technology.pojo.TechnologyBom;


import com.ruoyi.technology.pojo.TechnologyBomStructure;


import com.ruoyi.technology.pojo.TechnologyRouting;


import com.ruoyi.technology.pojo.TechnologyRoutingOperation;


import com.ruoyi.technology.pojo.TechnologyRoutingOperationParam;


import com.ruoyi.technology.mapper.*;


import com.ruoyi.technology.pojo.*;


import lombok.RequiredArgsConstructor;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import java.math.BigDecimal;


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.time.format.DateTimeFormatter;


import java.util.ArrayList;


import java.util.Comparator;


import java.util.HashMap;


import java.util.LinkedHashSet;


import java.util.List;


import java.util.Map;


import java.util.Objects;


import java.util.Set;


import java.util.*;


import java.util.stream.Collectors;




@Service


@@ -591,10 +555,10 @@


            return null;


        }


        if (productionPlan.getPromisedDeliveryDate() != null) {


            return productionPlan.getPromisedDeliveryDate().toLocalDate();


            return productionPlan.getPromisedDeliveryDate();


        }


        if (productionPlan.getRequiredDate() != null) {


            return productionPlan.getRequiredDate().toLocalDate();


            return productionPlan.getRequiredDate();


        }


        return null;


    }