注塑厂后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
Fixiaobai
2023-11-17 6ee9d58d62dbbccf95ce809f358ec9f8d088b705 
 mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java


@@ -93,10 +93,10 @@


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.transaction.interceptor.TransactionAspectSupport;


import org.springframework.util.Assert;


import org.springframework.web.multipart.MultipartFile;




import javax.servlet.http.HttpServletResponse;


import java.io.File;


import java.io.FileInputStream;


import java.io.IOException;


import java.io.InputStream;


@@ -194,7 +194,7 @@




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






   //private FileSaveUtil fileSaveUtil;




   @Override


   public void otcDownload(Long id, HttpServletResponse response) {


@@ -257,8 +257,9 @@


   private void changeAudit(CustomerOrder customerOrder, String isAudit) {


      //审核状态 通过 订单状态待计划


      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::getPartNo, customerOrder.getPartNo()));


         Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getEngChgLevel, "1").eq(Part::getId,customerOrder.getPartId() ));


         if (null == part) {


            throw new RuntimeException("根据零件编号 = 【" + customerOrder.getPartNo() + "】MES本地查无匹配零件对象");


         }


@@ -1908,7 +1909,9 @@


   public R deleteProcessConfigFile(Long id) {


      try {


         OrderProcessConfigFile configFile = orderProcessConfigFileMapper.selectById(id);


         minioTemplate.removeObject(configFile.getBucketName(), configFile.getFileName());


         String filePath=FileSaveUtil.FILE_PATH+"//"+configFile.getBucketName();


         boolean del = FileUtil.del(new File(filePath));


         //minioTemplate.removeObject(configFile.getBucketName(), configFile.getFileName());


         orderProcessConfigFileMapper.deleteById(id);


         processConfigFileOrderMappingMapper.delete(Wrappers.<ProcessConfigFileOrderMapping>lambdaQuery().eq(ProcessConfigFileOrderMapping::getConfigFileId, id));


         return R.ok();