diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplandetail/MaterialPlanDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplandetail/MaterialPlanDetailDO.java index 1808d45..a0d7fb1 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplandetail/MaterialPlanDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplandetail/MaterialPlanDetailDO.java @@ -74,5 +74,7 @@ public class MaterialPlanDetailDO extends BaseDO { private String projectMaterialPlanNo; @TableField(exist = false) private String named; + @TableField(exist = false) + private Long creator; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterLineDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterLineDO.java index 99a140f..5e3b6e0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterLineDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterLineDO.java @@ -155,5 +155,7 @@ public class PgMasterLineDO extends BaseDO { @TableField(exist = false) private String nickName; + @TableField(exist = false) + private Long creator; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plan/PlanDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plan/PlanDO.java index 7888d64..9ee5e92 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plan/PlanDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plan/PlanDO.java @@ -199,6 +199,8 @@ public class PlanDO extends BaseDO { private String mouldName; @TableField(exist = false) private String processDesignType; + @TableField(exist = false) + private Long creator; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogNow/StorageLogNowDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogNow/StorageLogNowDO.java index 0167c09..ff3ea8d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogNow/StorageLogNowDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogNow/StorageLogNowDO.java @@ -58,4 +58,6 @@ public class StorageLogNowDO extends BaseDO { @TableField(exist = false) private Long matUnitId; + @TableField(exist = false) + private Long creator; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java index aba7142..8572d17 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java @@ -133,6 +133,8 @@ public class TaskDispatchDO extends BaseDO { @TableField(exist = false) private Long requiredEndDate; + @TableField(exist = false) + private Long creator; @TableField(exist = false) private String craftContent; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjpgmaster/ZjPgMasterLineDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjpgmaster/ZjPgMasterLineDO.java index 0d293d5..445c70a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjpgmaster/ZjPgMasterLineDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjpgmaster/ZjPgMasterLineDO.java @@ -130,6 +130,8 @@ public class ZjPgMasterLineDO extends BaseDO { @TableField(exist = false) private String nickName; + @TableField(exist = false) + private Long creator; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/attentiontodo/AttentiontodoMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/attentiontodo/AttentiontodoMapper.java index 7dffb47..30cae18 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/attentiontodo/AttentiontodoMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/attentiontodo/AttentiontodoMapper.java @@ -71,4 +71,5 @@ public interface AttentiontodoMapper extends BaseMapperX { int deleteall(AttentiontodoSaveReqVO createReqVO); List selectByIdlist(Integer id); + List getAttentiontodolistdaiban(Integer id); } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java index 6a7ceb2..bbc0e5f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java @@ -64,6 +64,7 @@ public interface DeliverOrderMapper extends BaseMapperX { List selectPagemyn(Long id); + List selectPagemyn1(); void showendmoney(Long id); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplandetail/MaterialPlanDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplandetail/MaterialPlanDetailMapper.java index b6d7c23..004db6d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplandetail/MaterialPlanDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplandetail/MaterialPlanDetailMapper.java @@ -79,5 +79,6 @@ public interface MaterialPlanDetailMapper extends BaseMapperX selectafterten(Long id); + List selectafterten1(); } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterMapper.java index 7244528..245deab 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterMapper.java @@ -74,5 +74,7 @@ public interface PgMasterMapper extends BaseMapperX { } List selectgcjinsert(Long id); + List selectgcjinsert1(); List selectgcjinsertzj(Long id); + List selectgcjinsertzj1(); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plan/PlanMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plan/PlanMapper.java index cc5f7a8..f0fef4e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plan/PlanMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plan/PlanMapper.java @@ -122,5 +122,6 @@ public interface PlanMapper extends BaseMapperX { // .orderByDesc(PlanDO::getId)); // } List selectfhtj(Long txrid); +List selectfhtj1(); } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogNowMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogNowMapper.java index bb223d9..49129fc 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogNowMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogNowMapper.java @@ -27,6 +27,7 @@ import java.util.List; public interface StorageLogNowMapper extends BaseMapperX { List selectPagesmall(Long id); + List selectPagesmall1(); List selectPagesmallbyid(String id); default PageResult selectPage(StorageLogPageReqVO reqVO) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java index 16e4ce9..1b793dc 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java @@ -30,7 +30,9 @@ import java.util.List; public interface TaskDispatchMapper extends BaseMapperX { List getzplist(Long id); + List getzplist1(); List getsclist(Long id); + List getsclist1(); public int deleteDetailByIds(List ids); default PageResult selectPage(TaskDispatchPageReqVO reqVO) { diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoService.java index 8048096..00d1df8 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoService.java @@ -45,6 +45,7 @@ public interface AttentiontodoService { */ AttentiontodoDO getAttentiontodo(Integer id); List getAttentiontodolist(Integer id); + List getAttentiontodolistdaiban(Integer id); /** * 获得待办关注分页 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoServiceImpl.java index 4108437..2f529b1 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoServiceImpl.java @@ -96,6 +96,10 @@ public class AttentiontodoServiceImpl implements AttentiontodoService { public List getAttentiontodolist(Integer id) { return attentiontodoMapper.selectByIdlist(id); } + @Override + public List getAttentiontodolistdaiban(Integer id) { + return attentiontodoMapper.getAttentiontodolistdaiban(id); + } @Override public PageResult getAttentiontodoPage(AttentiontodoPageReqVO pageReqVO) { 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 f358722..b039231 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 @@ -1,9 +1,12 @@ package com.chanko.yunxi.mes.module.heli.service.bdgzsomthing; import cn.hutool.core.collection.CollUtil; +import cn.hutool.http.useragent.UserAgentUtil; +import cn.hutool.system.SystemUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils; import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.TaskDispatchPageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.attentiontodo.AttentiontodoDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO; @@ -27,6 +30,9 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.storagelog.StorageLogNowMapper import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchDetailMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchMapper; 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.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; import com.fasterxml.jackson.databind.ObjectMapper; @@ -39,6 +45,7 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -71,6 +78,11 @@ import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExcept @Service @Validated public class bdgzsomthingServiceImpl implements bdgzsomthingService { + @Resource + private AdminUserApi userApi; + + @Autowired + private AttentiontodoService attentiontodoService; @Resource private TaskDispatchDetailMapper taskDispatchDetailMapper; @Resource @@ -217,6 +229,27 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { // PageResult pageResult = processBomService.getProcessBomPagesall(); //库存低于安全库存 List attentiontodook = attentiontodoMapper.selectByIdlist(2);//查找该类型的待办和关注人 改 +// String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); + List attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(2); + if (attentiontodook1.size()<1){ + + List pageResult = storageLogNowMapper.selectPagesmall1();//查询符合条件的值 + for (StorageLogNowDO storageLogNowDO : pageResult) { + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("库存低于安全库存"); + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(userApi.getUser( storageLogNowDO.getCreator()).getNickname()); + attentiontodoDO.setLevel("1"); + attentiontodook.add(attentiontodoDO); + + + } + + + + + } + for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { List pageResult = storageLogNowMapper.selectPagesmall(attentiontodoRespVO.getTxrid());//查询符合条件的值 @@ -267,6 +300,30 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { List attentiontodookddfh = attentiontodoMapper.selectByIdlist(3);//查找该类型的待办和关注人 改 // List pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值 + List attentiontodook3 = attentiontodoService.getAttentiontodolistdaiban(3); + 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); + + + } + + } + + + + + + + + for (AttentiontodoDO attentiontodoRespVO : attentiontodookddfh) { List deliverOrderDOS = deliverOrderMapper.selectPagemyn(attentiontodoRespVO.getTxrid()); { @@ -315,6 +372,26 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { //生产任务派工单 到期当天逾期 List attentiontodookddfh6 = attentiontodoMapper.selectByIdlist(6);//查找该类型的待办和关注人 改 + + List attentiontodook6 = attentiontodoService.getAttentiontodolistdaiban(6);//改两个数字 + if (attentiontodook6.size()<1){ //改对应 + + List pageResult = taskDispatchMapper.getsclist1();//复制条件+改 + for (TaskDispatchDO storageLogNowDO : pageResult) { + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("生产任务到期"); //改内容 + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(userApi.getUser( storageLogNowDO.getCreator()).getNickname()); //改对应 + attentiontodoDO.setLevel("1"); + attentiontodookddfh6.add(attentiontodoDO); + + + } + + } + + + // List pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值 //查数据 TaskDispatchPageReqVO taskDispatchPageReqVO = new TaskDispatchPageReqVO(); @@ -396,6 +473,26 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { List attentiontodookddfh5 = attentiontodoMapper.selectByIdlist(5);//查找该类型的待办和关注人 改 // List pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值 //查数据 + List attentiontodook5 = attentiontodoService.getAttentiontodolistdaiban(5);//改两个数字 + if (attentiontodook5.size()<1){ //改对应 + + List pageResult = taskDispatchMapper.getzplist1();//复制条件+改 + for (TaskDispatchDO storageLogNowDO : pageResult) { + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("装配任务到期"); //改内容 + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(userApi.getUser( storageLogNowDO.getCreator()).getNickname()); //改对应 + attentiontodoDO.setLevel("1"); + attentiontodookddfh5.add(attentiontodoDO); + + + } + + } + + + + //获取今天日期 @@ -461,6 +558,32 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { //过程检查-质检 到期当天逾期 List attentiontodookddfh7 = attentiontodoMapper.selectByIdlist(7);//查找该类型的待办和关注人 改 + + + List attentiontodook7 = attentiontodoService.getAttentiontodolistdaiban(7);//改两个数字 + if (attentiontodook7.size()<1){ //改对应 + + List pageResult = pgMasterMapper.selectgcjinsert1();//复制条件+改 + for (PgMasterLineDO storageLogNowDO : pageResult) { + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("质检任务到期前"); //改内容 + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(userApi.getUser( storageLogNowDO.getCreator()).getNickname()); //改对应 + attentiontodoDO.setLevel("1"); + attentiontodookddfh7.add(attentiontodoDO); + + + } + + } + + + + + + + + // List pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值 //查数据 // TaskDispatchPageReqVO taskDispatchPageReqVO5 = new TaskDispatchPageReqVO(); @@ -532,6 +655,28 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { //终检-质检 到期当天逾期 List attentiontodookddfh7o = attentiontodoMapper.selectByIdlist(7);//查找该类型的待办和关注人 改 + + + + List attentiontodook70 = attentiontodoService.getAttentiontodolistdaiban(7);//改两个数字 + if (attentiontodook70.size()<1){ //改对应 + + List pageResult = pgMasterMapper.selectgcjinsertzj1();//复制条件+改 + for (ZjPgMasterLineDO storageLogNowDO : pageResult) { + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("质检任务到期前"); //改内容 + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(userApi.getUser( storageLogNowDO.getCreator()).getNickname()); //改对应 + attentiontodoDO.setLevel("1"); + attentiontodookddfh7o.add(attentiontodoDO); + + + } + + } + + + // List pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值 //查数据 // TaskDispatchPageReqVO taskDispatchPageReqVO5 = new TaskDispatchPageReqVO(); @@ -604,6 +749,27 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { //生产工艺 到期当天逾期 List attentiontodookddfh4 = attentiontodoMapper.selectByIdlist(4);//查找该类型的待办和关注人 改 + + + + List attentiontodook4 = attentiontodoService.getAttentiontodolistdaiban(4);//改两个数字 + if (attentiontodook4.size()<1){ //改对应 + + List pageResult = planMapper.selectfhtj1();//复制条件+改 + for (PlanDO storageLogNowDO : pageResult) { + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("设计任务到期"); //改内容 + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(userApi.getUser( storageLogNowDO.getCreator()).getNickname()); //改对应 + attentiontodoDO.setLevel("1"); + attentiontodookddfh4.add(attentiontodoDO); + + + } + + } + + // List pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值 //查数据 // TaskDispatchPageReqVO taskDispatchPageReqVO5 = new TaskDispatchPageReqVO(); @@ -689,6 +855,28 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { //物料需求计划到期前十天 到期当天逾期 List attentiontodookddfh9 = attentiontodoMapper.selectByIdlist(9);//查找该类型的待办和关注人 改 + + List attentiontodook9 = attentiontodoService.getAttentiontodolistdaiban(9);//改两个数字 + if (attentiontodook9.size()<1){ //改对应 + + List pageResult = materialPlanDetailMapper.selectafterten1();//复制条件+改 + for (MaterialPlanDetailDO storageLogNowDO : pageResult) { + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("《物料需求计划》的采购"); //改内容 + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(userApi.getUser( storageLogNowDO.getCreator()).getNickname()); //改对应 + attentiontodoDO.setLevel("1"); + attentiontodookddfh9.add(attentiontodoDO); + + + } + + } + + + + + // List pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值 //查数据 // TaskDispatchPageReqVO taskDispatchPageReqVO5 = new TaskDispatchPageReqVO(); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplandetail/MaterialPlanDetailServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplandetail/MaterialPlanDetailServiceImpl.java index 6e8ef59..ceac9a5 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplandetail/MaterialPlanDetailServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplandetail/MaterialPlanDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.heli.service.materialplandetail; +import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils; import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.StorageLogPageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.attentiontodo.AttentiontodoDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO; @@ -7,6 +8,8 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplan.MaterialPlan import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO; import com.chanko.yunxi.mes.module.heli.dal.mysql.attentiontodo.AttentiontodoMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplan.MaterialPlanMapper; +import com.chanko.yunxi.mes.module.heli.service.attentiontodo.AttentiontodoService; +import com.chanko.yunxi.mes.module.system.api.user.AdminUserApi; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -33,6 +36,11 @@ import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*; @Service @Validated public class MaterialPlanDetailServiceImpl implements MaterialPlanDetailService { + @Resource + private AdminUserApi userApi; + + @Autowired + private AttentiontodoService attentiontodoService; @Resource private MaterialPlanMapper materialPlanMapper; @Resource @@ -62,6 +70,21 @@ public class MaterialPlanDetailServiceImpl implements MaterialPlanDetailService List attentiontodook = attentiontodoMapper.selectByIdlist(8);//查找该类型的待办和关注人 改 + String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); + List attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(8); + if (attentiontodook1.size()<1){ + { + + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("《物料需求计划》提交后"); + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(nickname); + attentiontodoDO.setLevel("1"); + attentiontodook.add(attentiontodoDO); + + } + + } for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { { // for (StorageLogNowDO storageLogNowDO : pageResult) { diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java index 32a4bac..6c80b95 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java @@ -12,6 +12,7 @@ import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; import com.chanko.yunxi.mes.framework.dict.core.util.DictFrameworkUtils; import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils; import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum; +import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils; import com.chanko.yunxi.mes.module.heli.controller.admin.processbom.vo.ProcessBomImportExcelVO; import com.chanko.yunxi.mes.module.heli.controller.admin.processbom.vo.ProcessBomPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.processbom.vo.ProcessBomSaveReqVO; @@ -33,13 +34,16 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomDetailMap import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.shenhe.ShenheMapper; import com.chanko.yunxi.mes.module.heli.enums.ProcessBomStatusEnum; +import com.chanko.yunxi.mes.module.heli.service.attentiontodo.AttentiontodoService; import com.chanko.yunxi.mes.module.heli.service.composition.CompositionService; import com.chanko.yunxi.mes.module.heli.service.material.MaterialService; import com.chanko.yunxi.mes.module.heli.service.plantaskbom.PlanTaskBomService; +import com.chanko.yunxi.mes.module.system.api.user.AdminUserApi; import com.chanko.yunxi.mes.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; import com.chanko.yunxi.mes.module.system.dal.dataobject.dict.DictDataDO; import com.chanko.yunxi.mes.module.system.dal.mysql.dict.DictDataMapper; import org.apache.poi.ss.formula.functions.T; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -78,6 +82,11 @@ public class ProcessBomServiceImpl implements ProcessBomService { @Resource private ProcessBomMapper processBomMapper; @Resource + private AdminUserApi userApi; + + @Autowired + private AttentiontodoService attentiontodoService; + @Resource private ProcessBomDetailMapper processBomDetailMapper; @Resource private MaterialService materialService; @@ -515,6 +524,23 @@ public class ProcessBomServiceImpl implements ProcessBomService { if (hasBomType4) { PlanDO getplanid = processBomMapper.getplanid(updateObj.getPlanId()); List attentiontodook = attentiontodoMapper.selectByIdlist(13);// 改 + String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); + List attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(13); + if (attentiontodook1.size()<1){ + { + + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("BOM变更审核通过后"); + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(nickname); + attentiontodoDO.setLevel("1"); + attentiontodook.add(attentiontodoDO); + + } + + } + + for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { { // for (StorageLogNowDO storageLogNowDO : pageResult) { @@ -686,6 +712,24 @@ public class ProcessBomServiceImpl implements ProcessBomService { .anyMatch(bomDetail -> bomDetail.getBomType() == 4); if (hasBomType4) { List attentiontodook = attentiontodoMapper.selectByIdlist(14);// 改 + + String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); + List attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(14); + if (attentiontodook1.size()<1){ + { + + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("BOM变更通知"); + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(nickname); + attentiontodoDO.setLevel("1"); + attentiontodook.add(attentiontodoDO); + + } + + } + + for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { { // for (StorageLogNowDO storageLogNowDO : pageResult) { @@ -733,6 +777,24 @@ public class ProcessBomServiceImpl implements ProcessBomService { if(hasBomType4){ List attentiontodook = attentiontodoMapper.selectByIdlist(12);// 改 + + String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); + List attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(12); + if (attentiontodook1.size()<1){ + { + + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("BOM变更审核"); + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(nickname); + attentiontodoDO.setLevel("1"); + attentiontodook.add(attentiontodoDO); + + } + + } + + for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { { // for (StorageLogNowDO storageLogNowDO : pageResult) { diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java index b552bc8..56bc0f8 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java @@ -444,32 +444,41 @@ public class ProjectOrderServiceImpl implements ProjectOrderService { createProjectOrder(operateReqVO); if(operateReqVO.getHasPrice().equals(1)&&(operateReqVO.getPrice()==null)){ //订单有价格但是没录价格 - String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); + List attentiontodook = attentiontodoService.getAttentiontodolist(1);//查找该类型的待办和关注人 改 - AttentiontodoDO attentiontodoDO = attentiontodook.get(0); - boolean containsAaa = attentiontodook.stream() - .anyMatch(item -> nickname.equals(item.getAttr4())); - if (!containsAaa){ + String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); + List attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(1); + if (attentiontodook1.size()<1){ { - // for (StorageLogNowDO storageLogNowDO : pageResult) { - bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); - BdgzsomthingDO.setThingname(attentiontodoDO.getEvent());//事件名称 - BdgzsomthingDO.setThings(operateReqVO.getProjectName()+operateReqVO.getContractNo()+"价格没有录入系统");//事件名称 - BdgzsomthingDO.setAttr2(operateReqVO.getCode());//因为不用跳转所以为null -// BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 -// BdgzsomthingDO.setShowname(new Date());比较创建时间,不用单独填写 - BdgzsomthingDO.setDborgz("待办"); - BdgzsomthingDO.setClick(nickname);//提醒人 - BdgzsomthingDO.setLevel("紧急"); -// BdgzsomthingDO.setClick(attentiontodoRespVO.getRemindman());//提醒人 - BdgzsomthingDO.setYesorno("0");//是否点击 - BdgzsomthingDO.setAttr4("0");//是否已处理 - BdgzsomthingDO.setAttr3(operateReqVO.getId().toString());//获取数据当前表的id -// BdgzsomthingDO.setShowname(operateReqVO.getCreateTime());//获取数据当前表的创建事件 改 - bdgzsomthingMapper.insert(BdgzsomthingDO); + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("订单有价格"); + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(nickname); + attentiontodoDO.setLevel("1"); + attentiontodook.add(attentiontodoDO); + + + + // for (StorageLogNowDO storageLogNowDO : pageResult) { +// bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); +// BdgzsomthingDO.setThingname("订单有价格");//事件名称 +// BdgzsomthingDO.setThings(operateReqVO.getProjectName()+operateReqVO.getContractNo()+"价格没有录入系统");//事件名称 +// BdgzsomthingDO.setAttr2(operateReqVO.getCode());//因为不用跳转所以为null +//// BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 +//// BdgzsomthingDO.setShowname(new Date());比较创建时间,不用单独填写 +// BdgzsomthingDO.setDborgz("待办"); +// BdgzsomthingDO.setClick(nickname);//提醒人 +// BdgzsomthingDO.setLevel("紧急"); +//// BdgzsomthingDO.setClick(attentiontodoRespVO.getRemindman());//提醒人 +// BdgzsomthingDO.setYesorno("0");//是否点击 +// BdgzsomthingDO.setAttr4("0");//是否已处理 +// +// BdgzsomthingDO.setAttr3(operateReqVO.getId().toString());//获取数据当前表的id +//// BdgzsomthingDO.setShowname(operateReqVO.getCreateTime());//获取数据当前表的创建事件 改 +// bdgzsomthingMapper.insert(BdgzsomthingDO); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorder/PurchaseOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorder/PurchaseOrderServiceImpl.java index 15113a8..801009b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorder/PurchaseOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorder/PurchaseOrderServiceImpl.java @@ -2,6 +2,7 @@ package com.chanko.yunxi.mes.module.heli.service.purchaseorder; import cn.hutool.core.util.ObjectUtil; import com.chanko.yunxi.mes.framework.security.core.LoginUser; +import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils; import com.chanko.yunxi.mes.module.heli.controller.admin.orderyf.vo.OrderYfSaveReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.plan.vo.PlanPageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.attentiontodo.AttentiontodoDO; @@ -14,9 +15,12 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.attentiontodo.AttentiontodoMap import com.chanko.yunxi.mes.module.heli.dal.mysql.bdgzsomthing.bdgzsomthingMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.shenhe.ShenheMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.supplier.SupplierMapper; +import com.chanko.yunxi.mes.module.heli.service.attentiontodo.AttentiontodoService; import com.chanko.yunxi.mes.module.heli.service.orderyf.OrderYfService; import com.chanko.yunxi.mes.module.heli.service.serialnumber.SerialNumberService; +import com.chanko.yunxi.mes.module.system.api.user.AdminUserApi; import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -47,6 +51,12 @@ import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*; @Service @Validated public class PurchaseOrderServiceImpl implements PurchaseOrderService { + + @Resource + private AdminUserApi userApi; + + @Autowired + private AttentiontodoService attentiontodoService; @Resource private com.chanko.yunxi.mes.module.heli.dal.mysql.bdgzsomthing.bdgzsomthingMapper bdgzsomthingMapper; @Resource @@ -141,6 +151,25 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { bdgzsomthingMapper.updateokone(abc); //采购订单收货完成 List attentiontodook = attentiontodoMapper.selectByIdlist(10);//查找该类型的待办和关注人 改 + + String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); + List attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(10); + if (attentiontodook1.size()<1){ + { + + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("《采购订单》到货时通知检验"); + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(nickname); + attentiontodoDO.setLevel("1"); + attentiontodook.add(attentiontodoDO); + + } + + } + + + for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { { // for (StorageLogNowDO storageLogNowDO : pageResult) { diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java index 35d3e24..cbd8e2a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java @@ -17,8 +17,11 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.unqualifiednotification.Unqual import com.chanko.yunxi.mes.module.heli.enums.BusinesTypeEnum; import com.chanko.yunxi.mes.module.heli.enums.CodeEnum; import com.chanko.yunxi.mes.module.heli.enums.UnqualifiedNotificationStatusEnum; +import com.chanko.yunxi.mes.module.heli.service.attentiontodo.AttentiontodoService; import com.chanko.yunxi.mes.module.heli.service.serialnumber.SerialNumberService; import com.chanko.yunxi.mes.module.heli.service.unqualifiednotificationfile.UnqualifiedNotificationFileService; +import com.chanko.yunxi.mes.module.system.api.user.AdminUserApi; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -42,6 +45,11 @@ import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.UNQUALIF @Service @Validated public class UnqualifiedNotificationServiceImpl implements UnqualifiedNotificationService { + @Resource + private AdminUserApi userApi; + + @Autowired + private AttentiontodoService attentiontodoService; @Resource private com.chanko.yunxi.mes.module.heli.dal.mysql.bdgzsomthing.bdgzsomthingMapper bdgzsomthingMapper; @Resource @@ -69,6 +77,24 @@ public class UnqualifiedNotificationServiceImpl implements UnqualifiedNotificati //质检通知单预警 { List attentiontodook = attentiontodoMapper.selectByIdlist(15);// 改 + + String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); + List attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(15); + if (attentiontodook1.size()<1){ + { + + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("质检通知单"); + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(nickname); + attentiontodoDO.setLevel("1"); + attentiontodook.add(attentiontodoDO); + + } + + } + + for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { { // for (StorageLogNowDO storageLogNowDO : pageResult) { diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/attentiontodo/AttentiontodoMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/attentiontodo/AttentiontodoMapper.xml index 489d617..e0f7432 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/attentiontodo/AttentiontodoMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/attentiontodo/AttentiontodoMapper.xml @@ -26,5 +26,16 @@ FROM db_attentiontodo a WHERE a.attr2 = #{param1} + \ No newline at end of file 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 2da8b54..22e1ca3 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 @@ -40,6 +40,35 @@ t.id ORDER BY t.id DESC + + + \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/pgmaster/PgMasterMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/pgmaster/PgMasterMapper.xml index c87a676..6de4a09 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/pgmaster/PgMasterMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/pgmaster/PgMasterMapper.xml @@ -31,6 +31,29 @@ FROM quality_bg_master_line WHERE zj_mx_id = b.zj_mx_id GROUP BY zj_mx_id ) +) + + + @@ -60,5 +83,32 @@ GROUP BY zj_mx_id + + \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/plan/PlanMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/plan/PlanMapper.xml index 6d37cd5..ce8ec7a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/plan/PlanMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/plan/PlanMapper.xml @@ -155,5 +155,151 @@ where a.progress not like '%100%' + \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml index 818c3ca..d1da2f8 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml @@ -109,12 +109,13 @@ b.mat_code id, b.create_time, b.mat_name, - b.total_storage_ok_qty + b.total_storage_ok_qty, + b.creator FROM (SELECT mat_code, create_time, - mat_name, + mat_name,creator, id, SUM(storage_ok_qty) AS total_storage_ok_qty FROM @@ -123,13 +124,45 @@ mat_code, create_time, mat_name, - id) b + id,creator) b JOIN base_material a ON b.mat_code = a.code WHERE b.total_storage_ok_qty < a.inv_safe and a.tenant_id =#{param1} + + + + + + + + select c.code,d.end_time project_end_time,d.creator from pro_task_dispatch c,(SELECT b.*, COALESCE(SUM(a.amount), 0) AS total_amount + FROM pro_task_dispatch_detail b + LEFT JOIN pro_task_report a ON a.dispatch_detail_id = b.id + WHERE b.end_time <= DATE_ADD(CURDATE(), INTERVAL 1 DAY) + GROUP BY b.id + HAVING COALESCE(SUM(a.amount), 0) < b.amount) d + where d.dispatch_id =c.id and c.dispatch_type ='PRODUCTION' + + DELETE FROM pro_task_dispatch_detail WHERE dispatch_id IN