Changes16

Fixiaobai

2023-11-17 2fb28b36f15de26249ae34160e1accf118c011c7

 mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java

@@ -259,11 +259,14 @@
      if (isAudit.equals(AuditStateStringValues.ACCEPTED)) {
         //TODO: 要加零件id参数
         Document document = documentMapper.selectById(customerOrder.getTechnologyDocumentId());
         Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getEngChgLevel, "1").eq(Part::getId,customerOrder.getPartId() ));
         if( null == document){
            throw new RuntimeException("缺少工艺文件");
         }
         Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getEngChgLevel, "1").eq(Part::getId,document.getPartId() ));
         if (null == part) {
            throw new RuntimeException("根据零件编号 = 【" + customerOrder.getPartNo() + "】MES本地查无匹配零件对象");
         }
         if (!part.getMaterialType().equals("3") && null == document) {
         if (!"3".equals(part.getMaterialType())) {
            throw new RuntimeException("缺少工艺文件");
         }
         customerOrder.setCoState(CustomerOrderStateStringValues.PLAN);
@@ -347,6 +350,9 @@

   @Override
   public boolean createMasterProductionSchedule(List<CustomerOrderDTO> customerOrderDTOList) {
      customerOrderDTOList.forEach(c->{
         log.info("主生产计划------------>"+JSONObject.toJSONString(c));
      });
      List<Long> ids = customerOrderDTOList.stream().map(CustomerOrderDTO::getId).collect(Collectors.toList());
      Integer count = getBaseMapper().selectCount(Wrappers.<CustomerOrder>lambdaQuery()
            .ne(CustomerOrder::getIsAudit, AuditStateStringValues.ACCEPTED)
@@ -384,11 +390,12 @@
         masterProductionSchedule.setDocNumber(customerOrderDTO.getDocNumber());
         //需求数量
         masterProductionSchedule.setQtyRequired(qta);
         //需求日期
         masterProductionSchedule.setRequiredDate(customerOrderDTO.getDeliveryDate());
         //承诺日期
         masterProductionSchedule.setPromisedDeliveryDate(customerOrderDTO.getDeliveryDate());
         //备注
         masterProductionSchedule.setRemark(customerOrderDTO.getRemark());
         masterProductionSchedule.setQtyRequired(qta);
         //客户需求日期
         masterProductionSchedule.setRequiredDate(customerOrderDTO.getWantedDeliveryDate());
         masterProductionSchedule.setRemark(customerOrderDTO.getRemark());
         masterProductionSchedule.setSource("销售订单");