设置点位

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

@@ -3,6 +3,8 @@ package com.github.zuihou.business.operationManagementCenter.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.service.SuperService;
 import com.github.zuihou.business.edgeLibrary.entity.Shelves;
+import com.github.zuihou.business.edgeLibrary.entity.StockInfo;
+import com.github.zuihou.business.edgeLibrary.entity.Storge;
 import com.github.zuihou.business.operationManagementCenter.entity.PlanProduct;
 import com.github.zuihou.business.operationManagementCenter.entity.TTask;
 import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
@@ -61,7 +63,10 @@ public interface WorkpieceService extends SuperService<TWorkpiece> {
     public void setWorkPieceStock(Long taskNodeId,String targetStorgeId);
 
 
-    public TWorkpiece getWorkPieceStock(Long taskNodeId);
+    public Storge getWorkPieceStock(Long taskNodeId, boolean isParent);
+
+
+    public TWorkpiece getWorkPiece(Long taskNodeId);
 
 
 }

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

@@ -19,7 +19,6 @@ import com.github.zuihou.business.productionReadyCenter.service.MToolClampServic
 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.common.util.StringUtil;
@@ -333,8 +332,31 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
         }
     }
 
+    /**
+     *
+     * @param taskNodeId
+     * @param isParent
+     * @return
+     */
     @Override
-    public TWorkpiece getWorkPieceStock(Long taskNodeId) {
+    public Storge getWorkPieceStock(Long taskNodeId,boolean isParent) {
+        Storge storge = new Storge();
+        TWorkpiece tWorkpiece = new TWorkpiece();
+        List<TWorkpiece>list = baseMapper.selectList(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getTaskNodeId,taskNodeId));
+        if(CollectionUtil.isNotEmpty(list)){
+            tWorkpiece = list.get(0);
+        }
+        if(isParent){//查父
+            storge = storgeMapper.selectById(tWorkpiece.getPstorgeId());
+        }else{
+            storge = storgeMapper.selectById(tWorkpiece.getStorgeId());
+        }
+
+        return storge;
+    }
+
+    @Override
+    public TWorkpiece getWorkPiece(Long taskNodeId) {
         TWorkpiece tWorkpiece = new TWorkpiece();
         List<TWorkpiece>list = baseMapper.selectList(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getTaskNodeId,taskNodeId));
         if(CollectionUtil.isNotEmpty(list)){

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

@@ -140,6 +140,16 @@ public class TWorkpiece extends Entity {
     @TableField(value = "point_id", condition = LIKE)
     private String pointId;
 
+    @ApiModelProperty(value = "父库位ID")
+    @TableField("pstorge_id")
+    @Excel(name = "父库位ID")
+    private Long pstorgeId;
+
+    @ApiModelProperty(value = "父点位ID")
+    @Length(max = 4, message = "父点位ID")
+    @TableField(value = "ppoint_id", condition = LIKE)
+    private String ppointId;
+
     @ApiModelProperty(value = "订单名称")
     @Length(max = 256, message = "订单名称")
     @TableField(value = "order_name", condition = LIKE)