Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

禅道bug#1585修复

Browse Source
This commit is contained in:
gaoqr
2026-05-28 15:32:04 +08:00
parent 7e9198feb1
commit 68b29d3f9b
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java
+5
View File
@@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
import com.alibaba.nacos.common.utils.StringUtils; import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.cf.imes.framework.common.enums.OrderPackageStatusEnum;
import com.cf.imes.framework.common.exception.ErrorCode; import com.cf.imes.framework.common.exception.ErrorCode;
import com.cf.imes.framework.common.exception.ServiceException; import com.cf.imes.framework.common.exception.ServiceException;
import com.cf.imes.framework.common.util.Assert.AssertUtils; import com.cf.imes.framework.common.util.Assert.AssertUtils;
@@ -232,6 +233,10 @@ public class WebCadOrderImportServiceImpl implements WebCadOrderImportService {
if (OrderStatusEnum.EMPTY.getStatus().equals(status)) { if (OrderStatusEnum.EMPTY.getStatus().equals(status)) {
lambdaUpdateWrapper.set(OrderDO::getStatus, OrderStatusEnum.NEW_ORDER.getStatus()); lambdaUpdateWrapper.set(OrderDO::getStatus, OrderStatusEnum.NEW_ORDER.getStatus());
} }
// 已封包的订单修改为未封包
if (OrderPackageStatusEnum.PACKAGED.getStatus().equals(orderDOFromOrderNo.getPackaged())) {
lambdaUpdateWrapper.set(OrderDO::getPackaged, OrderPackageStatusEnum.UNPACKED.getStatus());
}
orderMapper.update(lambdaUpdateWrapper); orderMapper.update(lambdaUpdateWrapper);
} }
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
+5
View File
@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONReader;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.cf.imes.framework.common.enums.OrderPackageStatusEnum;
import com.cf.imes.framework.common.exception.ErrorCode; import com.cf.imes.framework.common.exception.ErrorCode;
import com.cf.imes.framework.common.exception.ServiceException; import com.cf.imes.framework.common.exception.ServiceException;
import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.pojo.CommonResult;
@@ -387,6 +388,10 @@ public class WebCadOrderImportAsyncFactory {
if (OrderStatusEnum.EMPTY.getStatus().equals(status)) { if (OrderStatusEnum.EMPTY.getStatus().equals(status)) {
lambdaUpdateWrapper.set(OrderDO::getStatus, OrderStatusEnum.NEW_ORDER.getStatus()); lambdaUpdateWrapper.set(OrderDO::getStatus, OrderStatusEnum.NEW_ORDER.getStatus());
} }
// 已封包的订单修改为未封包
if (OrderPackageStatusEnum.PACKAGED.getStatus().equals(orderDOFromOrderNo.getPackaged())) {
lambdaUpdateWrapper.set(OrderDO::getPackaged, OrderPackageStatusEnum.UNPACKED.getStatus());
}
orderMapper.update(lambdaUpdateWrapper); orderMapper.update(lambdaUpdateWrapper);
} }
orderDO = orderDOFromOrderNo; orderDO = orderDOFromOrderNo;