zuofei

zss

2023-11-15 64065aae1700dc271ab4a852f586dfc9de284784

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

@@ -5,7 +5,6 @@
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.BooleanUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
import com.alibaba.excel.EasyExcel;
@@ -51,6 +50,7 @@
import com.chinaztt.mes.plan.util.CustomerOrderClientConfigure;
import com.chinaztt.mes.plan.util.CustomerOrderUnitWhiteListConfig;
import com.chinaztt.mes.plan.util.CustomerOrderUtil;
import com.chinaztt.mes.plan.util.FileSaveUtil;
import com.chinaztt.mes.plan.vo.CustomerOrderVO1;
import com.chinaztt.mes.quality.dto.CustomOrderSyncDTO;
import com.chinaztt.mes.technology.entity.*;
@@ -97,6 +97,7 @@
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
@@ -186,6 +187,14 @@
   private final static String MO_RETURN_STAFF = "MO_RETURN_STAFF";

   private Environment environment;

   private final static String OTC_MAIN_STATUS_CANCEL = "已取消";

   private final static String OTC_MAIN_STATUS_TRANSMIT = "已下达";

   private final static String AFFILIATED_CONTRACT = "中天注塑厂";



   @Override
   public void otcDownload(Long id, HttpServletResponse response) {
@@ -387,18 +396,28 @@
         // }
         //保存主生产计划
         MasterProductionSchedule masterProductionSchedule = new MasterProductionSchedule();
         //主生产计划号
         masterProductionSchedule.setMpsNo(scheduleNumberGenerator.generateNumberWithPrefix(MasterProductionSchedule.DIGIT, MasterProductionSchedule.PREFIX, MasterProductionSchedule::getMpsNo));
         masterProductionSchedule.setPartId(customerOrderDTO.getPartId());
         Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getPartNo, customerOrderDTO.getPartNo()));
         //零件id
         masterProductionSchedule.setPartId(part.getId());
         //将审核状态和工艺文件的id同步给生产计划
         masterProductionSchedule.setIsAudit(customerOrderDTO.getIsAudit());
         masterProductionSchedule.setTechnologyDocumentId(customerOrderDTO.getTechnologyDocumentId());
         masterProductionSchedule.setManufactureAttr(customerOrderDTO.getManufactureAttr());
         masterProductionSchedule.setDocNumber(customerOrderDTO.getDocNumber());
         //需求数量
         masterProductionSchedule.setQtyRequired(qta);
         //需求日期
         masterProductionSchedule.setRequiredDate(customerOrderDTO.getDeliveryDate());
         //备注
         masterProductionSchedule.setRemark(customerOrderDTO.getRemark());
         masterProductionSchedule.setQtyRequired(qta);
         masterProductionSchedule.setRequiredDate(customerOrderDTO.getWantedDeliveryDate());
         masterProductionSchedule.setRemark(customerOrderDTO.getRemark());
         masterProductionSchedule.setSource("销售订单");
         masterProductionScheduleMapper.insert(masterProductionSchedule);
         customerOrderDTO.setRequireNumber(customerOrderDTO.getQtyPlaned());

         // if (CollectionUtil.isNotEmpty(operationTaskProduceList)) {
         //    for (OperationTaskProduce operationTaskProduce : operationTaskProduceList) {
