零件追溯

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/dao/TaskBizMapper.java

@@ -0,0 +1,24 @@
+package com.github.zuihou.business.operationManagementCenter.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.github.zuihou.base.mapper.SuperMapper;
+import com.github.zuihou.business.operationManagementCenter.entity.TTask;
+import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * Mapper 接口
+ * 计划表
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-29
+ */
+@Repository
+public interface TaskBizMapper extends SuperMapper<TTask> {
+    IPage<TTask> pageList(IPage page,   @Param(Constants.WRAPPER) LbqWrapper<TTask> wrapper);
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/TaskBizService.java

@@ -0,0 +1,31 @@
+package com.github.zuihou.business.operationManagementCenter.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.R;
+import com.github.zuihou.base.service.SuperService;
+import com.github.zuihou.business.aps.instance.domain.basicdata.CandidateProcess;
+import com.github.zuihou.business.aps.instance.domain.basicdata.Machine;
+import com.github.zuihou.business.operationManagementCenter.entity.OrderProduct;
+import com.github.zuihou.business.operationManagementCenter.entity.PlanProduct;
+import com.github.zuihou.business.operationManagementCenter.entity.TTask;
+import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
+import com.github.zuihou.business.productionReadyCenter.entity.BomProcedure;
+import com.github.zuihou.business.productionReadyCenter.entity.BomProcedureProductionresource;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 业务接口
+ * 计划表
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-29
+ */
+public interface TaskBizService extends SuperService<TTask> {
+
+    IPage<TTask> pageList(IPage<TTask> page, LbqWrapper<TTask> wrapper);
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskBizServiceImpl.java

@@ -0,0 +1,28 @@
+package com.github.zuihou.business.operationManagementCenter.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.service.SuperServiceImpl;
+import com.github.zuihou.business.operationManagementCenter.dao.*;
+import com.github.zuihou.business.operationManagementCenter.entity.*;
+import com.github.zuihou.business.operationManagementCenter.service.TaskBizService;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 业务实现类
+ * 订单生产单元
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-29
+ */
+@Slf4j
+@Service
+public class TaskBizServiceImpl extends SuperServiceImpl<TaskBizMapper, TTask> implements TaskBizService {
+    @Override
+    public IPage<TTask> pageList(IPage<TTask> page, LbqWrapper<TTask> wrapper) {
+        return baseMapper.pageList(page, wrapper);
+    }
+}

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/TaskBizMapper.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.github.zuihou.business.operationManagementCenter.dao.TaskBizMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.github.zuihou.business.operationManagementCenter.entity.TTask">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="update_user" jdbcType="VARCHAR" property="updateUser"/>
+        <result column="order_id" jdbcType="BIGINT" property="orderId"/>
+        <result column="order_no" jdbcType="VARCHAR" property="orderNo"/>
+        <result column="plan_id" jdbcType="BIGINT" property="planId"/>
+        <result column="plan_no" jdbcType="VARCHAR" property="planNo"/>
+        <result column="resource_id" jdbcType="BIGINT" property="resourceId"/>
+        <result column="procedure_id" jdbcType="BIGINT" property="procedureId"/>
+        <result column="procedure_name" jdbcType="BIGINT" property="procedureName"/>
+        <result column="task_no" jdbcType="VARCHAR" property="taskNo"/>
+        <result column="status" jdbcType="VARCHAR" property="status"/>
+        <result column="expect_start_time" jdbcType="TIMESTAMP" property="expectStartTime"/>
+        <result column="expect_end_time" jdbcType="TIMESTAMP" property="expectEndTime"/>
+        <result column="start_time" jdbcType="TIMESTAMP" property="startTime"/>
+        <result column="end_time" jdbcType="TIMESTAMP" property="endTime"/>
+        <result column="create_user" jdbcType="VARCHAR" property="createUser"/>
+        <result column="prority" jdbcType="INTEGER" property="prority"/>
+        <result column="draft_flag" jdbcType="VARCHAR" property="draftFlag"/>
+        <result column="executor_id" jdbcType="BIGINT" property="executorId"/>
+        <result column="executor_type" jdbcType="VARCHAR" property="executorType"/>
+        <result column="executor_name" jdbcType="BIGINT" property="executorName"/>
+        <result column="procedure_meterial_id" jdbcType="BIGINT" property="procedureMeterialId"/>
+        <result column="procedure_tray_group_id" jdbcType="BIGINT" property="procedureTrayGroupId"/>
+        <result column="procedure_program_id" jdbcType="BIGINT" property="procedureProgramId"/>
+        <result column="task_batch_no" jdbcType="VARCHAR" property="taskBatchNo"/>
+        <result column="bom_batch_no" jdbcType="VARCHAR" property="bomBatchNo"/>
+        <result column="procedure_no" jdbcType="VARCHAR" property="procedureNo"/>
+        <result column="process" jdbcType="FLOAT" property="process"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,create_time,update_time,update_user,
+        order_id,order_no, plan_id,plan_no, resource_id, procedure_id,procedure_name, task_no, status, expect_start_time, expect_end_time, start_time, end_time,orderName,
+        prority, draft_flag, executor_id, executor_type, executor_name,procedure_meterial_id, procedure_tray_group_id, procedure_program_id, task_batch_no,process,bom_batch_no,
+        overtimeStatus,bomDesc,procedure_no,planTime,ratedWorkHours,actualTime,resourceDesc,content,prepareWorkHours,bomNo,procedureDesc,ip,port,resourceName
+    </sql>
+
+    <!-- 分页 -->
+    <select id="pageList" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from (
+            select a.*,(select itp.name as resourceName from imcs_tenant_productionresource itp where itp.id= a.resource_id )
+            from imcs_t_task a
+            where 1=1
+            and a.complete_batch_no = #{completeBatchNo}
+        )
+        s ${ew.customSqlSegment}
+    </select>
+</mapper>

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/TaskBizController.java

@@ -0,0 +1,47 @@
+package com.github.zuihou.business.controller.operationManagementCenter;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.controller.SuperController;
+import com.github.zuihou.base.request.PageParams;
+import com.github.zuihou.business.operationManagementCenter.dto.TTaskPageDTO;
+import com.github.zuihou.business.operationManagementCenter.dto.TTaskSaveDTO;
+import com.github.zuihou.business.operationManagementCenter.dto.TTaskUpdateDTO;
+import com.github.zuihou.business.operationManagementCenter.entity.TTask;
+import com.github.zuihou.business.operationManagementCenter.service.TaskBizService;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
+import com.github.zuihou.log.annotation.SysLog;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 前端控制器
+ * 计划表
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-29
+ */
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/taskTracedBack")
+@Api(value = "taskTracedBack", tags = "任务")
+@SysLog(enabled = true)
+public class TaskBizController extends SuperController<TaskBizService, Long, TTask, TTaskPageDTO, TTaskSaveDTO, TTaskUpdateDTO> {
+    @Override
+    public void query(PageParams<TTaskPageDTO> params, IPage<TTask> page, Long defSize) {
+        TTaskPageDTO data = params.getModel();
+        QueryWrap<TTask> wrap = handlerWrapper(null, params);
+        LbqWrapper<TTask> wrapper = wrap.lambda();
+        TTask task = BeanUtil.toBean(data, TTask.class);
+        wrapper.eq(TTask::getCompleteBatchNo,task.getCompleteBatchNo()).orderByDesc(TTask::getPrority);
+        baseService.pageList(page, wrapper);
+    }
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/TTask.java

@@ -575,6 +575,9 @@ public class TTask extends Entity<Long> implements Serializable {
     @TableField(exist = false)
     private String tmpId;
 
+    @TableField(exist = false)
+    private String resourceName;
+
     @Override
     public String toString() {
         return "TTask{" +