解决后台回库出库相关业务bug

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

@@ -1589,7 +1589,8 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
                 List list = productionresourcePositionService.getFreeProductionresourcePositionByIds(new String[]{task.getResourceId().toString()});
                 if(list.size()==0){
                     //上下料站或立库库位取完成以后释放锁定
-                    Storge storge = storgeService.getOne(new LambdaQueryWrapper<Storge>().eq(Storge::getResourceId, task.getResourceId()).last("limit 1"));
+                    ProductionresourcePosition productionresourcePosition = productionresourcePositionService.getOne(new LambdaQueryWrapper<ProductionresourcePosition>().eq(ProductionresourcePosition::getResourceId, task.getResourceId()).last("limit 1"));
+                    Storge storge = storgeService.getById(productionresourcePosition.getStorgeId());
                     storgeService.unlockStorge(storge);
 
                     //设备点位已锁定  删除上下料站缓存锁定信息

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

@@ -579,7 +579,7 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
 
     @Override
     public void setWorkPieceStock(TWorkpiece currWorkpiece,String currStorgeId,String parentStorgeId,TaskNode taskNode,String uniqueCode) {
-            if(StringUtil.isNotEmpty(currStorgeId)){
+            if(StringUtil.isNotEmpty(currStorgeId) && !taskNode.getNodeType().equals("4")){
                 Storge storge = storgeMapper.selectById(currStorgeId);
                 currWorkpiece.setStorgeId(Long.parseLong(currStorgeId));
                 currWorkpiece.setPointId(storge.getPointId());