手动模式添加字段

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

@@ -7,6 +7,7 @@ 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.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 
 import java.util.List;
@@ -30,7 +31,10 @@ public interface WorkpieceService extends SuperService<TWorkpiece> {
 
     public Map getInfoByPoint(String pointId);
 
-    public String getAllStockInfo();
+    public List<ProductionresourcePosition> getAllStockInfo();
+
+    //执行非订单物品
+    public void execute(Map map);
 
 
 }

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

@@ -62,6 +62,9 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
     @Autowired
     private ProductionresourcePositionMapper productionresourcePositionMapper;
 
+    @Autowired
+    private TaskNodeService taskNodeService;
+
     @Override
     public IPage<TWorkpiece> pageList(IPage page, LbqWrapper<TWorkpiece> wrapper) {
         return baseMapper.pageList(page, wrapper);
@@ -92,21 +95,38 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
 
 
         //根据库位查询
-        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.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());
         }
         return map;
     }
 
     @Override
-    public String getAllStockInfo() {
+    public List<ProductionresourcePosition> getAllStockInfo() {
         Map map = new HashMap();
         map.put("fullFlag","1");
         List<ProductionresourcePosition> jbwBList = productionresourcePositionMapper.getPPList(map);
-        String pointIds = jbwBList.stream().map(e -> e.getPointId()).collect(Collectors.joining("/"));
-        return pointIds;
+//        String pointIds = jbwBList.stream().map(e -> e.getPointId()).collect(Collectors.joining("/"));
+        return jbwBList;
+
+    }
+
+    @Override
+    public void execute(Map map) {
 
     }
 }

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

@@ -13,6 +13,7 @@ import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
 import com.github.zuihou.business.operationManagementCenter.service.TaskService;
 import com.github.zuihou.business.operationManagementCenter.service.WorkpieceService;
 import com.github.zuihou.business.productionReadyCenter.entity.Plate;
+import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.business.websocket.WebSocketServer;
 import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
@@ -130,9 +131,24 @@ public class WorkpieceController extends SuperController<WorkpieceService, Long,
 
     @ApiOperation(value = "获取所有有库位的点位", notes = "获取所有有库位的点位")
     @PostMapping("/handMode/getAllStockInfo")
-    public R<String>  getAllStockInfo() {
-        String pointIds  = baseService.getAllStockInfo();
-        return success(pointIds);
+    public R<List<ProductionresourcePosition>>  getAllStockInfo() {
+        List<ProductionresourcePosition>list  = baseService.getAllStockInfo();
+        return success(list);
+    }
+
+
+    @ApiOperation(value = "订单执行", notes = "订单执行")
+    @PostMapping("/handMode/executeOrder")
+    public R<String>  executeOrder(@RequestBody String id) {
+        return success("");
+    }
+
+
+    @ApiOperation(value = "手动执行（非订单）", notes = "手动执行（非订单）")
+    @PostMapping("/handMode/execute")
+    public R<String>  execute(@RequestBody Map map) {
+        baseService.execute(map);
+        return success("");
     }
 
 

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

@@ -156,6 +156,10 @@ public class TWorkpiece extends Entity {
     private String procedureName;
 
 
+    @ApiModelProperty(value = "自动化程序ID")
+    private Long taskNodeId;
+
+
 
     @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/operationManagementCenter/entity/TaskNode.java

@@ -169,6 +169,16 @@ public class TaskNode extends Entity<Long> {
     @Excel(name = "节点编码")
     private String nodeNo;
 
+
+    /**
+     * 节点名称
+     */
+    @ApiModelProperty(value = "节点名称")
+    @Length(max = 16, message = "节点名称")
+    @TableField(value = "node_name", condition = LIKE)
+    @Excel(name = "节点名称")
+    private String nodeName;
+
     /**
      * 执行结果(1-成功0-失败)
      */