diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java index d2a2cc3b..e065513b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java @@ -106,7 +106,7 @@ public class ProjectOrderController { @Transactional(rollbackFor = Exception.class) public CommonResult operateProjectOrder(@Valid @RequestBody ProjectOrderSaveReqVO operateReqVO) { LocalDateTime startTime = LocalDateTime.now(); - if ("ALTER".equals(operateReqVO.getActive())) { + if ("ALTER".equals(operateReqVO.getActive()) && operateReqVO.getDeliveryStatus() != 3) { List list = operateReqVO.getProjectOrderSubs(); List updateList = list.stream().filter(o -> o.getId() != null).collect(Collectors.toList()); for (ProjectOrderSubDO projectOrderSubDO : updateList) { diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue index 573d12cc..2f6ce397 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue @@ -399,7 +399,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" @@ -509,7 +509,7 @@ class="!w-703px" :disabled="detailDisabled || priceDisabled || formData.delivery