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

修改提醒

Browse Source
This commit is contained in:
yxheli 2025-01-23 15:27:17 +08:00
parent d609be3717
commit 493c9b9c40
28 changed files with 713 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterLineDO.java
View File

@ -155,5 +155,7 @@ public class PgMasterLineDO extends BaseDO {
@TableField(exist = false)
private String nickName;
@TableField(exist = false)
private Long creator;
}

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plan/PlanDO.java
View File

@ -199,6 +199,8 @@ public class PlanDO extends BaseDO {
private String mouldName;
@TableField(exist = false)
private String processDesignType;
@TableField(exist = false)
private Long creator;

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogNow/StorageLogNowDO.java
View File

@ -58,4 +58,6 @@ public class StorageLogNowDO extends BaseDO {
@TableField(exist = false)
private Long matUnitId;
@TableField(exist = false)
private Long creator;
}

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java
View File

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

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjpgmaster/ZjPgMasterLineDO.java
View File

@ -130,6 +130,8 @@ public class ZjPgMasterLineDO extends BaseDO {
@TableField(exist = false)
private String nickName;
@TableField(exist = false)
private Long creator;

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/attentiontodo/AttentiontodoMapper.java
View File

@ -71,4 +71,5 @@ public interface AttentiontodoMapper extends BaseMapperX<AttentiontodoDO> {
int deleteall(AttentiontodoSaveReqVO createReqVO);
List<AttentiontodoDO> selectByIdlist(Integer id);
List<AttentiontodoDO> getAttentiontodolistdaiban(Integer id);
}

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java
View File

@ -64,6 +64,7 @@ public interface DeliverOrderMapper extends BaseMapperX<DeliverOrderDO> {
List<DeliverOrderDO> selectPagemyn(Long id);
List<DeliverOrderDO> selectPagemyn1();
void showendmoney(Long id);
}

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplandetail/MaterialPlanDetailMapper.java
View File

@ -79,5 +79,6 @@ public interface MaterialPlanDetailMapper extends BaseMapperX<MaterialPlanDetail
// }
List<MaterialPlanDetailDO> selectafterten(Long id);
List<MaterialPlanDetailDO> selectafterten1();
}

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterMapper.java
View File

@ -74,5 +74,7 @@ public interface PgMasterMapper extends BaseMapperX<PgMasterDO> {
}
List<PgMasterLineDO> selectgcjinsert(Long id);
List<PgMasterLineDO> selectgcjinsert1();
List<ZjPgMasterLineDO> selectgcjinsertzj(Long id);
List<ZjPgMasterLineDO> selectgcjinsertzj1();
}

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plan/PlanMapper.java
View File

@ -122,5 +122,6 @@ public interface PlanMapper extends BaseMapperX<PlanDO> {
// .orderByDesc(PlanDO::getId));
// }
List<PlanDO> selectfhtj(Long txrid);
List<PlanDO> selectfhtj1();
}

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogNowMapper.java
View File

