修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/InOutWarehouseTaskServiceImpl.java

@@ -4,6 +4,7 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.winsea.svc.base.base.entity.CommonRole;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
@@ -26,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -178,7 +180,9 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                 // 只有待审核状态才有taskId
                 if (StringUtils.equals(StatusEnum.TASK_REVIEWED.getFlag(), inOutWarehouseTask1.getTaskStatusKey())) {
                     JSONObject jsonObject = workflowService.getActiveTask(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffId(),Lists.newArrayList(inOutWarehouseTask1.getWorkflowId()), inOutWarehouseTask1.getId());
+                    String aa = AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffId();
                     taskId = jsonObject.getString("taskId");
+                    List<String> roleIds = AuthSecurityUtils.getUserRoles(aa).stream().map(CommonRole::getRoleId).collect(Collectors.toList());
                     inOutWarehouseTask1.setTaskId(taskId);
                 }
             });
@@ -291,8 +295,9 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
 
                 //查询退库量
                 List<InOutWarehouseTask> inOutWarehouseTaskList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
+                        .eq("move_task_no",inOutWarehouseTaska.getMoveTaskNo())
                         .eq("in_out_type_key","6")
-                        .eq("contract_no",inOutWarehouseTaska.getMoveTaskNo()));
+                        .eq("delete_flag","0"));
                 if(!CollectionUtils.isEmpty(inOutWarehouseTaskList)) {
                     for (InOutWarehouseTask inoutwarehouse : inOutWarehouseTaskList) {
                         if (StringUtils.isEmpty(stockReturnCount)) {
@@ -301,7 +306,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                         stockReturnCount = String.valueOf(Float.valueOf(stockReturnCount) + inoutwarehouse.getWeight());
                     }
                 }
-
+                inOutWarehouseTaska.setStockReturnCount(stockReturnCount);
             }
         }