diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java index 5b10088..4551002 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java @@ -159,9 +159,9 @@ public class bdgzsomthingController { //@Scheduled(cron = "0 2 0 * * ?") //每天十天执行一次 @PostConstruct public void init() { -// selectHasPrice(); -// selectSafeStorageAndDeliverOneYear(); -// bdgzsomthingService.selectds(); + selectHasPrice(); + selectSafeStorageAndDeliverOneYear(); + bdgzsomthingService.selectds(); } @Scheduled(cron = "0 0 2 * * ?") public void selectHasPrice(){ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java index 6aca62c..88d873e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java @@ -284,26 +284,27 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(PurchaseOrderNoDetailDO::getId,idList); List purchaseOrderNoDetailDOS = purchaseOrderNoDetailMapper.selectList(lambdaQueryWrapper); - List ids = purchaseOrderNoDetailDOS.stream() - .filter(Objects::nonNull) // 过滤空对象 - .map(PurchaseOrderNoDetailDO::getPurchaseOrderId) - .filter(Objects::nonNull) // 过滤空ID - .collect(Collectors.toList()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(PurchaseOrderNoDO::getId,ids); - List purchaseOrderNoDOS = purchaseOrderNoMapper.selectList(queryWrapper); - for (PurchaseOrderNoDO purchaseOrderNoDO : purchaseOrderNoDOS) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PurchaseOrderNoDetailDO::getPurchaseOrderId, purchaseOrderNoDO.getId()); - List lists = purchaseOrderNoDetailMapper.selectList(wrapper); - // 方法1：使用 Stream API（最简洁） - boolean allStatus3 = lists != null && - !lists.isEmpty() && - lists.stream() - .allMatch(detail -> detail.getReceivingStatus()==3); - if (allStatus3) { - //采购订单收货完成 - List attentiontodook = attentiontodoMapper.selectByIdlist(10);//查找该类型的待办和关注人 改 +// List ids = purchaseOrderNoDetailDOS.stream() +// .filter(Objects::nonNull) // 过滤空对象 +// .map(PurchaseOrderNoDetailDO::getPurchaseOrderId) +// .filter(Objects::nonNull) // 过滤空ID +// .collect(Collectors.toList()); +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.in(PurchaseOrderNoDO::getId,ids); +// List purchaseOrderNoDOS = purchaseOrderNoMapper.selectList(queryWrapper); +// for (PurchaseOrderNoDO purchaseOrderNoDO : purchaseOrderNoDOS) { +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.eq(PurchaseOrderNoDetailDO::getPurchaseOrderId, purchaseOrderNoDO.getId()); +// List lists = purchaseOrderNoDetailMapper.selectList(wrapper); +// // 方法1：使用 Stream API（最简洁） +// boolean allStatus3 = lists != null && +// !lists.isEmpty() && +// lists.stream() +// .allMatch(detail -> detail.getReceivingStatus()==3); +// if (allStatus3) { + for (PurchaseOrderNoDetailDO purchaseOrderNoDetailDO : purchaseOrderNoDetailDOS) { + PurchaseOrderNoDO purchaseOrderNoDO = purchaseOrderNoMapper.selectById(purchaseOrderNoDetailDO.getPurchaseOrderId()); + List attentiontodook = attentiontodoMapper.selectByIdlist(10);//查找该类型的待办和关注人 改 String nickname = userApi.getUser(SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); List attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(10); @@ -323,7 +324,7 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { - { + // for (StorageLogNowDO storageLogNowDO : pageResult) { bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 @@ -361,10 +362,10 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe // BdgzsomthingDO.setShowname(operateReqVO.getCreateTime());//获取数据当前表的创建事件 改 bdgzsomthingMapper.insert(BdgzsomthingDO); - // } - } +// } } - } +// } +// } } return success(true); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java index 66b9fb3..a0bae8c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java @@ -363,17 +363,20 @@ public class StorageInServiceImpl implements StorageInService { queryWrapper.in(PurchaseOrderNoDO::getId,ids); List purchaseOrderNoDOS = purchaseOrderNoMapper.selectList(queryWrapper); - for (PurchaseOrderNoDO purchaseOrderNoDO : purchaseOrderNoDOS) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PurchaseOrderNoDetailDO::getPurchaseOrderId,purchaseOrderNoDO.getId()); - List lists = purchaseOrderNoDetailMapper.selectList(wrapper); - // 方法1：使用 Stream API（最简洁） - boolean allStatus3 = lists != null && - !lists.isEmpty() && - lists.stream() - .allMatch(detail -> detail.getReceivingStatus()==3); - if (allStatus3){ - //采购订单收货完成 +// for (PurchaseOrderNoDO purchaseOrderNoDO : purchaseOrderNoDOS) { +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.eq(PurchaseOrderNoDetailDO::getPurchaseOrderId,purchaseOrderNoDO.getId()); +// List lists = purchaseOrderNoDetailMapper.selectList(wrapper); +// // 方法1：使用 Stream API（最简洁） +// boolean allStatus3 = lists != null && +// !lists.isEmpty() && +// lists.stream() +// .allMatch(detail -> detail.getReceivingStatus()==3); +// if (allStatus3){ + for (PurchaseOrderNoDetailDO purchaseOrderNoDetailDO : purchaseOrderNoDetailDOS) { + PurchaseOrderNoDO purchaseOrderNoDO = purchaseOrderNoMapper.selectById(purchaseOrderNoDetailDO.getPurchaseOrderId()); + + //采购订单收货完成 List attentiontodook = attentiontodoMapper.selectByIdlist(10);//查找该类型的待办和关注人 改 String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); @@ -395,7 +398,6 @@ public class StorageInServiceImpl implements StorageInService { for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { - { // for (StorageLogNowDO storageLogNowDO : pageResult) { bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 @@ -416,7 +418,6 @@ public class StorageInServiceImpl implements StorageInService { if (ObjectUtil.isNotEmpty(user)){ BdgzsomthingDO.setClick(user.getNickname()); } - }else { BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4()); }//提醒人 @@ -437,10 +438,8 @@ public class StorageInServiceImpl implements StorageInService { bdgzsomthingMapper.insert(BdgzsomthingDO); // } - } - } - } + } } return CommonResult.success(true); } diff --git a/mes-ui/mes-ui-admin-vue3/.env.pro b/mes-ui/mes-ui-admin-vue3/.env.pro index 25b00ee..a909bd4 100644 --- a/mes-ui/mes-ui-admin-vue3/.env.pro +++ b/mes-ui/mes-ui-admin-vue3/.env.pro @@ -3,15 +3,15 @@ NODE_ENV=production VITE_DEV=false -# 请求路径https://nxhs.cjyx.cc/admin-api http://192.168.1.87:8080 -VITE_BASE_URL='http://192.168.1.87:8080' +# 请求路径https://nxhs.cjyx.cc/admin-api http://192.168.1.87:8080 https://star.hz-hl.com +VITE_BASE_URL='https://star.hz-hl.com' # 上传路径 http://218.75.46.166:8080 -VITE_UPLOAD_URL='http://192.168.1.87:8080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='https://star.hz-hl.com/admin-api/infra/file/upload' # 上传路径 -VITE_UPLOAD_BATCH_URL='http://192.168.1.87:8080/admin-api/infra/file/uploadBatch' +VITE_UPLOAD_BATCH_URL='https://star.hz-hl.com/admin-api/infra/file/uploadBatch' # 接口前缀 VITE_API_BASEPATH= diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue index 5b99cc2..7410de4 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue @@ -384,9 +384,9 @@ link type="primary" size="small" :disabled="ctrView || ctrDelete" -+-+@@ -415,7 +415,7 @@ link type="primary" size="small" :disabled="ctrView || ctrDelete" - +
{{ printData.storageMatDOList[index]?.mtSpec || '' }} {{ printData.storageMatDOList[index]?.matUnit || '' }} {{ printData.storageMatDOList[index]?.storageOkQty || '' }}{{ printData.storageMatDOList[index]?.unitePrice || '' }}{{ printData.storageMatDOList[index]?.unitPrice || '' }} {{ printData.storageMatDOList[index]?.totalPrice || '' }} {{ printData.storageMatDOList[index]?.projectName || '' }} {{ printData.storageMatDOList[index]?.description || '' }}