yunxi
/
mes-majoys
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

派工报工预警

Browse Source
dev
siontion 4 months ago
parent 8bc9cb4d01
commit df5db7a431
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

8
mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
Unescape View File

@ -146,8 +146,8 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
query.selectAll(TaskDispatchDetailDO.class)
.select("a.code as dispatchCode")
.select("e.name as procedureName")
.select("g.leader_user_id as ownerName")
.select("u.nickname as reportUserName")
.select("u.nickname as ownerName")
.select("u1.nickname as reportUserName")
.select("b.code as projectCode")
.select("d.name as materialName")
.select("sum(ifnull(f.amount,0)) as totalReportAmount")
@ -158,9 +158,9 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
.leftJoin(ProcedureDO.class, "e", ProcedureDO::getId, TaskDispatchDetailDO::getProcedureId)
.leftJoin("pro_task_report as f on t.dispatch_id=f.dispatch_id and t.procedure_id=f.procedure_id and DATE(f.start_time)=(CURDATE() - INTERVAL 1 DAY)")
.leftJoin(WorkshopDO.class, "g", WorkshopDO::getId, TaskDispatchDO::getWorkshopId)
.leftJoin(AdminUserDO.class,"u",AdminUserDO::getId,TaskDispatchDetailDO::getOwner)
.leftJoin(AdminUserDO.class,"u",AdminUserDO::getId,WorkshopDO::getLeaderUserId)
// .leftJoin("system_users u1 ON u1.id = t.owner")
// .leftJoin(AdminUserDO.class,"u1",AdminUserDO::getId,TaskDispatchDetailDO::getOwner)
.leftJoin(AdminUserDO.class,"u1",AdminUserDO::getId,TaskDispatchDetailDO::getOwner)
.groupBy("t.dispatch_id,t.procedure_id,t.owner")
.having("t.amount/DATEDIFF(t.end_time,t.start_time)>sum(ifnull(f.amount,0)) and t.end_time>CURDATE()")
.orderByDesc(TaskDispatchDetailDO::getId)

4
mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java
Unescape View File

@ -502,12 +502,12 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
dispatchWarningVO.setDispatchCode(detail.getDispatchCode());
dispatchWarningVO.setProcedureName(detail.getProcedureName());
dispatchWarningVO.setWarningType(WarningEnum.DISPATCH_NO_FINISHED_WARNING.name());
dispatchWarningVO.setOwnerName(adminUserMapper.selectById(new Long(detail.getOwnerIds())).getNickname());
dispatchWarningVO.setOwnerName(detail.getOwnerName());
dispatchWarningVO.setAmount(detail.getAmount());
dispatchWarningVO.setTotalReportAmount(detail.getTotalReportAmount());
dispatchWarningVO.setMaterialName(detail.getMaterialName());
dispatchWarningVO.setProjectCode(detail.getProjectCode());
dispatchWarningVO.setReportUser(adminUserMapper.selectById(new Long(detail.getOwnerName())).getNickname());
dispatchWarningVO.setReportUser(detail.getReportUserName());
warningMessageVO.getWarnings().add(dispatchWarningVO);
});

4
sql/v1.0.0/2.business/1.structure.sql
Unescape View File

@ -288,7 +288,7 @@ CREATE TABLE `base_salary_setting` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增字段，唯一',
`user_id` bigint(20) DEFAULT NULL COMMENT '员工id',
`salary_type` varchar(64) DEFAULT NULL COMMENT '工资类型字典',
`procedure` varchar(512) DEFAULT NULL COMMENT '工序范围',
`procedureType` varchar(512) DEFAULT NULL COMMENT '工序范围',
`status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态,1表示正常，2表示禁用',
`creator` varchar(64) DEFAULT '' COMMENT '创建者',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
@ -305,7 +305,7 @@ CREATE TABLE `base_salary_user` (
`user_id` bigint(20) DEFAULT NULL COMMENT '员工id',
`salary_type` varchar(64) DEFAULT NULL COMMENT '工资类型字典',
`price` decimal(10,2) DEFAULT NULL COMMENT '工价',
`procedure` varchar(512) DEFAULT NULL COMMENT '工序范围',
`procedureType` varchar(512) DEFAULT NULL COMMENT '工序范围',
`status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态,1表示正常，2表示禁用',
`creator` varchar(64) DEFAULT '' COMMENT '创建者',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',

Write Preview
Loading…
Cancel
Save