物料需求计划的采购显示具体物料和加工件

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java

@@ -64,6 +64,8 @@ public class MaterialPlanBoomDO extends BaseDO {
     @TableField(exist = false)
     private String compositionName;
     @TableField(exist = false)
+    private String name;
+    @TableField(exist = false)
     private Long compositionId;
     @TableField(exist = false)
     private String projectMaterialPlanNo;

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplandetail/MaterialPlanDetailDO.java

@@ -74,7 +74,8 @@ public class MaterialPlanDetailDO extends BaseDO {
     private String projectMaterialPlanNo;
     @TableField(exist = false)
     private String named;
-
+    @TableField(exist = false)
+    private String name;
     private String creator;
 
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java

@@ -806,24 +806,13 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
         for (AttentiontodoDO attentiontodoRespVO : attentiontodookddfh9) {
             List<MaterialPlanDetailDO> selectafterten = materialPlanDetailMapper.selectafterten(attentiontodoRespVO.getTxrid(),attentiontodoRespVO.getEvday());
             List<MaterialPlanBoomDO> selectafterten1 = materialPlanBoomMapper.selectafterten(attentiontodoRespVO.getTxrid(), attentiontodoRespVO.getEvday());
-            Set<String> uniqueProjectMaterialPlanNos = Stream.concat(selectafterten.stream(), selectafterten1.stream())
-                    .map(obj -> {
-                if (obj instanceof MaterialPlanDetailDO) {
-                    return ((MaterialPlanDetailDO) obj).getProjectMaterialPlanNo();
-                } else if (obj instanceof MaterialPlanBoomDO) {
-                    return ((MaterialPlanBoomDO) obj).getProjectMaterialPlanNo();
-                } else {
-                    throw new IllegalArgumentException("Unexpected object type");
-                }
-            })
-                .collect(Collectors.toSet());
 
             {
-                for (String projectMaterialPlanNo : uniqueProjectMaterialPlanNos) {
+                for (MaterialPlanDetailDO materialPlanDetailDO : selectafterten) {
                     bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO();
                     BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称
                     BdgzsomthingDO.setAttr4("0");//是否点击
-                        BdgzsomthingDO.setThings("计划单号:"+projectMaterialPlanNo+"货物临近到货日期");//事件名称
+                        BdgzsomthingDO.setThings("计划单号:"+materialPlanDetailDO.getProjectMaterialPlanNo()+" 物料："+materialPlanDetailDO.getName()+"临近到货日期");//事件名称
                     BdgzsomthingDO.setAttr2(null);//因为不用跳转所以为null
                     BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期
                     BdgzsomthingDO.setTenantId(attentiontodoRespVO.getTxrid());
@@ -835,7 +824,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
                         BdgzsomthingDO.setDborgz("关注");
                     }
                     if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){
-                        MaterialPlanDO planDO = materialPlanMapper.selectOne(new LambdaQueryWrapper<MaterialPlanDO>().eq(MaterialPlanDO::getProjectMaterialPlanNo, projectMaterialPlanNo));
+                        MaterialPlanDO planDO = materialPlanMapper.selectOne(new LambdaQueryWrapper<MaterialPlanDO>().eq(MaterialPlanDO::getProjectMaterialPlanNo, materialPlanDetailDO.getProjectMaterialPlanNo()));
                        if (ObjectUtil.isNotEmpty(planDO)){
                            AdminUserDO user = adminUserService.getUser(Long.valueOf(planDO.getCreator()));
                            if (ObjectUtil.isNotEmpty(user)){
@@ -857,18 +846,70 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
                     }
                     BdgzsomthingDO.setYesorno("0");//是否点击
 
-                    BdgzsomthingDO.setAttr3(projectMaterialPlanNo);//获取数据当前表的id 改
+                    BdgzsomthingDO.setAttr3(materialPlanDetailDO.getProjectMaterialPlanNo());//获取数据当前表的id 改
                     BdgzsomthingDO.setShowname(null);//获取数据当前表的创建事件 改
                     //去重查询,重复则不加
-                    List<bdgzsomthingDO> selecteqint = bdgzsomthingMapper.selecteqintone(BdgzsomthingDO);
+//                    List<bdgzsomthingDO> selecteqint = bdgzsomthingMapper.selecteqintone(BdgzsomthingDO);
+//
+//
+//                    if(selecteqint.size()>0){
 
-
+//                    }else{
-                    if(selecteqint.size()>0){
-
-                    }else{
                         //插入方法
                         bdgzsomthingMapper.insert(BdgzsomthingDO);
+//                    }
                 }
+
+                for (MaterialPlanBoomDO materialPlanBoomDO : selectafterten1) {
+                    bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO();
+                    BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称
+                    BdgzsomthingDO.setAttr4("0");//是否点击
+                    BdgzsomthingDO.setThings("计划单号:"+materialPlanBoomDO.getProjectMaterialPlanNo()+" 加工件："+materialPlanBoomDO.getName()+"临近到货日期");//事件名称
+                    BdgzsomthingDO.setAttr2(null);//因为不用跳转所以为null
+                    BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期
+                    BdgzsomthingDO.setTenantId(attentiontodoRespVO.getTxrid());
+//                BdgzsomthingDO.setShowname(LocalDateTime.now());//比较创建时间,不用单独填写
+                    if(attentiontodoRespVO.getAttr5().equals("1")){//提醒状态
+                        BdgzsomthingDO.setDborgz("待办");
+                    }
+                    else  if(attentiontodoRespVO.getAttr5().equals("2")){
+                        BdgzsomthingDO.setDborgz("关注");
+                    }
+                    if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){
+                        MaterialPlanDO planDO = materialPlanMapper.selectOne(new LambdaQueryWrapper<MaterialPlanDO>().eq(MaterialPlanDO::getProjectMaterialPlanNo, materialPlanBoomDO.getProjectMaterialPlanNo()));
+                        if (ObjectUtil.isNotEmpty(planDO)){
+                            AdminUserDO user = adminUserService.getUser(Long.valueOf(planDO.getCreator()));
+                            if (ObjectUtil.isNotEmpty(user)){
+                                BdgzsomthingDO.setClick(user.getNickname());
+                            }
+                        }
+
+                    }else {
+                        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.setAttr3(materialPlanBoomDO.getProjectMaterialPlanNo());//获取数据当前表的id 改
+                    BdgzsomthingDO.setShowname(null);//获取数据当前表的创建事件 改
+                    //去重查询,重复则不加
+//                    List<bdgzsomthingDO> selecteqint = bdgzsomthingMapper.selecteqintone(BdgzsomthingDO);
+
+
+//                    if(selecteqint.size()>0){
+//
+//                    }else{
+                        //插入方法
+                        bdgzsomthingMapper.insert(BdgzsomthingDO);
+//                    }
                 }
             }
         }

mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml

@@ -28,7 +28,7 @@
     <update id="updatayesterday" parameterType="com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO">
         UPDATE dbzz_table
         SET attr4 = '1'
-        WHERE thingname IN ('设计任务到期', '装配任务到期', '生产任务到期', '质检任务到期前')
+        WHERE thingname IN ('设计任务到期', '装配任务到期', '生产任务到期', '质检任务到期前','《物料需求计划》的采购')
         and attr4='0'
     </update>
     <update id="updatebdgzsomthingbyupok" parameterType="com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO">

mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplanboom/MaterialPlanBoomMapper.xml

@@ -13,11 +13,12 @@
             resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO">
         select w.*from project_purchase_order q,
                        (SELECT
-                            b.project_material_plan_no,a.project_material_plan_id
+                            b.project_material_plan_no,a.project_material_plan_id,c.material_name as name,a.boom_detail_id
                         FROM
                             project_material_plan_boom a
                                 JOIN
                             project_material_plan b ON a.project_material_plan_id = b.id
+                                JOIN pro_process_bom_detail c ON c.id=a.boom_detail_id
                         WHERE
                             b.status = '3'
                           AND CURDATE() >= DATE_SUB(a.boom_arrive_date, INTERVAL #{evday} DAY)

mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplandetail/MaterialPlanDetailMapper.xml

@@ -14,7 +14,7 @@
             resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplandetail.MaterialPlanDetailDO">
         select w.*from project_purchase_order q right join
                        (SELECT
-                            b.project_material_plan_no,a.project_material_plan_id
+                            b.project_material_plan_no,a.project_material_plan_id,bm.name
                         FROM
                             project_material_plan_detail a
                                 JOIN