手动模式

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

@@ -1,58 +1,40 @@
 package com.github.zuihou.business.operationManagementCenter.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.service.SuperServiceImpl;
-import com.github.zuihou.business.DemoLine.DemoCacheKey;
-import com.github.zuihou.business.DemoLine.DemoLineConstant;
-import com.github.zuihou.business.edgeLibrary.dao.StockInfoMapper;
 import com.github.zuihou.business.edgeLibrary.dao.StorgeMapper;
-import com.github.zuihou.business.edgeLibrary.entity.StockInfo;
 import com.github.zuihou.business.edgeLibrary.entity.Storge;
 import com.github.zuihou.business.mq.HandModeWorkNode;
-import com.github.zuihou.business.operationManagementCenter.dao.*;
-import com.github.zuihou.business.operationManagementCenter.dto.OrderProductUpdateDTO;
-import com.github.zuihou.business.operationManagementCenter.dto.OrderUpdateDTO;
-import com.github.zuihou.business.operationManagementCenter.entity.*;
-import com.github.zuihou.business.operationManagementCenter.service.*;
+import com.github.zuihou.business.operationManagementCenter.dao.WorkpieceMapper;
+import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
+import com.github.zuihou.business.operationManagementCenter.entity.TaskNode;
+import com.github.zuihou.business.operationManagementCenter.service.TaskNodeService;
+import com.github.zuihou.business.operationManagementCenter.service.WorkpieceService;
 import com.github.zuihou.business.productionReadyCenter.dao.BBomMapper;
-import com.github.zuihou.business.productionReadyCenter.entity.BomProcedure;
 import com.github.zuihou.business.productionReadyCenter.entity.MToolClamp;
 import com.github.zuihou.business.productionReadyCenter.entity.Tray;
-import com.github.zuihou.business.productionReadyCenter.service.AutoNodeService;
-import com.github.zuihou.business.productionReadyCenter.service.BomProcedureService;
 import com.github.zuihou.business.productionReadyCenter.service.MToolClampService;
 import com.github.zuihou.business.productionReadyCenter.service.TrayService;
+import com.github.zuihou.business.productionResourceCenter.dao.ProductionresourceBizMapper;
 import com.github.zuihou.business.productionResourceCenter.dao.ProductionresourcePositionMapper;
+import com.github.zuihou.business.productionResourceCenter.entity.Productionresource;
 import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.business.productionResourceCenter.service.ProductionresourcePositionService;
-import com.github.zuihou.business.util.DynamicRabbitMq;
-import com.github.zuihou.common.constant.BizConstant;
-import com.github.zuihou.common.constant.CodeRuleModule;
-import com.github.zuihou.common.constant.RepeatCacheKey;
-import com.github.zuihou.common.util.DateUtil;
 import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.context.BaseContextHandler;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
