diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index b0e86e29..716cd720 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -113,6 +113,11 @@ cn.hutool hutool-extra + + org.thymeleaf + thymeleaf + true + com.google.zxing core diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java index 35f367e7..6f80fd2d 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java @@ -269,6 +269,7 @@ public class ExecutionTrackServiceImpl implements IExecutionTrackService { updateOrder.setVersionCode(String.valueOf(Integer.parseInt(projectOrderInfo.getVersionCode())+1)); updateOrder.setOrderStatus(ProjectOrderInfo.OrderStatus.APPROVE_REJECT.getCode()); updateOrder.setActualPurchaseAmount(projectOrderInfo.getShipmentAmount()); + updateOrder.setOrderStockingStatus(ProjectOrderInfo.OrderStockingStatusEnum.PHZ.getCode()); updateOrder.setUpdateTime(new Date()); updateOrder.setId(id); projectOrderInfoMapper.updateProjectOrderInfo(updateOrder);