agv流转记录

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/externalApi/dao/AgvHikOrderInfoMapper.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.externalApi.entity.AgvHikOrderInfo;
 import com.github.zuihou.business.externalApi.entity.AgvOrderInfo;
+import com.github.zuihou.database.mybatis.auth.DataScope;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -24,5 +26,5 @@ public interface AgvHikOrderInfoMapper extends SuperMapper<AgvHikOrderInfo> {
     /**
      * 分页
      */
-    IPage<AgvHikOrderInfo> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<AgvHikOrderInfo> queryWrapper);
+    IPage<AgvHikOrderInfo> pageList(IPage<AgvHikOrderInfo> page, @Param("orderName") String orderName, @Param("orderNo") String orderNo, @Param("partName") String partName, @Param("partNo") String partNo, @Param("createTime") String createTime,@Param(Constants.WRAPPER)  LbqWrapper<AgvHikOrderInfo> wrapper, DataScope dataScope);
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/externalApi/service/AgvHikOrderInfoService.java

@@ -5,6 +5,7 @@ import com.github.zuihou.base.R;
 import com.github.zuihou.base.service.SuperCacheService;
 import com.github.zuihou.business.externalApi.entity.AgvHikOrderInfo;
 import com.github.zuihou.business.externalApi.entity.AgvOrderInfo;
+import com.github.zuihou.business.operationManagementCenter.entity.Plan;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 
 import java.util.Map;
