刀具工序

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

@@ -31,6 +31,8 @@ public interface WorkpieceService extends SuperService<TWorkpiece> {
 
     public Map getInfoByPoint(String pointId);
 
+    public List getOrderInfo();
+
     public List<Map> getAllStockInfo();
 
     //执行非订单物品

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

@@ -141,6 +141,48 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
         return map;
     }
 
+
+    @Override
+    public List getOrderInfo() {
+        List<Map>returnList = new ArrayList<Map>();
+        List<TWorkpiece>list = baseMapper.selectList(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getIsEnd,"0"));
+
+        for(TWorkpiece workpiece:list){
+            Map<String,String> map = new<String,String> HashMap();
+            map.put("pointId",StringUtil.isEmpty(workpiece.getPointId())?"":workpiece.getPointId());
+            map.put("orderName",StringUtil.isEmpty(workpiece.getOrderName())?"":workpiece.getOrderName());
+            map.put("bomNo",StringUtil.isEmpty(workpiece.getBomNo())?"":workpiece.getBomNo());
+            map.put("bomName",StringUtil.isEmpty(workpiece.getBomName())?"":workpiece.getBomName());
+            map.put("procedureName",StringUtil.isEmpty(workpiece.getProcedureName())?"":workpiece.getProcedureName());
+//        if(CollectionUtil.isEmpty(list)){
+//            return new HashMap();
+//        }
+
+
+//            //根据库位查询
+//
+//            if(workpiece.getStorgeId()!=null){
+//                List<ProductionresourcePosition>positionList = productionresourcePositionService.list(Wraps.<ProductionresourcePosition>lbQ().eq(ProductionresourcePosition::getStorgeId,workpiece.getStorgeId()));
+//                if(CollectionUtil.isNotEmpty(positionList)){
+//                    ProductionresourcePosition pp = positionList.get(0);
+//                    map.put("lockStatus",pp.getStatus());
+//                }
+//            }
+
+            if(workpiece.getTaskNodeId()!=null){
+                //查询下一个节点任务，待办任务
+                TaskNode taskNode = taskNodeService.getById(workpiece.getTaskNodeId());
+
+                TaskNode nextTaskNode = taskNodeService.getNextNTaskNode(taskNode, 1);
+                map.put("nodeName",nextTaskNode.getNodeName());
+                map.put("nodeId",nextTaskNode.getId().toString());
+            }
+            returnList.add(map);
+        }
+
+        return returnList;
+    }
+
     @Override
     public List<Map> getAllStockInfo() {
         BaseContextHandler.setTenant("0000");

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/BomProcedureToolMapper.java

@@ -0,0 +1,24 @@
+package com.github.zuihou.business.productionReadyCenter.dao;
+
+import com.github.zuihou.base.mapper.SuperMapper;
+import com.github.zuihou.business.productionReadyCenter.entity.BBomProcedureTool;
+import com.github.zuihou.business.productionReadyCenter.entity.BomProcedureMeterial;
+import com.github.zuihou.business.productionReadyCenter.entity.BomProcedureVersion;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 接口
+ * 工序原材料
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-20
+ */
+@Repository
+public interface BomProcedureToolMapper extends SuperMapper<BBomProcedureTool> {
+
+
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/BomProcedureToolService.java

@@ -0,0 +1,22 @@
+package com.github.zuihou.business.productionReadyCenter.service;
+
+import com.github.zuihou.base.service.SuperService;
+import com.github.zuihou.business.productionReadyCenter.entity.BBomProcedureTool;
+import com.github.zuihou.business.productionReadyCenter.entity.BomProcedureProgram;
+import com.github.zuihou.business.productionReadyCenter.entity.BomProcedureVersion;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 业务接口
+ * 工序程序配置
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-20
+ */
+public interface BomProcedureToolService extends SuperService<BBomProcedureTool> {
+
+
+}

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

@@ -0,0 +1,25 @@
+package com.github.zuihou.business.productionReadyCenter.service.impl;
+
+import com.github.zuihou.base.service.SuperServiceImpl;
+import com.github.zuihou.business.productionReadyCenter.dao.BomProcedureTestMapper;
+import com.github.zuihou.business.productionReadyCenter.dao.BomProcedureToolMapper;
+import com.github.zuihou.business.productionReadyCenter.entity.BBomProcedureTool;
+import com.github.zuihou.business.productionReadyCenter.entity.BomProcedureTest;
+import com.github.zuihou.business.productionReadyCenter.service.BomProcedureTestService;
+import com.github.zuihou.business.productionReadyCenter.service.BomProcedureToolService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 业务实现类
+ * 工序质检
+ * </p>
+ *
+ * @author imcs
+ * @date 2021-02-22
+ */
+@Slf4j
+@Service
+public class BomProcedureToolServiceImpl extends SuperServiceImpl<BomProcedureToolMapper, BBomProcedureTool> implements BomProcedureToolService {
+}

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

@@ -73,6 +73,9 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
     private BomProcedureTrayPositionService bomProcedureTrayPositionService;
     @Autowired
     private BomProcedureProgramService bomProcedureProgramService;
+
+    @Autowired
+    private BomProcedureToolService bomProcedureToolService;
 //    @Autowired
 //    private BomProcedureProgramGroupService bomProcedureProgramGroupService;
 //    @Autowired
@@ -611,6 +614,22 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
                 }).collect(Collectors.toList());
                 bomProcedureProgramService.saveBatch(pList);
 