-import com.github.zuihou.security.model.SysUser;
-import com.github.zuihou.tenant.dao.ProductionresourceviewMapper;
-import com.github.zuihou.tenant.service.CodeRuleService;
-import com.github.zuihou.utils.BeanPlusUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-import static com.github.zuihou.utils.BizAssert.isFalse;
 import static java.util.stream.Collectors.groupingBy;
 
 /**
@@ -67,6 +49,9 @@ import static java.util.stream.Collectors.groupingBy;
 @Slf4j
 @Service
 public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWorkpiece> implements WorkpieceService {
+    @Autowired
+    private ProductionresourceBizMapper productionresourceBizMapper;
+
     @Autowired
     private ProductionresourcePositionService productionresourcePositionService;
 
@@ -212,6 +197,7 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
             }
             ProductionresourcePosition position0 = subList.get(0);
             returnMap.put("pointId",key);
+            returnMap.put("storgeId",position0.getStorgeId());
             returnMap.put("name",position0.getName());
             returnMap.put("lockStatus",position0.getLockStatus());
             List<Map>l = new ArrayList<>();
@@ -220,7 +206,27 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
                     Map m = new HashMap();
                     m.put("goodsName",p.getGoodsName());
                     m.put("goodsId",p.getGoodsId());
+                    m.put("storgeId",p.getStorgeId());
+                    m.put("resourceId",p.getResourceId());
                     m.put("category",p.getCategory());
+                    if("5".equals(p.getCategory())){//如果是托板。
+                        List<Map>childL = new ArrayList<>();
+                        //根据托盘ID，找到对应的点位
+                        Map queryMap = new HashMap();
+                        queryMap.put("plateId",p.getGoodsId()==null?"":p.getGoodsId().toString());
+                        List<ProductionresourcePosition> childList = productionresourcePositionMapper.getPPList(queryMap);
+                        for(ProductionresourcePosition c:childList){
+                            Map childMap = new HashMap();
+                            childMap.put("pointId",c.getPointId());
+                            childMap.put("goodsName",c.getGoodsName());
+                            childMap.put("goodsId",c.getGoodsId());
+                            childMap.put("storgeId",c.getStorgeId());
+                            childMap.put("resourceId",c.getResourceId());
+                            childMap.put("category",c.getCategory());
+                            childL.add(childMap);
+                        }
+                        m.put("childList",childL);
+                    }
                     l.add(m);
                 }
             }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/dao/ProductionresourceBizMapper.java

@@ -1,11 +1,10 @@
 package com.github.zuihou.business.productionResourceCenter.dao;
 
 import com.github.zuihou.base.mapper.SuperMapper;
-import com.github.zuihou.tenant.entity.Productionresource;
+import com.github.zuihou.business.productionResourceCenter.entity.Productionresource;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

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

@@ -1,26 +1,20 @@
 package com.github.zuihou.business.productionResourceCenter.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.zuihou.business.DemoLine.DemoCacheKey;
+import com.github.zuihou.base.service.SuperServiceImpl;
 import com.github.zuihou.business.DemoLine.DemoLineConstant;
 import com.github.zuihou.business.productionResourceCenter.dao.ProductionresourceBizMapper;
 import com.github.zuihou.business.productionResourceCenter.dao.ProgramMapper;
 import com.github.zuihou.business.productionResourceCenter.dto.ProgramSaveDTO;
-import com.github.zuihou.business.productionResourceCenter.dto.ProgramSuitProductionresourceSaveDTO;
-import com.github.zuihou.business.productionResourceCenter.dto.ProgramSuitProductionresourceUpdateDTO;
 import com.github.zuihou.business.productionResourceCenter.dto.ProgramUpdateDTO;
+import com.github.zuihou.business.productionResourceCenter.entity.Productionresource;
 import com.github.zuihou.business.productionResourceCenter.entity.Program;
 import com.github.zuihou.business.productionResourceCenter.entity.ProgramSuitProductionresource;
-import com.github.zuihou.business.productionResourceCenter.entity.Tool;
 import com.github.zuihou.business.productionResourceCenter.service.ProgramService;
-import com.github.zuihou.base.service.SuperServiceImpl;
-
 import com.github.zuihou.business.productionResourceCenter.service.ProgramSuitProductionresourceService;
-import com.github.zuihou.common.constant.CodeRuleModule;
 import com.github.zuihou.common.constant.UrlConfConstant;
 import com.github.zuihou.context.BaseContextHandler;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
@@ -28,12 +22,8 @@ import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.file.entity.Attachment;
 import com.github.zuihou.file.properties.FileServerProperties;
 import com.github.zuihou.file.service.AttachmentService;
-import com.github.zuihou.tenant.dao.ProductionresourceMapper;
-import com.github.zuihou.tenant.entity.Productionresource;
 import com.github.zuihou.tenant.service.CodeRuleService;
 import com.github.zuihou.utils.BeanPlusUtil;
-import com.google.common.collect.Maps;
-import com.xxl.job.core.log.XxlJobFileAppender;
 import com.xxl.job.core.util.FileUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +34,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 
-import java.io.*;
 import java.nio.file.Paths;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -52,8 +41,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 import static com.github.zuihou.utils.DateUtils.DEFAULT_MONTH_FORMAT_SLASH;
 

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionResourceCenter/ProductionresourcePositionMapper.xml

@@ -74,6 +74,9 @@
         <if test="codes != null and codes != ''">
             and r.code in (${codes})
         </if>
+        <if test="plateId != null and plateId != ''">
+            and r.plate_id = #{plateId}
+        </if>
         <if test="pointId != null and pointId != ''">
             and p.point_id = #{pointId}
         </if>

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/entity/Productionresource.java

@@ -222,6 +222,10 @@ public class Productionresource extends Entity<Long> {
     @Excel(name = "生产资源类型(1-企业管理中的 2-全部资源管理)")
     private String resourcesType;
 
+    @ApiModelProperty(value = "程序数量")
+    @TableField("program_num")
+    private Integer programNum;
+
     /**
      * 生产资源种类(1-基础机器类 2-ARV搬运类 3-机器人操作类)
      */
@@ -289,6 +293,11 @@ public class Productionresource extends Entity<Long> {
     private Integer trayNum;
 
 
+    @ApiModelProperty(value = "可放子盘数量")
+    @TableField("plate_id")
+    private Long plateId;
+
+
 
 
     @Builder