From 0671fe76b05946321f83e0368a752b6eaa1a222d Mon Sep 17 00:00:00 2001 From: Ledo Date: Fri, 14 Feb 2025 13:25:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=89=E5=85=A8=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=92=8C=E5=8F=91=E8=B4=A7=E6=BB=A1=E4=B8=80=E5=B9=B4?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storagemat/StorageMatController.java | 3 +- .../bdgzsomthing/bdgzsomthingMapper.java | 6 +++- .../bdgzsomthing/bdgzsomthingServiceImpl.java | 31 ++++++++++--------- .../bdgzsomthing/bdgzsomthingMapper.xml | 22 ++++++++----- 4 files changed, 38 insertions(+), 24 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/StorageMatController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/StorageMatController.java index 00377fc..c639c81 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/StorageMatController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/StorageMatController.java @@ -131,8 +131,9 @@ public class StorageMatController { .filter(bdgzsomthingDO -> !matCodesInStorageLog.contains(bdgzsomthingDO.getAttr3())) .collect(Collectors.toList()); for (bdgzsomthingDO bdgzsomthingDO : filteredList) { + //录入安全库存后修改为0 bdgzsomthingDO.setAttr4("1"); - bdgzsomthingDO.setAttr12("1"); + bdgzsomthingDO.setAttr12("0"); bdgzsomthingService.updateById(bdgzsomthingDO); } } 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 600680a..04c8c6a 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 @@ -107,10 +107,14 @@ public interface bdgzsomthingMapper extends BaseMapperX { //00 int deletebdgzsByThings( @Param("things") String things); List selecteqint(bdgzsomthingDO qcObject); + //查询之前删除了，但是没录入对应表单数据的 + List selecteqintDeletedButNoOver(bdgzsomthingDO qcObject); + //查询之前有的历史数据 + List selecteqintNoDeletedAndNoOver(bdgzsomthingDO qcObject); 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); + void updateYnAndAttr4(@Param("id")String id,@Param("attr4")String attr4,@Param("yn")String yn); int deleteByIdNew(@Param("id") Long id); int deleteByIdNew1(@Param("id") Long id); void deleteOrder(bdgzsomthingDO BdgzsomthingDO); 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 93b760c..1fce629 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 @@ -867,8 +867,6 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { } - - for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { List pageResult = storageLogNowMapper.selectPagesmall(attentiontodoRespVO.getTxrid());//查询符合条件的值 { @@ -900,11 +898,16 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { BdgzsomthingDO.setAttr4("0");//是否点击 BdgzsomthingDO.setAttr3(storageLogNowDO.getId().toString());//获取数据当前表的id 改 BdgzsomthingDO.setShowname(storageLogNowDO.getCreateTime());//获取数据当前表的创建事件 改 - //去重查询,重复则不加 - List selecteqint = bdgzsomthingMapper.selecteqint(BdgzsomthingDO); + //查之前没有达到安全库存的数据 + List selecteqint = bdgzsomthingMapper.selecteqintDeletedButNoOver(BdgzsomthingDO); if(CollUtil.isEmpty(selecteqint)){ - //插入方法 - bdgzsomthingMapper.insert(BdgzsomthingDO); + // + List bdgzsomthingDOList = bdgzsomthingMapper.selecteqintNoDeletedAndNoOver(BdgzsomthingDO); + if (!CollUtil.isNotEmpty(bdgzsomthingDOList)){ + //插入方法 + bdgzsomthingMapper.insert(BdgzsomthingDO); + } + }else{ if (hasRemindTimeSafeStorage){ LocalDate today = LocalDate.now(); @@ -914,8 +917,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { // 计算两个日期之间的天数差 long daysBetween = ChronoUnit.DAYS.between(updatetime, today); if (daysBetween == Long.valueOf(remindTimeSafe)){ - bdgzsomthingMapper.updateYnAndAttr12(bdgzsomthingDO.getId().toString(),"0","0"); - + bdgzsomthingMapper.updateYnAndAttr4(bdgzsomthingDO.getId().toString(),"0","0"); // updateBatch.add(bdgzsomthingDO); } } @@ -994,9 +996,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { BdgzsomthingDO.setAttr3(projectOrderDO.getCode());//获取数据当前表的id 改 BdgzsomthingDO.setShowname(list.get(0).getCreateTime());//获取数据当前表的创建事件 改 //去重查询,重复则不加 - List selecteqint = bdgzsomthingMapper.selecteqint(BdgzsomthingDO); - - + List selecteqint = bdgzsomthingMapper.selecteqintDeletedButNoOver(BdgzsomthingDO); if(CollUtil.isNotEmpty(selecteqint)){ if (hasRemindTimeSafeStorage){ LocalDate today = LocalDate.now(); @@ -1007,15 +1007,18 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { long daysBetween = ChronoUnit.DAYS.between(updatetime, today); if (daysBetween == Long.valueOf(remindTimeSafe)){ - bdgzsomthingMapper.updateYnAndAttr12(bdgzsomthingDO.getId().toString(),"0","0"); + bdgzsomthingMapper.updateYnAndAttr4(bdgzsomthingDO.getId().toString(),"0","0"); // updateBatch.add(bdgzsomthingDO); } } // bdgzsomthingMapper.updateBatch(updateBatch); } }else{ - //插入方法 - bdgzsomthingMapper.insert(BdgzsomthingDO); + List bdgzsomthingDOList = bdgzsomthingMapper.selecteqintNoDeletedAndNoOver(BdgzsomthingDO); + if (!CollUtil.isNotEmpty(bdgzsomthingDOList)){ + //插入方法 + bdgzsomthingMapper.insert(BdgzsomthingDO); + } } } 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 681c1e1..20f0775 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,9 +15,9 @@ SET yesorno = '1' , nowtime =#{nowtime} WHERE id = #{id} - + UPDATE dbzz_table - SET yesorno = #{yn} , attr12 =#{attr12} + SET yesorno = #{yn} , attr4 =#{attr4} WHERE id = #{id} @@ -61,9 +61,8 @@ #{item} - AND attr4 = 0 AND thingname = '库存低于安全库存' - AND (attr12 = '0' OR attr12 IS NULL) + AND (attr12 = '1' or (attr12 is null and attr4 = 0)) AND deleted = 0 @@ -79,7 +78,7 @@ UPDATE dbzz_table - SET attr4 = '0',attr12 = '1' + SET attr4 = '1',attr12 = '1' WHERE id = #{id} + select * from dbzz_table where thingname=#{thingname} and attr12='1' and attr4='1' + +