手动模式添加字段

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

@@ -30,5 +30,7 @@ public interface WorkpieceService extends SuperService<TWorkpiece> {
 
     public Map getInfoByPoint(String pointId);
 
+    public String getAllStockInfo();
+
 
 }

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

@@ -114,7 +114,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
 
                             TWorkpiece workpiece = new TWorkpiece();
                             workpiece.setBomId(bomProcedure.getBomId()).setCompleteBatchNo(task.getCompleteBatchNo()).setOrderId(planProduct.getOrderId()).setOrderNo(planProduct.getOrderNo())
-                                    .setPlanId(planProduct.getPlanId()).setPlanNo(planProduct.getPlanNo()).setProcedureId(bomProcedure.getId()).setProcedureNmae(bomProcedure.getName());
+                                    .setPlanId(planProduct.getPlanId()).setPlanNo(planProduct.getPlanNo()).setProcedureId(bomProcedure.getId()).setProcedureName(bomProcedure.getName());
                             workpieceMapper.insert(workpiece);
                         }
                         task.setProcedureSort(j);

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

@@ -15,6 +15,7 @@ import com.github.zuihou.business.operationManagementCenter.service.*;
 import com.github.zuihou.business.productionReadyCenter.entity.BomProcedure;
 import com.github.zuihou.business.productionReadyCenter.service.AutoNodeService;
 import com.github.zuihou.business.productionReadyCenter.service.BomProcedureService;
+import com.github.zuihou.business.productionResourceCenter.dao.ProductionresourcePositionMapper;
 import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.business.productionResourceCenter.service.ProductionresourcePositionService;
 import com.github.zuihou.business.util.DynamicRabbitMq;
@@ -58,6 +59,9 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
     @Autowired
     private ProductionresourcePositionService productionresourcePositionService;
 
+    @Autowired
+    private ProductionresourcePositionMapper productionresourcePositionMapper;
+
     @Override
     public IPage<TWorkpiece> pageList(IPage page, LbqWrapper<TWorkpiece> wrapper) {
         return baseMapper.pageList(page, wrapper);
@@ -93,9 +97,16 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
             ProductionresourcePosition pp = positionList.get(0);
             map.put("lockStatus",pp.getStatus());
         }
-
-
         return map;
+    }
+
+    @Override
+    public String 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;
 
     }
 }

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

@@ -128,5 +128,13 @@ public class WorkpieceController extends SuperController<WorkpieceService, Long,
     }
 
 
+    @ApiOperation(value = "获取所有有库位的点位", notes = "获取所有有库位的点位")
+    @PostMapping("/handMode/getAllStockInfo")
+    public R<String>  getAllStockInfo() {
+        String pointIds  = baseService.getAllStockInfo();
+        return success(pointIds);
+    }
+
+
 
 }

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

@@ -153,7 +153,7 @@ public class TWorkpiece extends Entity {
     @ApiModelProperty(value = "工序名称")
     @Length(max = 256, message = "工序名称")
     @TableField(value = "procedure_name", condition = LIKE)
-    private String procedureNmae;
+    private String procedureName;