From d8d129a2e41f7099968cb4f4dc1b028ab985135f Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 16 十一月 2023 20:20:47 +0800
Subject: [PATCH] Changes14
---
mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java | 55 ++++++++++++++++---------------------------------------
1 files changed, 16 insertions(+), 39 deletions(-)
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
index 04fa92d..348755a 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
+++ b/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) {
@@ -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() + "銆慚ES鏈湴鏌ユ棤鍖归厤闆朵欢瀵硅薄");
- }
- }
- 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() + "銆慚ES鏈湴鏌ユ棤鍖归厤闆朵欢瀵硅薄");
- }
- }
- // 濡傛灉閿�鍞浂浠跺彿鏈慨鏀癸紝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
@@ -1933,7 +1908,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();
--
Gitblit v1.9.3