@ -27,6 +27,7 @@ import java.util.List;
public interface StorageLogNowMapper extends BaseMapperX<StorageLogNowDO> {
List<StorageLogNowDO> selectPagesmall(Long id);
List<StorageLogNowDO> selectPagesmall1();
List<StorageLogNowDO> selectPagesmallbyid(String id);
default PageResult<StorageLogNowDO> selectPage(StorageLogPageReqVO reqVO) {
MPJLambdaWrapper<StorageLogNowDO> query = new MPJLambdaWrapper<>();

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java
View File

@ -30,7 +30,9 @@ import java.util.List;
public interface TaskDispatchMapper extends BaseMapperX<TaskDispatchDO> {
List<TaskDispatchDO> getzplist(Long id);
List<TaskDispatchDO> getzplist1();
List<TaskDispatchDO> getsclist(Long id);
List<TaskDispatchDO> getsclist1();
public int deleteDetailByIds(List<Long> ids);
default PageResult<TaskDispatchDO> selectPage(TaskDispatchPageReqVO reqVO) {

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoService.java
View File

@ -45,6 +45,7 @@ public interface AttentiontodoService {
*/
AttentiontodoDO getAttentiontodo(Integer id);
List<AttentiontodoDO> getAttentiontodolist(Integer id);
List<AttentiontodoDO> getAttentiontodolistdaiban(Integer id);
/**
* 获得待办关注分页

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoServiceImpl.java
View File

@ -96,6 +96,10 @@ public class AttentiontodoServiceImpl implements AttentiontodoService {
public List<AttentiontodoDO> getAttentiontodolist(Integer id) {
return attentiontodoMapper.selectByIdlist(id);
}
@Override
public List<AttentiontodoDO> getAttentiontodolistdaiban(Integer id) {
return attentiontodoMapper.getAttentiontodolistdaiban(id);
}
@Override
public PageResult<AttentiontodoDO> getAttentiontodoPage(AttentiontodoPageReqVO pageReqVO) {

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

@ -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<ProcessBomDO> pageResult = processBomService.getProcessBomPagesall();
//库存低于安全库存
List<AttentiontodoDO> attentiontodook = attentiontodoMapper.selectByIdlist(2);//查找该类型的待办和关注人 改
// String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname();
List<AttentiontodoDO> attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(2);
if (attentiontodook1.size()<1){
List<StorageLogNowDO> 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<StorageLogNowDO> pageResult = storageLogNowMapper.selectPagesmall(attentiontodoRespVO.getTxrid());//查询符合条件的值
@ -267,6 +300,30 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
List<AttentiontodoDO> attentiontodookddfh = attentiontodoMapper.selectByIdlist(3);//查找该类型的待办和关注人 改
// List<StorageLogNowDO> pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值
List<AttentiontodoDO> attentiontodook3 = attentiontodoService.getAttentiontodolistdaiban(3);
if (attentiontodook3.size()<1){
List<DeliverOrderDO> 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<DeliverOrderDO> deliverOrderDOS = deliverOrderMapper.selectPagemyn(attentiontodoRespVO.getTxrid());
{
@ -315,6 +372,26 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
//生产任务派工单 到期当天逾期
List<AttentiontodoDO> attentiontodookddfh6 = attentiontodoMapper.selectByIdlist(6);//查找该类型的待办和关注人 改
List<AttentiontodoDO> attentiontodook6 = attentiontodoService.getAttentiontodolistdaiban(6);//改两个数字
if (attentiontodook6.size()<1){ //改对应
List<TaskDispatchDO> 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<StorageLogNowDO> pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值
//查数据
TaskDispatchPageReqVO taskDispatchPageReqVO = new TaskDispatchPageReqVO();
@ -396,6 +473,26 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
List<AttentiontodoDO> attentiontodookddfh5 = attentiontodoMapper.selectByIdlist(5);//查找该类型的待办和关注人 改
// List<StorageLogNowDO> pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值
//查数据
List<AttentiontodoDO> attentiontodook5 = attentiontodoService.getAttentiontodolistdaiban(5);//改两个数字
if (attentiontodook5.size()<1){ //改对应
List<TaskDispatchDO> 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<AttentiontodoDO> attentiontodookddfh7 = attentiontodoMapper.selectByIdlist(7);//查找该类型的待办和关注人 改
List<AttentiontodoDO> attentiontodook7 = attentiontodoService.getAttentiontodolistdaiban(7);//改两个数字
if (attentiontodook7.size()<1){ //改对应
List<PgMasterLineDO> 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<StorageLogNowDO> pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值
//查数据
// TaskDispatchPageReqVO taskDispatchPageReqVO5 = new TaskDispatchPageReqVO();
@ -532,6 +655,28 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
//终检-质检 到期当天逾期
List<AttentiontodoDO> attentiontodookddfh7o = attentiontodoMapper.selectByIdlist(7);//查找该类型的待办和关注人 改
List<AttentiontodoDO> attentiontodook70 = attentiontodoService.getAttentiontodolistdaiban(7);//改两个数字
if (attentiontodook70.size()<1){ //改对应
List<ZjPgMasterLineDO> 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<StorageLogNowDO> pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值
//查数据
// TaskDispatchPageReqVO taskDispatchPageReqVO5 = new TaskDispatchPageReqVO();
@ -604,6 +749,27 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
//生产工艺 到期当天逾期
List<AttentiontodoDO> attentiontodookddfh4 = attentiontodoMapper.selectByIdlist(4);//查找该类型的待办和关注人 改
List<AttentiontodoDO> attentiontodook4 = attentiontodoService.getAttentiontodolistdaiban(4);//改两个数字
if (attentiontodook4.size()<1){ //改对应
List<PlanDO> 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<StorageLogNowDO> pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值
//查数据
// TaskDispatchPageReqVO taskDispatchPageReqVO5 = new TaskDispatchPageReqVO();
@ -689,6 +855,28 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
//物料需求计划到期前十天 到期当天逾期
List<AttentiontodoDO> attentiontodookddfh9 = attentiontodoMapper.selectByIdlist(9);//查找该类型的待办和关注人 改
List<AttentiontodoDO> attentiontodook9 = attentiontodoService.getAttentiontodolistdaiban(9);//改两个数字
if (attentiontodook9.size()<1){ //改对应
List<MaterialPlanDetailDO> 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<StorageLogNowDO> pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值
//查数据
// TaskDispatchPageReqVO taskDispatchPageReqVO5 = new TaskDispatchPageReqVO();

23
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplandetail/MaterialPlanDetailServiceImpl.java
View File

@ -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<AttentiontodoDO> attentiontodook = attentiontodoMapper.selectByIdlist(8);//查找该类型的待办和关注人 改
String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname();
List<AttentiontodoDO> 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) {

62
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java
View File

@ -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<AttentiontodoDO> attentiontodook = attentiontodoMapper.selectByIdlist(13);// 改
String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname();
List<AttentiontodoDO> 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<AttentiontodoDO> attentiontodook = attentiontodoMapper.selectByIdlist(14);// 改
String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname();
List<AttentiontodoDO> 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<AttentiontodoDO> attentiontodook = attentiontodoMapper.selectByIdlist(12);// 改
String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname();
List<AttentiontodoDO> 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) {

51
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
View File

@ -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<AttentiontodoDO> 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<AttentiontodoDO> 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);

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

@ -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<AttentiontodoDO> attentiontodook = attentiontodoMapper.selectByIdlist(10);//查找该类型的待办和关注人 改
String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname();
List<AttentiontodoDO> 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) {

26
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java
View File

@ -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<AttentiontodoDO> attentiontodook = attentiontodoMapper.selectByIdlist(15);// 改
String nickname = userApi.getUser( SecurityFrameworkUtils.getLoginUser().getId()).getNickname();
List<AttentiontodoDO> 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) {

11
mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/attentiontodo/AttentiontodoMapper.xml
View File

@ -26,5 +26,16 @@ FROM db_attentiontodo a
WHERE a.attr2 = #{param1}
</select>
<select id="getAttentiontodolistdaiban"
parameterType="Integer"
resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.attentiontodo.AttentiontodoDO">
SELECT a.*, b.tenant_id as txrid
FROM db_attentiontodo a
INNER JOIN system_users b ON a.attr4 = b.nickname
WHERE a.attr2 = #{param1} and a.attr5='1'
</select>
</mapper>

29
mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/deliverorder/DeliverOrderMapper.xml
View File

@ -40,6 +40,35 @@
t.id ORDER BY t.id DESC
</select>
<select id="selectPagemyn1"
parameterType="Long"
resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO">
SELECT t.id, t.code, t.sale_order_ids,
t.customer_id, t.deliver_date,
t.deliver_status, t.deliver_person,
t.deliver_person_mobile, t.deliver_mode,
t.receive_person_mobile, t.transport_driver_name,
t.transport_driver_mobile, t.transport_bus_number,
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
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
and DATE_ADD(t.deliver_date, INTERVAL 1 YEAR) &lt; CURDATE()
and t.show_zbmoney is null and t.deliver_status in('2')
GROUP by
t.id ORDER BY t.id DESC
</select>
<update id="showendmoney"

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

@ -31,5 +31,27 @@
group by project_material_plan_no
</select>
<select id="selectafterten1"
parameterType="Long"
resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplandetail.MaterialPlanDetailDO">
select w.*from project_purchase_order q,
(SELECT
b.project_material_plan_no,a.project_material_plan_id,a.creator
FROM
project_material_plan_detail a
JOIN
project_material_plan b ON a.project_material_plan_id = b.id
JOIN
base_material bm ON a.material_id = bm.id
WHERE
b.status = '3'
AND CURDATE() >= DATE_SUB(a.require_arrive_time, INTERVAL 10 DAY)
) w
where q.project_material_plan_id =w.project_material_plan_id
and q.receiving_status !='3'
group by project_material_plan_no
</select>
</mapper>

50
mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/pgmaster/PgMasterMapper.xml
View File

@ -31,6 +31,29 @@ FROM quality_bg_master_line
WHERE zj_mx_id = b.zj_mx_id
GROUP BY zj_mx_id
)
)
</select>
<select id="selectgcjinsert1"
parameterType="Long"
resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO">
SELECT a.*
FROM quality_pg_master_line a
WHERE ent_time &lt;= DATE_ADD(CURDATE(), INTERVAL 1 DAY)
and deleted !='1'
AND pg_type = '0'
AND NOT EXISTS (
SELECT 1
FROM quality_bg_master_line b
WHERE b.zj_mx_id = a.id
AND b.zj_mx_id IS NOT NULL
AND a.amount &lt;= (
SELECT SUM(amount)
FROM quality_bg_master_line
WHERE zj_mx_id = b.zj_mx_id
GROUP BY zj_mx_id
)
)
</select>
@ -60,5 +83,32 @@ GROUP BY zj_mx_id
</select>
<select id="selectgcjinsertzj1"
parameterType="Long"
resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.zjpgmaster.ZjPgMasterLineDO">
SELECT a.*
FROM quality_zj_pg_master_line a
WHERE ent_time &lt;= DATE_ADD(CURDATE(), INTERVAL 1 DAY)
and deleted !='1'
AND pg_type = '0'
AND NOT EXISTS (
SELECT 1
FROM quality_zj_bg_master_line b
WHERE b.zj_mx_id = a.id
AND b.zj_mx_id IS NOT NULL
AND a.amount &lt;= (
SELECT SUM(amount)
FROM quality_zj_bg_master_line
WHERE zj_mx_id = b.zj_mx_id
GROUP BY zj_mx_id
)
)
</select>
</mapper>

146
mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/plan/PlanMapper.xml
View File

@ -155,5 +155,151 @@
where a.progress not like '%100%'
</select>
<select id="selectfhtj1"
parameterType="Long"
resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO">
select a.* from (
SELECT
b.*,
COALESCE(a.progress, '0') AS progress
FROM (
SELECT
d.id,
d.creator,
d.project_id,
d.project_sub_id,
c.plan_no AS project_sub_code,
d.process_design_type,
c.blank_date AS change_end_time
FROM
pro_process_design d
INNER JOIN (
SELECT
x.*,
y.plan_no
FROM (
SELECT * FROM project_plan_sub pps WHERE blank_date IS NOT NULL
AND blank_date<= DATE_ADD(CURDATE(), INTERVAL 1 DAY)
) x
JOIN project_plan y ON x.project_plan_id = y.id
) c ON c.project_plan_id = d.plan_id AND c.project_sub_id = d.project_sub_id
WHERE
d.process_design_type = 'BLUEPRINT_WORKBLANK'
AND d.status = '1'
GROUP BY
d.project_id,
d.creator,
d.project_sub_id,
c.project_sub_code,
d.process_design_type,
c.blank_date
) b
LEFT JOIN (
SELECT
process_design_id,
progress,
ROW_NUMBER() OVER (PARTITION BY process_design_id ORDER BY progress DESC) AS rn
FROM
pro_process_design_progress
) a ON a.process_design_id = b.id AND a.rn = 1
) a
where a.progress not like '%100%'
union all
select a.* from (
SELECT
b.*,
COALESCE(a.progress, '0') AS progress
FROM (
SELECT
d.id,
d.creator,
d.project_id,
d.project_sub_id,
c.plan_no AS project_sub_code,
d.process_design_type,
c.three_dim_date AS change_end_time
FROM
pro_process_design d
INNER JOIN (
SELECT
x.*,
y.plan_no
FROM (
SELECT * FROM project_plan_sub pps WHERE three_dim_date IS NOT NULL
AND three_dim_date<= DATE_ADD(CURDATE(), INTERVAL 1 DAY)
) x
JOIN project_plan y ON x.project_plan_id = y.id
) c ON c.project_plan_id = d.plan_id AND c.project_sub_id = d.project_sub_id
WHERE
d.process_design_type = 'BLUEPRINT_3D'
AND d.status = '1'
GROUP BY
d.project_id,
d.creator,
d.project_sub_id,
c.project_sub_code,
d.process_design_type,
c.three_dim_date
) b
LEFT JOIN (
SELECT
process_design_id,
progress,
ROW_NUMBER() OVER (PARTITION BY process_design_id ORDER BY progress DESC) AS rn
FROM
pro_process_design_progress
) a ON a.process_design_id = b.id AND a.rn = 1
) a
where a.progress not like '%100%'
union all
select a.* from (
SELECT
b.*,
COALESCE(a.progress, '0') AS progress
FROM (
SELECT
d.id,
d.creator,
d.project_id,
d.project_sub_id,
c.plan_no AS project_sub_code,
d.process_design_type,
c.two_dim_date AS change_end_time
FROM
pro_process_design d
INNER JOIN (
SELECT
x.*,
y.plan_no
FROM (
SELECT * FROM project_plan_sub pps WHERE two_dim_date IS NOT NULL
AND two_dim_date <= DATE_ADD(CURDATE(), INTERVAL 1 DAY)
) x
JOIN project_plan y ON x.project_plan_id = y.id
) c ON c.project_plan_id = d.plan_id AND c.project_sub_id = d.project_sub_id
WHERE
d.process_design_type = 'BLUEPRINT_2D'
AND d.status = '1'
GROUP by
d.creator,
d.project_id,
d.project_sub_id,
c.project_sub_code,
d.process_design_type,
c.two_dim_date
) b
LEFT JOIN (
SELECT
process_design_id,
progress,
ROW_NUMBER() OVER (PARTITION BY process_design_id ORDER BY progress DESC) AS rn
FROM
pro_process_design_progress
) a ON a.process_design_id = b.id AND a.rn = 1
) a
where a.progress not like '%100%'
</select>
</mapper>

39
mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml
View File

@ -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 &lt; a.inv_safe
and a.tenant_id =#{param1}
</select>
<select id="selectPagesmall1"
parameterType="Long"
resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO">
SELECT
b.mat_code id,
b.create_time,
b.mat_name,
b.total_storage_ok_qty,
b.creator
FROM
(SELECT
mat_code,
create_time,
mat_name,creator,
id,
SUM(storage_ok_qty) AS total_storage_ok_qty
FROM
v_storage_material_now
GROUP BY
mat_code,
create_time,
mat_name,
id,creator) b
JOIN
base_material a ON b.mat_code = a.code
WHERE
b.total_storage_ok_qty &lt; a.inv_safe
</select>
<select id="selectPagesmallbyid"
resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO">

35
mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchMapper.xml
View File

@ -28,6 +28,24 @@
where d.dispatch_id =c.id and c.dispatch_type ='ASSEMBLE'
</select>
<select id="getzplist1"
parameterType="Long"
resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO">
select c.code,d.end_time project_end_time 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 &lt;= DATE_ADD(CURDATE(), INTERVAL 1 DAY)
GROUP BY b.id
HAVING COALESCE(SUM(a.amount), 0) &lt; b.amount) d
where d.dispatch_id =c.id and c.dispatch_type ='ASSEMBLE'
</select>
<select id="getsclist"
parameterType="Long"
@ -45,6 +63,23 @@
where d.dispatch_id =c.id and c.dispatch_type ='PRODUCTION'
</select>
<select id="getsclist1"
parameterType="Long"
resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO">
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 &lt;= DATE_ADD(CURDATE(), INTERVAL 1 DAY)
GROUP BY b.id
HAVING COALESCE(SUM(a.amount), 0) &lt; b.amount) d
where d.dispatch_id =c.id and c.dispatch_type ='PRODUCTION'
</select>
<delete id="deleteDetailByIds">
DELETE FROM pro_task_dispatch_detail WHERE dispatch_id IN