委外订单-新增外协直发相关字段

zouyu

2023-11-17 1fa6108f990c0ed8666f563a025a4cb619aebd8b

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

@@ -286,42 +286,17 @@


   @Override
   public R fullUpdate(CustomerOrderDTO customerOrderDTO) {
      List<String> unitWhitMapList = customerOrderUnitWhiteListConfig.getUnitWhitListMap();
      String unitConcat = customerOrderDTO.getOtcUnit() + "_" + customerOrderDTO.getIfsSalesUnit();
      if (!customerOrderDTO.getOtcUnit().equals(customerOrderDTO.getIfsSalesUnit()) && !unitWhitMapList.contains(unitConcat)) {
         //如果销售单位和ifs中销售单位不一样则不给保存A
         return R.failed("订单行销售单位和销售件销售计量单位不一致并且白名单中不存在对应关系");
      } else {
         if (StringUtils.isNotBlank(customerOrderDTO.getPartNo())) {
            Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getPartNo, customerOrderDTO.getPartNo()));
            if (null == part) {
               throw new RuntimeException("根据零件编号 = 【" + customerOrderDTO.getPartNo() + "】MES本地查无匹配零件对象");
            }
         }
         if (StringUtils.isNotBlank(customerOrderDTO.getSalesPartNo())) {
            Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getPartNo, customerOrderDTO.getSalesPartNo()));
            if (null == part) {
               throw new RuntimeException("根据销售件编号 = 【" + customerOrderDTO.getSalesPartNo() + "】MES本地查无匹配零件对象");
            }
         }
         // 如果销售零件号未修改，otc同步状态不需要更新
         CustomerOrder oriCustomerOrder = customerOrderMapper.selectById(customerOrderDTO.getId());
         if (!org.apache.commons.lang3.StringUtils.equals(oriCustomerOrder.getSalesPartNo(),
               customerOrderDTO.getSalesPartNo())) {
            customerOrderDTO.setOtcPartSync(false);
         }
         //mes数量 = 订单数量 * 因子
         Assert.notNull(customerOrderDTO.getIfsConvFactor(), "请选择销售零件号");
         customerOrderDTO.setBuyQtyDue(customerOrderDTO.getIfsConvFactor().multiply(customerOrderDTO.getOtcQuantity()));
         if (BooleanUtil.isTrue(customerOrderDTO.getIsDocument())) {
            customerOrderDTO.setCoState(CustomerOrderStateStringValues.PLAN);
         } else {
            customerOrderDTO.setCoState(CustomerOrderStateStringValues.TECHNOLOGYUNCHECK);
         }
         updateById(customerOrderDTO);
         return R.ok();
      }
   public R fullUpdate(CustomerOrderVO1 customerOrderVO1) {
      CustomerOrder customerOrder = new CustomerOrder();
      BeanUtils.copyProperties(customerOrderVO1,customerOrder);
      customerOrder.setId(customerOrderVO1.getId());
      customerOrderMapper.updateById(customerOrder);

      Customer customer = new Customer();
      BeanUtils.copyProperties(customerOrderVO1,customer);
      customer.setId(customerOrderMapper.selectById(customerOrderVO1.getId()).getCustomerId());
      customerMapper.updateById(customer);
      return R.ok("修改成功!");
   }

   @Override
@@ -709,9 +684,6 @@
               .contentType("application/json")
               .header("Authorization", "Bearer " + token).form(map).execute().body();
         JSONObject result = JSONObject.parseObject(str);
         log.info("主表长度============================================>"+result.getJSONArray("data").size());
         //jsonArray.forEach();
         //return null;
         //主表参数表
         List<OrderParam> orderParams = orderParamService.list();
         if (result.getInteger("code") == 0) {
@@ -836,7 +808,7 @@
                  customerOrder = new CustomerOrder();
               }
               //如果这个单子在OTC中取消状态 那就删除
               if (otcOrderStatus.equals("已取消")) {
               if (otcOrderStatus.equals(OTC_MAIN_STATUS_CANCEL)) {
                  if (customerOrder.getId() != null) {
                     baseMapper.deleteById(customerOrder.getId());
                  }
@@ -924,7 +896,7 @@
                  } else {
                     customerOrder.setCoState(CustomerOrderStateStringValues.PARTUNCHECKED);
                  }
                  if (org.apache.commons.lang3.StringUtils.equals("已下达", otcMainStatus)) {
                  if (org.apache.commons.lang3.StringUtils.equals(OTC_MAIN_STATUS_TRANSMIT, otcMainStatus)) {
                     customerOrder.setCoState(CustomerOrderStateStringValues.TECHNOLOGYUNCHECK);
                     customerOrder.setOtcPartSync(Boolean.TRUE);
                  }
@@ -933,8 +905,8 @@
                     customerOrder.setCoState(CustomerOrderStateStringValues.TECHNOLOGYUNCHECK);
                     customerOrder.setOtcPartSync(Boolean.TRUE);
                  }
                  //审核状态为 01draft 草稿
                  customerOrder.setIsAudit(AuditStateStringValues.DRAFT);
                  //审核状态为 03accepted 通过
                  customerOrder.setIsAudit(AuditStateStringValues.ACCEPTED);
                  baseMapper.insert(customerOrder);
               }
               addCustomerPara(customerJSONObject, customerOrderJSONObject, customerOrder, orderParamList);