+
+                //删除刀具
+                bomProcedureToolService.remove(Wraps.<BBomProcedureTool>lbQ().eq(BBomProcedureTool::getProcedureId,bean.getId()));
+                List<BBomProcedureTool> toolList = bean.getToolList();
+                if(programList != null && programList.size() > 0) {
+                    List<BBomProcedureTool> tList = programList.stream().map((map) -> {
+                        BBomProcedureTool item = new BBomProcedureTool();
+                        BeanUtil.copyProperties(map, item);
+                        item.setProcedureId(bean.getId());
+                        item.setId(null);
+                        return item;
+                    }).collect(Collectors.toList());
+                    bomProcedureToolService.saveBatch(toolList);
+                }
+
+
                 //保存程序对应的位置程序
 //                for(BomProcedureProgram programBean:pList){
 //                    List<BomProcedureProgramGroup> programGroupList = programBean.getProgramGroupList();
@@ -757,6 +776,10 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
 //        }
         model.setProgramList(programList);
 
+        //设置刀具
+        List<BBomProcedureTool>toolList = bomProcedureToolService.list(Wraps.<BBomProcedureTool>lbQ().eq(BBomProcedureTool::getProcedureId,bean.getId())));
+        model.setToolList(toolList);
+
         //人工质检
         model.setProcedureTestList(bomProcedureTestService.list(Wraps.<BomProcedureTest>lbQ().eq(BomProcedureTest::getProcedureId,bean.getId())));
 

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/BBomProcedureToolMapper.xml

@@ -0,0 +1,24 @@
+<?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.tenant.dao.BBomProcedureToolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.github.zuihou.tenant.entity.BBomProcedureTool">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="create_user" jdbcType="BIGINT" property="createUser"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="update_user" jdbcType="BIGINT" property="updateUser"/>
+        <result column="procedure_id" jdbcType="BIGINT" property="procedureId"/>
+        <result column="tool_name" jdbcType="VARCHAR" property="toolName"/>
+        <result column="count" jdbcType="INTEGER" property="count"/>
+        <result column="use_time" jdbcType="VARCHAR" property="useTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,create_time,create_user,update_time,update_user,
+        procedure_id, tool_name, count, use_time
+    </sql>
+
+</mapper>

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

@@ -131,6 +131,13 @@ public class WorkpieceController extends SuperController<WorkpieceService, Long,
         return success(map);
     }
 
+    @ApiOperation(value = "根据点位查询手动模式信息", notes = "根据点位查询手动模式信息")
+    @PostMapping("/handMode/getOrderInfo")
+    public R<List>  getOrderInfo(@RequestBody Map paraMap) {
+        List list = baseService.getOrderInfo();
+        return success(list);
+    }
+
 
     @ApiOperation(value = "获取所有有库位的点位", notes = "获取所有有库位的点位")
     @PostMapping("/handMode/getAllStockInfo")

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

@@ -161,6 +161,11 @@ public class TWorkpiece extends Entity {
     private Long taskNodeId;
 
 
+    @ApiModelProperty(value = "是否结束")
+    @TableField("is_end")
+    private Long isEnd;
+
+
 
     @Builder
     public TWorkpiece(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/BBomProcedureToolPageDTO.java

@@ -0,0 +1,69 @@
+package com.github.zuihou.business.productionReadyCenter.dto;
+
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import lombok.Data;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实体类
+ * 工序刀具
+ * </p>
+ *
+ * @author imcs_
+ * @since 2022-01-23
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "BBomProcedureToolPageDTO", description = "工序刀具")
+public class BBomProcedureToolPageDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工序ID
+     */
+    @ApiModelProperty(value = "工序ID")
+    private Long procedureId;
+    /**
+     * 刀具名称
+     */
+    @ApiModelProperty(value = "刀具名称")
+    @Length(max = 256, message = "刀具名称长度不能超过256")
+    private String toolName;
+    /**
+     * 数量
+     */
+    @ApiModelProperty(value = "数量")
+    private Integer count;
+    /**
+     * 文件路径
+     */
+    @ApiModelProperty(value = "文件路径")
+    @Length(max = 256, message = "文件路径长度不能超过256")
+    private String useTime;
+
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/BBomProcedureToolSaveDTO.java

@@ -0,0 +1,68 @@
+package com.github.zuihou.business.productionReadyCenter.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import lombok.Data;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实体类
+ * 工序刀具
+ * </p>
+ *
+ * @author imcs_
+ * @since 2022-01-23
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "BBomProcedureToolSaveDTO", description = "工序刀具")
+public class BBomProcedureToolSaveDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工序ID
+     */
+    @ApiModelProperty(value = "工序ID")
+    private Long procedureId;
+    /**
+     * 刀具名称
+     */
+    @ApiModelProperty(value = "刀具名称")
+    @Length(max = 256, message = "刀具名称长度不能超过256")
+    private String toolName;
+    /**
+     * 数量
+     */
+    @ApiModelProperty(value = "数量")
+    private Integer count;
+    /**
+     * 文件路径
+     */
+    @ApiModelProperty(value = "文件路径")
+    @Length(max = 256, message = "文件路径长度不能超过256")
+    private String useTime;
+
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/BBomProcedureToolUpdateDTO.java

