licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

待办关注修改

Browse Source
This commit is contained in:
z 2025-07-10 15:12:02 +08:00
parent d905d831bd
commit 552e787fbf
5 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java
View File

@ -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(){

45
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java
View File

@ -284,25 +284,26 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe
LambdaQueryWrapper<PurchaseOrderNoDetailDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(PurchaseOrderNoDetailDO::getId,idList);
List<PurchaseOrderNoDetailDO> purchaseOrderNoDetailDOS = purchaseOrderNoDetailMapper.selectList(lambdaQueryWrapper);
List<Long> ids = purchaseOrderNoDetailDOS.stream()
.filter(Objects::nonNull) // 过滤空对象
.map(PurchaseOrderNoDetailDO::getPurchaseOrderId)
.filter(Objects::nonNull) // 过滤空ID
.collect(Collectors.toList());
LambdaQueryWrapper<PurchaseOrderNoDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(PurchaseOrderNoDO::getId,ids);
List<PurchaseOrderNoDO> purchaseOrderNoDOS = purchaseOrderNoMapper.selectList(queryWrapper);
for (PurchaseOrderNoDO purchaseOrderNoDO : purchaseOrderNoDOS) {
LambdaQueryWrapper<PurchaseOrderNoDetailDO> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PurchaseOrderNoDetailDO::getPurchaseOrderId, purchaseOrderNoDO.getId());
List<PurchaseOrderNoDetailDO> lists = purchaseOrderNoDetailMapper.selectList(wrapper);
// 方法1：使用 Stream API（最简洁）
boolean allStatus3 = lists != null &&
!lists.isEmpty() &&
lists.stream()
.allMatch(detail -> detail.getReceivingStatus()==3);
if (allStatus3) {
//采购订单收货完成
// List<Long> ids = purchaseOrderNoDetailDOS.stream()
// .filter(Objects::nonNull) // 过滤空对象
// .map(PurchaseOrderNoDetailDO::getPurchaseOrderId)
// .filter(Objects::nonNull) // 过滤空ID
// .collect(Collectors.toList());
// LambdaQueryWrapper<PurchaseOrderNoDO> queryWrapper = new LambdaQueryWrapper<>();
// queryWrapper.in(PurchaseOrderNoDO::getId,ids);
// List<PurchaseOrderNoDO> purchaseOrderNoDOS = purchaseOrderNoMapper.selectList(queryWrapper);
// for (PurchaseOrderNoDO purchaseOrderNoDO : purchaseOrderNoDOS) {
// LambdaQueryWrapper<PurchaseOrderNoDetailDO> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(PurchaseOrderNoDetailDO::getPurchaseOrderId, purchaseOrderNoDO.getId());
// List<PurchaseOrderNoDetailDO> 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<AttentiontodoDO> attentiontodook = attentiontodoMapper.selectByIdlist(10);//查找该类型的待办和关注人 改
String nickname = userApi.getUser(SecurityFrameworkUtils.getLoginUser().getId()).getNickname();
@ -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());//事件名称
@ -363,8 +364,8 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe
// }
}
}
}
// }
// }
}
return success(true);
}

29
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java
View File

@ -363,16 +363,19 @@ public class StorageInServiceImpl implements StorageInService {
queryWrapper.in(PurchaseOrderNoDO::getId,ids);
List<PurchaseOrderNoDO> purchaseOrderNoDOS = purchaseOrderNoMapper.selectList(queryWrapper);
for (PurchaseOrderNoDO purchaseOrderNoDO : purchaseOrderNoDOS) {
LambdaQueryWrapper<PurchaseOrderNoDetailDO> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PurchaseOrderNoDetailDO::getPurchaseOrderId,purchaseOrderNoDO.getId());
List<PurchaseOrderNoDetailDO> 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<PurchaseOrderNoDetailDO> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(PurchaseOrderNoDetailDO::getPurchaseOrderId,purchaseOrderNoDO.getId());
// List<PurchaseOrderNoDetailDO> 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<AttentiontodoDO> attentiontodook = attentiontodoMapper.selectByIdlist(10);//查找该类型的待办和关注人 改
@ -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,11 +438,9 @@ public class StorageInServiceImpl implements StorageInService {
bdgzsomthingMapper.insert(BdgzsomthingDO);
// }
}
}
}
}
}
return CommonResult.success(true);
}

8
mes-ui/mes-ui-admin-vue3/.env.pro
View File

@ -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=

2
mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
View File

@ -415,7 +415,7 @@ link type="primary" size="small" :disabled="ctrView || ctrDelete"
<td>{{ printData.storageMatDOList[index]?.mtSpec || '' }}</td>
<td>{{ printData.storageMatDOList[index]?.matUnit || '' }}</td>
<td>{{ printData.storageMatDOList[index]?.storageOkQty || '' }}</td>
<td>{{ printData.storageMatDOList[index]?.unitePrice || '' }}</td>
<td>{{ printData.storageMatDOList[index]?.unitPrice || '' }}</td>
<td>{{ printData.storageMatDOList[index]?.totalPrice || '' }}</td>
<td>{{ printData.storageMatDOList[index]?.projectName || '' }}</td>
<td>{{ printData.storageMatDOList[index]?.description || '' }}</td>