@@ -425,6 +444,7 @@
      return true;
   }

   //多个销售订单创建一个主生产计划
   @Override
   public MasterProductionSchedule createOneMasterProductionScheduleByCustomerOrders(List<CustomerOrderDTO> customerOrders) {
      List<Long> ids = customerOrders.stream().map(CustomerOrderDTO::getId).collect(Collectors.toList());
@@ -586,17 +606,20 @@
         return R.failed("工艺文件缺失");
      }
      List<CustomerOrder> customerOrderList = baseMapper.selectBatchIds(ids);
      customerOrderList.forEach(l->{
         log.info("关联数据==============================>"+l);
      });
      String msg = "";
      for (CustomerOrder customerOrder : customerOrderList) {
         if (BooleanUtil.isTrue(customerOrder.getIsDocument())) {
            msg += customerOrder.getCustomerOrderNo() + "已关联工艺文件！";
         }
         if (StringUtils.isBlank(customerOrder.getSalesPartNo())) {
         if (StringUtils.isBlank(customerOrder.getPartNo())) {
            msg += customerOrder.getCustomerOrderNo() + "未选择销售件！";
         }
         if (StringUtils.isBlank(customerOrder.getPartNo())) {
            customerOrder.setPartNo(document.getPartNo());
         }
         //if (StringUtils.isBlank(customerOrder.getPartNo())) {
         //   customerOrder.setPartNo(document.getPartNo());
         //}
         customerOrder.setIsDocument(true);
         customerOrder.setCoState(CustomerOrderStateStringValues.PLAN);
         customerOrder.setTechnologyDocumentId(docId);
@@ -655,6 +678,7 @@
    * @return
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public R otcCustomerOrderSync(String selectTime, String pathCode) {
      try {
         if (StringUtils.isBlank(selectTime)) {
@@ -685,7 +709,7 @@
               .contentType("application/json")
               .header("Authorization", "Bearer " + token).form(map).execute().body();
         JSONObject result = JSONObject.parseObject(str);
         //JSONArray jsonArray = result.getJSONArray("data");
         log.info("主表长度============================================>"+result.getJSONArray("data").size());
         //jsonArray.forEach();
         //return null;
         //主表参数表
@@ -705,7 +729,7 @@
               //所属工厂
               String affiliatedContract=customerJSONObject.getString("affiliatedContract");
               //只拉取所属公司为中天海洋系统有限公司的数据
               if (!"中天材料厂".equals(affiliatedContract)){
               if (!AFFILIATED_CONTRACT.equals(affiliatedContract)){
                  continue;
               }
               // 不在这几个状态中的数据就跳过
@@ -717,14 +741,14 @@
                  customer = new Customer();
               }
               //如果OTC中主表状态是取消那就跳过或者删除已经同步的数据
               if ("已取消".equals(otcMainStatus)) {
               if (OTC_MAIN_STATUS_CANCEL.equals(otcMainStatus)) {
                  if (customer.getId() != null) {
                     customerMapper.deleteById(customer.getId());
                     baseMapper.delete(Wrappers.<CustomerOrder>lambdaQuery().eq(CustomerOrder::getCustomerId, customer.getId()));
                  }
                  continue;
               }
               if (!"已下达".equals(otcMainStatus)) {//null == affiliatedCompany || !Arrays.asList("已下达").contains(otcMainStatus) /*|| affiliatedCompany.equals("江苏中天科技股份有限公司")*/) {
               if (!OTC_MAIN_STATUS_TRANSMIT.equals(otcMainStatus)) {//null == affiliatedCompany || !Arrays.asList("已下达").contains(otcMainStatus) /*|| affiliatedCompany.equals("江苏中天科技股份有限公司")*/) {
                  continue;//只获取OTC中已审核及已下达的订单，
               }
               //客户编号
@@ -1864,15 +1888,14 @@

   @Override
   public R uploadProcessConfigFile(MultipartFile file, String orderNumber, String lineNumber) {
      String fileName = IdUtil.simpleUUID() + StrUtil.DOT + FileUtil.extName(file.getOriginalFilename());
      String fileName = FileUtil.extName(file.getOriginalFilename());
      try {
         minioTemplate.putObject(ossProperties.getBucketName(), fileName, file.getInputStream());
         OrderProcessConfigFile configFile = new OrderProcessConfigFile();
         configFile.setFileName(fileName);
         configFile.setOriginalFileName(file.getOriginalFilename());
         configFile.setOrderNumber(orderNumber);
         configFile.setLineNumber(lineNumber);
         configFile.setBucketName(ossProperties.getBucketName());
         configFile.setBucketName(FileSaveUtil.StoreFile(file));
         orderProcessConfigFileMapper.insert(configFile);
         ProcessConfigFileOrderMapping mapping = ProcessConfigFileOrderMapping.builder().configFileId(configFile.getId())
               .orderNumber(orderNumber).lineNumber(lineNumber).build();
@@ -1899,7 +1922,9 @@

   @Override
   public void getFile(String bucket, String fileName, HttpServletResponse response) {
      try (InputStream inputStream = minioTemplate.getObject(bucket, fileName)) {
      try {
         String path = FileSaveUtil.FILE_PATH + bucket;
         InputStream inputStream = new FileInputStream(path);
         response.setContentType("application/octet-stream; charset=UTF-8");
         IoUtil.copy(inputStream, response.getOutputStream());
      } catch (Exception e) {