@@ -0,0 +1,72 @@
+package com.github.zuihou.business.productionReadyCenter.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import com.github.zuihou.base.entity.SuperEntity;
+import lombok.Data;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实体类
+ * 工序刀具
+ * </p>
+ *
+ * @author imcs_
+ * @since 2022-01-23
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "BBomProcedureToolUpdateDTO", description = "工序刀具")
+public class BBomProcedureToolUpdateDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @NotNull(message = "id不能为空", groups = SuperEntity.Update.class)
+    private Long id;
+
+    /**
+     * 工序ID
+     */
+    @ApiModelProperty(value = "工序ID")
+    private Long procedureId;
+    /**
+     * 刀具名称
+     */
+    @ApiModelProperty(value = "刀具名称")
+    @Length(max = 256, message = "刀具名称长度不能超过256")
+    private String toolName;
+    /**
+     * 数量
+     */
+    @ApiModelProperty(value = "数量")
+    private Integer count;
+    /**
+     * 文件路径
+     */
+    @ApiModelProperty(value = "文件路径")
+    @Length(max = 256, message = "文件路径长度不能超过256")
+    private String useTime;
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/BBomProcedureTool.java

@@ -0,0 +1,99 @@
+package com.github.zuihou.business.productionReadyCenter.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import java.time.LocalDateTime;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import static com.github.zuihou.utils.DateUtils.DEFAULT_DATE_TIME_FORMAT;
+
+import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
+
+/**
+ * <p>
+ * 实体类
+ * 工序刀具
+ * </p>
+ *
+ * @author imcs_
+ * @since 2022-01-23
+ */
+@Data
+@NoArgsConstructor
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("imcs_b_bom_procedure_tool")
+@ApiModel(value = "BBomProcedureTool", description = "工序刀具")
+@AllArgsConstructor
+public class BBomProcedureTool extends Entity<Long> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工序ID
+     */
+    @ApiModelProperty(value = "工序ID")
+    @TableField("procedure_id")
+    @Excel(name = "工序ID")
+    private Long procedureId;
+
+    /**
+     * 刀具名称
+     */
+    @ApiModelProperty(value = "刀具名称")
+    @Length(max = 256, message = "刀具名称长度不能超过256")
+    @TableField(value = "tool_name", condition = LIKE)
+    @Excel(name = "刀具名称")
+    private String toolName;
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty(value = "数量")
+    @TableField("count")
+    @Excel(name = "数量")
+    private Integer count;
+
+    /**
+     * 文件路径
+     */
+    @ApiModelProperty(value = "文件路径")
+    @Length(max = 256, message = "文件路径长度不能超过256")
+    @TableField(value = "use_time", condition = LIKE)
+    @Excel(name = "文件路径")
+    private String useTime;
+
+
+    @Builder
+    public BBomProcedureTool(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, 
+                    Long procedureId, String toolName, Integer count, String useTime) {
+        this.id = id;
+        this.createTime = createTime;
+        this.createUser = createUser;
+        this.updateTime = updateTime;
+        this.updateUser = updateUser;
+        this.procedureId = procedureId;
+        this.toolName = toolName;
+        this.count = count;
+        this.useTime = useTime;
+    }
+
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/BomProcedureVersion.java

@@ -260,6 +260,10 @@ public class BomProcedureVersion extends Entity<Long> {
     @TableField(exist = false)
     private List<BomProcedureProgram> programList;
 
+    @ApiModelProperty(value="程序")
+    @TableField(exist = false)
+    private List<BBomProcedureTool> toolList;
+
     @ApiModelProperty(value="人工质检")
     @TableField(exist = false)
     private List<BomProcedureTest> procedureTestList;