修改

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

@@ -300,9 +300,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("delete_flag", "0"));
+                        .eq("contract_no",inOutWarehouseTaska.getMoveTaskNo())
+                        .eq("in_out_type_key","6")
+                        .eq("delete_flag","0"));
                 if (!CollectionUtils.isEmpty(inOutWarehouseTaskList)) {
                     for (InOutWarehouseTask inoutwarehouse : inOutWarehouseTaskList) {
                         if (StringUtils.isEmpty(stockReturnCount)) {
@@ -325,28 +325,32 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
 
     /**
      * 查看移库任务
-     *
      * @param moveTaskNo
      * @return
      */
     @Override
-    public List<InOutWarehouseTask> getInOutWarehouseTaskRelocation(String moveTaskNo) {
+    public List<InOutWarehouseTask> getInOutWarehouseTaskRelocation(String moveTaskNo){
         List<InOutWarehouseTask> inOutWarehouseTaskList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
-                .eq("move_task_no", moveTaskNo));
-        if (!CollectionUtils.isEmpty(inOutWarehouseTaskList)) {
-            inOutWarehouseTaskList.forEach(inOutWarehouseTask -> {
+                .eq("move_task_no",moveTaskNo));
+        if(!CollectionUtils.isEmpty(inOutWarehouseTaskList)){
+            for(InOutWarehouseTask inOutWarehouseTask:inOutWarehouseTaskList) {
+                //定义累计退库量
+                String stockReturnCount = "";
+                //查询退库量
                 List<InOutWarehouseTask> inOutWarehouseTaskList1 = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
                         .eq("in_out_type_key", "6")
-                        .eq("contract_no", inOutWarehouseTask.getMoveTaskNo()));
-                //累计退库量
-                String stockReturnCount = "";
-                for (InOutWarehouseTask inoutwarehouse : inOutWarehouseTaskList1) {
-                    if (StringUtils.isEmpty(stockReturnCount)) {
-                        stockReturnCount = "0";
+                        .eq("contract_no", inOutWarehouseTask.getMoveTaskNo())
+                        .eq("delete_flag", "0"));
+                if (!CollectionUtils.isEmpty(inOutWarehouseTaskList1)) {
+                    for (InOutWarehouseTask inoutwarehouse : inOutWarehouseTaskList1) {
+                        if (StringUtils.isEmpty(stockReturnCount)) {
+                            stockReturnCount = "0";
+                        }
+                        stockReturnCount = String.valueOf(Float.valueOf(stockReturnCount) + inoutwarehouse.getWeight());
                     }
-                    stockReturnCount = String.valueOf(Float.valueOf(stockReturnCount) + inoutwarehouse.getWeight());
                 }
-            });
+                inOutWarehouseTask.setStockReturnCount(stockReturnCount);
+            }
         }
         return inOutWarehouseTaskList;
     }