diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java index ea05c88..3b13c90 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java @@ -84,33 +84,53 @@ public class OrderYsServiceImpl implements OrderYsService { @Override public void createOrUpdate(ProjectOrderSaveReqVO operateReqVO) { - if (operateReqVO.getHasPrice().equals(1)){ - OrderYsDO orderYsDO = new OrderYsDO(); - orderYsDO.setCode(operateReqVO.getCode()); - orderYsDO.setProjectName(operateReqVO.getProjectName()); - orderYsDO.setCgTime(LocalDateTime.now()); - orderYsDO.setCgKhname(customerService.getCustomer(operateReqVO.getCustomerId()).getName()); - if(operateReqVO.getPrice()==null){ - orderYsDO.setCgYs(new BigDecimal(0)); - }else { - orderYsDO.setCgYs(operateReqVO.getPrice()); - LocalDateTime[] paymentTimes = { - operateReqVO.getSixFuKuanTime(), - operateReqVO.getFiveFuKuanTime(), - operateReqVO.getFourFuKuanTime(), - operateReqVO.getThreeFuKuanTime(), - operateReqVO.getTwoFuKuanTime(), - operateReqVO.getShouFuKuanTime() - }; - for (LocalDateTime paymentTime : paymentTimes) { - if (!ObjectUtil.isEmpty(paymentTime)) { - orderYsDO.setPaymentDate(paymentTime); - break; + LambdaQueryWrapper eq = new LambdaQueryWrapper().eq(OrderYsDO::getCode, operateReqVO.getCode()); + OrderYsDO orderYsDO = orderYsMapper.selectOne(eq); + if (ObjectUtil.isEmpty(orderYsDO)){ + if (operateReqVO.getHasPrice().equals(1)) { + orderYsDO = new OrderYsDO(); + orderYsDO.setCode(operateReqVO.getCode()); + orderYsDO.setProjectName(operateReqVO.getProjectName()); + orderYsDO.setCgTime(LocalDateTime.now()); + orderYsDO.setCgKhname(customerService.getCustomer(operateReqVO.getCustomerId()).getName()); + if(operateReqVO.getPrice()==null){ + orderYsDO.setCgYs(new BigDecimal(0)); + }else { + orderYsDO.setCgYs(operateReqVO.getPrice()); + LocalDateTime[] paymentTimes = { + operateReqVO.getSixFuKuanTime(), + operateReqVO.getFiveFuKuanTime(), + operateReqVO.getFourFuKuanTime(), + operateReqVO.getThreeFuKuanTime(), + operateReqVO.getTwoFuKuanTime(), + operateReqVO.getShouFuKuanTime() + }; + for (LocalDateTime paymentTime : paymentTimes) { + if (!ObjectUtil.isEmpty(paymentTime)) { + orderYsDO.setPaymentDate(paymentTime); + break; + } } } } - orderYsMapper.insert(orderYsDO); + }else { + orderYsDO.setCgYs(operateReqVO.getPrice()); + LocalDateTime[] paymentTimes = { + operateReqVO.getSixFuKuanTime(), + operateReqVO.getFiveFuKuanTime(), + operateReqVO.getFourFuKuanTime(), + operateReqVO.getThreeFuKuanTime(), + operateReqVO.getTwoFuKuanTime(), + operateReqVO.getShouFuKuanTime() + }; + for (LocalDateTime paymentTime : paymentTimes) { + if (!ObjectUtil.isEmpty(paymentTime)) { + orderYsDO.setPaymentDate(paymentTime); + break; + } + } + orderYsMapper.updateById(orderYsDO); } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java index 63c2ef5..2b6d774 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java @@ -195,23 +195,30 @@ public class ProjectOrderServiceImpl implements ProjectOrderService { LambdaQueryWrapper eq = new LambdaQueryWrapper().eq(OrderYsDO::getCode, updateReqVO.getCode()); OrderYsDO orderYsDO = orderYsMapper.selectOne(eq); if (ObjectUtil.isEmpty(orderYsDO)){ - orderYsDO = new OrderYsDO(); - orderYsDO.setCode(updateReqVO.getCode()); - orderYsDO.setProjectName(updateReqVO.getProjectName()); - orderYsDO.setCgTime(LocalDateTime.now()); - orderYsDO.setCgYs(updateReqVO.getPrice()); - LocalDateTime[] paymentTimes = { - updateReqVO.getSixFuKuanTime(), - updateReqVO.getFiveFuKuanTime(), - updateReqVO.getFourFuKuanTime(), - updateReqVO.getThreeFuKuanTime(), - updateReqVO.getTwoFuKuanTime(), - updateReqVO.getShouFuKuanTime() - }; - for (LocalDateTime paymentTime : paymentTimes) { - if (!ObjectUtil.isEmpty(paymentTime)) { - orderYsDO.setPaymentDate(paymentTime); - break; + if (updateReqVO.getHasPrice().equals(1)) { + orderYsDO = new OrderYsDO(); + orderYsDO.setCode(updateReqVO.getCode()); + orderYsDO.setProjectName(updateReqVO.getProjectName()); + orderYsDO.setCgTime(LocalDateTime.now()); + orderYsDO.setCgKhname(customerService.getCustomer(updateReqVO.getCustomerId()).getName()); + if(updateReqVO.getPrice()==null){ + orderYsDO.setCgYs(new BigDecimal(0)); + }else { + orderYsDO.setCgYs(updateReqVO.getPrice()); + LocalDateTime[] paymentTimes = { + updateReqVO.getSixFuKuanTime(), + updateReqVO.getFiveFuKuanTime(), + updateReqVO.getFourFuKuanTime(), + updateReqVO.getThreeFuKuanTime(), + updateReqVO.getTwoFuKuanTime(), + updateReqVO.getShouFuKuanTime() + }; + for (LocalDateTime paymentTime : paymentTimes) { + if (!ObjectUtil.isEmpty(paymentTime)) { + orderYsDO.setPaymentDate(paymentTime); + break; + } + } } } orderYsMapper.insert(orderYsDO); @@ -470,7 +477,7 @@ public class ProjectOrderServiceImpl implements ProjectOrderService { // List pageResult = storageLogService.getStorageNowPagesmall(pageReqVO);//查询符合条件的值 for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { { - // for (StorageLogNowDO storageLogNowDO : pageResult) { + // for (StorageLogNowDO storgeLogNowDO : pageResult) { bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 BdgzsomthingDO.setThings(operateReqVO.getProjectName()+operateReqVO.getContractNo()+"价格没有录入系统");//事件名称 @@ -507,7 +514,7 @@ public class ProjectOrderServiceImpl implements ProjectOrderService { } }else{ - if ("PRICE".equals(operateReqVO.getActive())){ + if ("ALTER".equals(operateReqVO.getActive())){ updateProjectOrderPrice(operateReqVO); }else { updateProjectOrder(operateReqVO); 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 f6fe5cd..4c60a0b 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 @@ -197,7 +197,7 @@ + :disabled="detailDisabled || formData.hasPrice == 0" /> @@ -207,7 +207,7 @@ + :disabled="detailDisabled || formData.hasPrice == 0" /> @@ -217,7 +217,7 @@ + :disabled="detailDisabled || formData.hasPrice == 0" /> @@ -397,7 +397,7 @@ + :disabled="detailDisabled || formData.hasPrice == 0" /> @@ -407,7 +407,7 @@ + :disabled="detailDisabled || formData.hasPrice == 0" /> @@ -417,7 +417,7 @@ + :disabled="detailDisabled || formData.hasPrice == 0" /> diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue index ef058ae..57469eb 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue @@ -141,9 +141,9 @@ ref="multipleTableRef" 删除 - - 录入价格 - + + + 编辑