@@ -19,8 +20,7 @@ import java.util.Map;
  * @date 2021-12-28
  */
 public interface AgvHikOrderInfoService extends SuperCacheService<AgvHikOrderInfo> {
-
-    IPage<AgvHikOrderInfo> pageList(IPage page, LbqWrapper<AgvHikOrderInfo> wrapper);
+    IPage<AgvHikOrderInfo> pageList(IPage<AgvHikOrderInfo> page, String orderName, String orderNo, String partName, String partNo, String createTime, LbqWrapper<AgvHikOrderInfo> wrapper);
 
     /**
      * 保存

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

@@ -23,6 +23,7 @@ import com.github.zuihou.common.constant.CacheKey;
 import com.github.zuihou.common.constant.ParameterKey;
 import com.github.zuihou.common.util.UniqueKeyGenerator;
 import com.github.zuihou.context.BaseContextHandler;
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.injection.annonation.InjectionResult;
 import com.github.zuihou.utils.BeanPlusUtil;
@@ -69,11 +70,11 @@ public class AgvHikOrderInfoServiceImpl extends SuperCacheServiceImpl<AgvHikOrde
     }
 
     @Override
-    @InjectionResult
-    public IPage<AgvHikOrderInfo> pageList(IPage page, LbqWrapper<AgvHikOrderInfo> wrapper) {
-        return baseMapper.pageList(page, wrapper);
+    public IPage<AgvHikOrderInfo> pageList(IPage<AgvHikOrderInfo> page, String orderName, String orderNo, String partName, String partNo, String createTime, LbqWrapper<AgvHikOrderInfo> wrapper){
+        return baseMapper.pageList(page,orderName,orderNo,partName, partNo,createTime, wrapper, new DataScope());
     }
 
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AgvHikOrderInfo saveAgvOrderInfo(AgvHikOrderInfo data) {

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/externalApi/AgvHikOrderInfoMapper.xml

@@ -2,4 +2,41 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.github.zuihou.business.externalApi.dao.AgvHikOrderInfoMapper">
 
+    <select id="pageList" resultType="com.github.zuihou.business.externalApi.entity.AgvHikOrderInfo">
+        SELECT
+            ihai.*,
+            ihadi.callback_time AS completeTime,
+            ioo.order_name AS orderName,
+            ioo.order_no AS orderNo,
+            ibb.name  AS partName,
+            ibb.no  AS partNo,
+            itt.procedure_no AS procedureNo
+        FROM imcs_hik_agv_info ihai,
+            imcs_hik_agv_detail_info ihadi,
+            imcs_t_task itt,
+            imcs_o_order ioo,
+            imcs_o_order_product ioop,
+            imcs_b_bom ibb
+        WHERE ihadi.task_code = ihai.task_code
+        AND ihai.task_id = itt.id
+        AND itt.order_id = ioo.id
+        AND ioo.id = ioop.order_id
+        AND ioop.bom_id = ibb.id
+        <if test="orderName != null and orderName != ''">
+            and ioo.order_name like concat('%', #{orderName}, '%')
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and ioo.order_no like concat('%', #{orderNo}, '%')
+        </if>
+        <if test="partName != null and partName != ''">
+            and ibb.name like concat('%', #{partName}, '%')
+        </if>
+        <if test="partNo != null and partNo != ''">
+            and ibb.no like concat('%', #{partNo}, '%')
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and ihai.req_time like concat('%', #{createTime}, '%')
+        </if>
+        ) s ${ew.customSqlSegment}
+    </select>
 </mapper>

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

@@ -204,6 +204,7 @@
         AND ibbvi.use_status = '1'
         AND ibbp.bom_id = ibbvi.bom_id
         AND ibbp.id = produceCuttingTools.procedureId
+        AND ibbp.program_conf = '2'
 
         <if test="planId != null and planId != ''">
             and ippp.plan_id in (${planId})
@@ -240,6 +241,7 @@
             AND ibbvi.use_status = '1'
             AND ibbp.bom_id = ibbvi.bom_id
             AND ibbp.id = ibbpt.procedure_id
+            AND ibbp.program_conf = '2'
             <if test="planId != null and planId != ''">
                 and ippp.plan_id = #{planId}
             </if>

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/externalApi/HikAgvControl.java

@@ -4,15 +4,19 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.authority.service.common.ParameterService;
 import com.github.zuihou.base.R;
 import com.github.zuihou.base.controller.SuperController;
+import com.github.zuihou.base.request.PageParams;
 import com.github.zuihou.business.externalApi.dto.*;
 import com.github.zuihou.business.externalApi.entity.AgvHikOrderDetailInfo;
 import com.github.zuihou.business.externalApi.entity.AgvHikOrderInfo;
 import com.github.zuihou.business.externalApi.entity.AgvOrderDetailInfo;
 import com.github.zuihou.business.externalApi.entity.AgvOrderInfo;
 import com.github.zuihou.business.externalApi.service.*;
+import com.github.zuihou.business.operationManagementCenter.dto.TTaskPageDTO;
+import com.github.zuihou.business.operationManagementCenter.entity.TTask;
 import com.github.zuihou.common.constant.HikR;
 import com.github.zuihou.common.constant.ParameterKey;
 import com.github.zuihou.common.enums.AgvActionEnum;
@@ -20,6 +24,7 @@ import com.github.zuihou.common.enums.AgvLocationRelationEnum;
 import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.context.BaseContextHandler;
 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 io.swagger.annotations.ApiOperation;
@@ -67,6 +72,14 @@ public class HikAgvControl extends SuperController<AgvHikOrderInfoService, Long,
     @Autowired
     private AgvHikOrderInfoService agvHikOrderInfoService;
 
+    @Override
+    public void query(PageParams<AgvHikOrderInfoPageDTO> params, IPage<AgvHikOrderInfo> page, Long defSize) {
+        AgvHikOrderInfoPageDTO data = params.getModel();
+        QueryWrap<AgvHikOrderInfo> wrap = handlerWrapper(null, params);
+        LbqWrapper<AgvHikOrderInfo> wrapper = wrap.lambda();
+        baseService.pageList(page,data.getOrderName(),data.getOrderNo(),data.getPartName(),data.getPartNo(),data.getCreateTime(), wrapper);
+    }
+
     @ApiOperation(value = "agv任务完成回调", notes = "agv任务完成回调")
     @PostMapping("/agvCallback")
     public HikR agvCallback(@RequestBody Map<String, String> data) {

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/externalApi/dto/AgvHikOrderInfoPageDTO.java

@@ -120,4 +120,10 @@ public class AgvHikOrderInfoPageDTO implements Serializable {
      */
     @ApiModelProperty(value = "agv重做动作号 0:agv搬运 1: agv托起托盘到安全位 2：agv重新将托盘放到接驳位" )
     private int repeatActionType;
+
+    private String orderName;
+    private String orderNo;
+    private String partName;
+    private String partNo;
+    private String createTime;
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/externalApi/entity/AgvHikOrderInfo.java

@@ -143,5 +143,23 @@ public class AgvHikOrderInfo extends Entity<Long> {
     @TableField("repeat_action_type")
     private int repeatActionType;
 
+    @ApiModelProperty(value = "父agv任务点")
+    @TableField(exist = false)
+    private String completeTime;
+
+    @TableField(exist = false)
+    private String orderName;
+
+    @TableField(exist = false)
+    private String orderNo;
+
+    @TableField(exist = false)
+    private String partName;
+
+    @TableField(exist = false)
+    private String partNo;
+
+    @TableField(exist = false)
+    private String procedureNo;
 
 }