From 1a10d558e64c51b6198bee2fd6a71ebe0a6734f9 Mon Sep 17 00:00:00 2001 From: Ledo Date: Fri, 14 Feb 2025 04:08:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E4=B8=80=E5=B9=B4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D=EF=BC=8C?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E4=BF=9D=E5=AD=98=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=8F=91=E8=B4=A7=E4=B8=80=E5=B9=B4?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bdgzsomthing/bdgzsomthingMapper.java | 13 +- .../bdgzsomthing/bdgzsomthingServiceImpl.java | 146 ++++++++++-------- .../bdgzsomthing/bdgzsomthingMapper.xml | 21 ++- .../deliverorder/DeliverOrderMapper.xml | 18 +-- .../src/views/Home/Index.vue | 2 +- 5 files changed, 111 insertions(+), 89 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bdgzsomthing/bdgzsomthingMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bdgzsomthing/bdgzsomthingMapper.java index 6996437..600680a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bdgzsomthing/bdgzsomthingMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bdgzsomthing/bdgzsomthingMapper.java @@ -110,19 +110,10 @@ public interface bdgzsomthingMapper extends BaseMapperX { List selecteqintq(bdgzsomthingDO qcObject); List selecteqintone(bdgzsomthingDO qcObject); bdgzsomthingDO selecteqintzq(bdgzsomthingDO qcObject); - + void updateYnAndAttr12(@Param("id")String id,@Param("attr12")String attr12,@Param("yn")String yn); int deleteByIdNew(@Param("id") Long id); int deleteByIdNew1(@Param("id") Long id); void deleteOrder(bdgzsomthingDO BdgzsomthingDO); - default List selectSafeStorage(List attr3List){ - MPJLambdaQueryWrapper query = new MPJLambdaQueryWrapper<>(); - query.eq(bdgzsomthingDO::getAttr4,0) - .eq(bdgzsomthingDO::getThingname,"库存低于安全库存") - .in(bdgzsomthingDO::getAttr3,attr3List) - .eq(bdgzsomthingDO::getAttr12,"0").or( - e->e.isNull(bdgzsomthingDO::getAttr12) - ); - return selectList(query); - } + List selectSafeStorage(@Param("attr3List") List attr3List); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java index b7b66b4..93b760c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java @@ -32,6 +32,7 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchMappe import com.chanko.yunxi.mes.module.heli.enums.TaskDispatchTypeEnum; import com.chanko.yunxi.mes.module.heli.service.attentiontodo.AttentiontodoService; import com.chanko.yunxi.mes.module.system.api.user.AdminUserApi; +import com.chanko.yunxi.mes.module.system.api.user.dto.AdminUserRespDTO; import com.chanko.yunxi.mes.module.system.controller.admin.user.UserController; import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; import com.chanko.yunxi.mes.module.system.service.user.AdminUserService; @@ -49,6 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; @@ -828,6 +830,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { *@Author lyw *@Date 2025-02-08 15:24 */ + @Transactional() public void selectSafeStorageAndDeliverOneYear(){ //如果有设置了提醒周期的 List safeStorage = attentiontodoMapper.selectListByEvent("库存低于安全库存"); @@ -911,9 +914,8 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { // 计算两个日期之间的天数差 long daysBetween = ChronoUnit.DAYS.between(updatetime, today); if (daysBetween == Long.valueOf(remindTimeSafe)){ - bdgzsomthingDO.setAttr12("0"); - bdgzsomthingDO.setYesorno("0"); - bdgzsomthingMapper.updateById(bdgzsomthingDO); + bdgzsomthingMapper.updateYnAndAttr12(bdgzsomthingDO.getId().toString(),"0","0"); + // updateBatch.add(bdgzsomthingDO); } } @@ -933,75 +935,95 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { if (attentiontodook3.size()<1){ List pageResult = deliverOrderMapper.selectPagemyn1();//查询符合条件的值 - for (DeliverOrderDO storageLogNowDO : pageResult) { - AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); - attentiontodoDO.setEvent("订单发货满一年"); - attentiontodoDO.setAttr5("1"); - attentiontodoDO.setAttr4(userApi.getUser( storageLogNowDO.getCustomerId()).getNickname()); - attentiontodoDO.setLevel("1"); - attentiontodookddfh.add(attentiontodoDO); - - - } + Map> groupedBySale = pageResult.stream() + .filter(order -> order.getSaleOrderIds() != null && !order.getSaleOrderIds().isEmpty()) // 过滤掉msd为空的条目 + .collect(Collectors.groupingBy(DeliverOrderDO::getSaleOrderIds)); + groupedBySale.forEach((ids,list)->{ + AdminUserRespDTO user = userApi.getUser(list.get(0).getDeliverPerson()); + if (user != null ){ + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("订单发货满一年"); + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(user.getNickname()); + attentiontodoDO.setLevel("1"); + attentiontodookddfh.add(attentiontodoDO); + } + }); +// for (DeliverOrderDO storageLogNowDO : pageResult) { +// +// } } for (AttentiontodoDO attentiontodoRespVO : attentiontodookddfh) { List deliverOrderDOS = deliverOrderMapper.selectPagemyn(attentiontodoRespVO.getTxrid()); + Map> groupedBySale = deliverOrderDOS.stream() + .filter(order -> order.getSaleOrderIds() != null && !order.getSaleOrderIds().isEmpty()) // 过滤掉msd为空的条目 + .collect(Collectors.groupingBy(DeliverOrderDO::getSaleOrderIds)); { - for (DeliverOrderDO deliverOrderDO : deliverOrderDOS) { - bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); - BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 - BdgzsomthingDO.setThings("订单编号:"+deliverOrderDO.getCode()+"发货日期到期一年");//事件名称 - BdgzsomthingDO.setAttr2(deliverOrderDO.getCode());//因为不用跳转所以为null - BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 - BdgzsomthingDO.setTenantId(attentiontodoRespVO.getTxrid()); + for (Map.Entry> entry : groupedBySale.entrySet()) { + String ids = entry.getKey(); + List list = entry.getValue(); + String[] split = ids.split(","); + for (String s : split) { + ProjectOrderDO projectOrderDO = projectOrderMapper.selectById(s); + bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); + BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 + BdgzsomthingDO.setThings("订单编号:"+projectOrderDO.getCode()+"发货日期到期一年");//事件名称 + BdgzsomthingDO.setAttr2(projectOrderDO.getCode());//因为不用跳转所以为null + BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 + BdgzsomthingDO.setTenantId(attentiontodoRespVO.getTxrid()); // BdgzsomthingDO.setShowname(new Date());比较创建时间,不用单独填写 - if(attentiontodoRespVO.getAttr5().equals("1")){//提醒状态 - BdgzsomthingDO.setDborgz("待办"); - } - else if(attentiontodoRespVO.getAttr5().equals("2")){ - BdgzsomthingDO.setDborgz("关注"); - } - BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());//提醒人 - if(attentiontodoRespVO.getLevel().equals("1")){ - BdgzsomthingDO.setLevel("紧急"); - } - else if(attentiontodoRespVO.getLevel().equals("2")){ - BdgzsomthingDO.setLevel("一般"); - } - else if(attentiontodoRespVO.getLevel().equals("3")){ - BdgzsomthingDO.setLevel("非紧急"); - } - BdgzsomthingDO.setYesorno("0");//是否点击 - BdgzsomthingDO.setAttr4("0");//是否点击 - BdgzsomthingDO.setAttr3(deliverOrderDO.getCode());//获取数据当前表的id 改 - BdgzsomthingDO.setShowname(deliverOrderDO.getCreateTime());//获取数据当前表的创建事件 改 - //去重查询,重复则不加 - List selecteqint = bdgzsomthingMapper.selecteqint(BdgzsomthingDO); - - - if(CollUtil.isNotEmpty(selecteqint)){ - if (hasRemindTimeSafeStorage){ - LocalDate today = LocalDate.now(); -// List updateBatch = new ArrayList<>(); - for (bdgzsomthingDO bdgzsomthingDO : selecteqint) { - LocalDate updatetime = bdgzsomthingDO.getUpdateTime().toLocalDate(); - // 计算两个日期之间的天数差 - long daysBetween = ChronoUnit.DAYS.between(updatetime, today); - if (daysBetween == Long.valueOf(remindTimeSafe)){ - bdgzsomthingDO.setAttr12("0"); - bdgzsomthingDO.setYesorno("0"); - bdgzsomthingMapper.updateById(bdgzsomthingDO); -// updateBatch.add(bdgzsomthingDO); - } + if(attentiontodoRespVO.getAttr5().equals("1")){//提醒状态 + BdgzsomthingDO.setDborgz("待办"); } + else if(attentiontodoRespVO.getAttr5().equals("2")){ + BdgzsomthingDO.setDborgz("关注"); + } + BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());//提醒人 + if(attentiontodoRespVO.getLevel().equals("1")){ + BdgzsomthingDO.setLevel("紧急"); + } + else if(attentiontodoRespVO.getLevel().equals("2")){ + BdgzsomthingDO.setLevel("一般"); + } + else if(attentiontodoRespVO.getLevel().equals("3")){ + BdgzsomthingDO.setLevel("非紧急"); + } + BdgzsomthingDO.setYesorno("0");//是否点击 + BdgzsomthingDO.setAttr4("0");//是否点击 + BdgzsomthingDO.setAttr3(projectOrderDO.getCode());//获取数据当前表的id 改 + BdgzsomthingDO.setShowname(list.get(0).getCreateTime());//获取数据当前表的创建事件 改 + //去重查询,重复则不加 + List selecteqint = bdgzsomthingMapper.selecteqint(BdgzsomthingDO); + + + if(CollUtil.isNotEmpty(selecteqint)){ + if (hasRemindTimeSafeStorage){ + LocalDate today = LocalDate.now(); +// List updateBatch = new ArrayList<>(); + for (bdgzsomthingDO bdgzsomthingDO : selecteqint) { + LocalDate updatetime = bdgzsomthingDO.getUpdateTime().toLocalDate(); + // 计算两个日期之间的天数差 + long daysBetween = ChronoUnit.DAYS.between(updatetime, today); + if (daysBetween == Long.valueOf(remindTimeSafe)){ + + bdgzsomthingMapper.updateYnAndAttr12(bdgzsomthingDO.getId().toString(),"0","0"); +// updateBatch.add(bdgzsomthingDO); + } + } // bdgzsomthingMapper.updateBatch(updateBatch); - } - }else{ - //插入方法 - bdgzsomthingMapper.insert(BdgzsomthingDO); + } + }else{ + //插入方法 + bdgzsomthingMapper.insert(BdgzsomthingDO); + } + } } +// for (DeliverOrderDO deliverOrderDO : deliverOrderDOS) { +// +// +// } } } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml index 1400e67..681c1e1 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml @@ -15,6 +15,11 @@ SET yesorno = '1' , nowtime =#{nowtime} WHERE id = #{id} + + UPDATE dbzz_table + SET yesorno = #{yn} , attr12 =#{attr12} + WHERE id = #{id} + UPDATE dbzz_table SET yesorno = '1' , nowtime =#{nowtime},attr4='1' @@ -47,7 +52,21 @@ SET attr4 = '1' WHERE attr3=#{attr3} and attr4='0' - + UPDATE dbzz_table SET attr4 = '1' diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/deliverorder/DeliverOrderMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/deliverorder/DeliverOrderMapper.xml index d0bbe38..a2c96b1 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/deliverorder/DeliverOrderMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/deliverorder/DeliverOrderMapper.xml @@ -23,13 +23,8 @@ t.transport_weight, t.transport_size, t.transport_freight_cost, t.remark, t.status, t.receive_person_name, t.receive_address, t.create_time, t.update_time, t.creator, t.updater, t.deleted, - u.nickname AS deliverPersonName, e.name AS customerName, - GROUP_CONCAT(DISTINCT p.code) AS saleOrderCode, - GROUP_CONCAT(p.project_name) AS projectName, - GROUP_CONCAT(p.contract_no) AS contractNo, - GROUP_CONCAT(p.property) AS property FROM - project_deliver_order t LEFT JOIN project_sale_order p - ON FIND_IN_SET(p.id, t.sale_order_ids) AND p.tenant_id = 1 + u.nickname AS deliverPersonName, e.name AS customerName FROM + project_deliver_order t LEFT JOIN system_users u ON (u.id = t.deliver_person) AND u.tenant_id = 1 LEFT JOIN base_customer e ON (e.id = t.customer_id) AND e.tenant_id = 1 WHERE t.deleted = 0 AND (t.deliver_status = 2) @@ -53,13 +48,8 @@ t.transport_weight, t.transport_size, t.transport_freight_cost, t.remark, t.status, t.receive_person_name, t.receive_address, t.create_time, t.update_time, t.creator, t.updater, t.deleted, - u.nickname AS deliverPersonName, e.name AS customerName, - GROUP_CONCAT(DISTINCT p.code) AS saleOrderCode, - GROUP_CONCAT(p.project_name) AS projectName, - GROUP_CONCAT(p.contract_no) AS contractNo, - GROUP_CONCAT(p.property) AS property FROM - project_deliver_order t LEFT JOIN project_sale_order p - ON FIND_IN_SET(p.id, t.sale_order_ids) AND p.tenant_id = 1 + u.nickname AS deliverPersonName, e.name AS customerName FROM + project_deliver_order t LEFT JOIN system_users u ON (u.id = t.deliver_person) AND u.tenant_id = 1 LEFT JOIN base_customer e ON (e.id = t.customer_id) AND e.tenant_id = 1 WHERE t.deleted = 0 AND (t.deliver_status = 2) AND t.tenant_id = 1 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue b/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue index 916acf2..ef389e9 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue @@ -686,7 +686,7 @@ const handlePay =async (row: any) => { if (row.type == '订单发货满一年') { // router.push({ path: '/processDesign/heli/processdesign/bomShenhe', state: { idid: row.idid } }); - router.push({ path: '/deliver/mould', state: { idid: row.idid } }); + router.push({ path: '/order/project', query: { idid: row.idid } }); } if(row.type == '《物料需求计划》的采购'&&userDept.value.deptName == '采购部'){ showDialog.value = true;