移库任务，列表，详情

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/InOutWarehouseTaskController.java

@@ -88,5 +88,25 @@ public class InOutWarehouseTaskController {
     public String editStatus(@RequestBody InOutWarehouseTask inOutWarehouseTask){
         return inOutWarehouseTaskService.editStatus(inOutWarehouseTask.getId());
     }
+
+    /**
+     * 移库任务列表
+     * @param sendWarehouse,receiveWarehouse,moveTaskNo
+     * @return
+     */
+    @GetMapping("/selectInOutWarehouseTaskRelocation")
+    public List<InOutWarehouseTask> selectInOutWarehouseTaskRelocation(String sendWarehouse,String receiveWarehouse,String moveTaskNo) {
+        return inOutWarehouseTaskService.selectInOutWarehouseTaskRelocation(sendWarehouse,receiveWarehouse,moveTaskNo);
+    }
+
+    /**
+     * 查看移库任务详情
+     * @param moveTaskNo
+     * @return
+     */
+    @GetMapping("/getInOutWarehouseTaskRelocation")
+    public List<InOutWarehouseTask> getInOutWarehouseTaskRelocation(String moveTaskNo){
+        return inOutWarehouseTaskService.getInOutWarehouseTaskRelocation(moveTaskNo);
+    }
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/InOutWarehouseTask.java

@@ -200,6 +200,12 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
     @TableField(exist = false)
     private String searchKeyWord;
 
+    /**
+     * 累计退库量（吨）
+     */
+    @TableField(exist = false)
+    private String stockReturnCount;
+
     /**
      *查询类型
      */
@@ -222,6 +228,14 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
         public static final String DELETE_FLAG = "delete_flag";
 
         public static final String relevanceId = "relevance_id";
+        public static final String TASK_TYPE_KEY = "task_type_key";
+
+        public static final String SEND_WAREHOUSE = "send_warehouse";
+
+        public static final String RECEIVE_WAREHOUSE = "receive_warehouse";
+
+        public static final String APPROVE_STATUS = "approve_status";
+
 
 
     }

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

@@ -58,4 +58,18 @@ public interface IInOutWarehouseTaskService extends IService<InOutWarehouseTask>
      * @return
      */
     String editStatus(String id);
+
+    /**
+     * 移库任务列表
+     * @param sendWarehouse,receiveWarehouse,moveTaskNo
+     * @return
+     */
+    List<InOutWarehouseTask> selectInOutWarehouseTaskRelocation(String sendWarehouse,String receiveWarehouse,String moveTaskNo);
+
+    /**
+     * 查看移库任务详情
+     * @param moveTaskNo
+     * @return
+     */
+    List<InOutWarehouseTask> getInOutWarehouseTaskRelocation(String moveTaskNo);
 }

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

@@ -123,8 +123,11 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 warehouseInOutInfo.setBaseId(warehouseBaseInfo.getId());
                 warehouseInOutInfo.setStatus(StatusEnum.SUBMITTED.getName());
                 warehouseInOutInfo.setWarehouseName(contractManagementInfo.getContractNo());
+                warehouseInOutInfo.setStatusFlag("3");
                 warehouseInOutInfo.setInOutFlag(NumberConstant.CONSTANT2);
                 warehouseInOutInfo.setNetWeight(contractManagementInfo.getFinalTradingVolume());
+                warehouseInOutInfo.setGoodsName(contractGoodsInfo.getGoodsName());
+                warehouseInOutInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
                 warehouseInOutInfo.setInOutType(NumberConstant.PURCHASE_WAREHOUSING);
                 warehouseInOutInfo.setBackOfficeId(contractManagementInfo.getCreateUserId());
                 warehouseInOutInfo.setBackOffice(AuthSecurityUtils.getStaffById(contractManagementInfo.getCreateUserId()).getStaffName());

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

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
@@ -10,6 +11,10 @@ import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutDetail;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseNumView;
 import com.yh.saas.plugin.yiliangyiyun.mapper.InOutWarehouseTaskMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IInOutWarehouseTaskService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -29,9 +34,8 @@ import java.util.*;
  */
 @Service
 public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTaskMapper, InOutWarehouseTask> implements IInOutWarehouseTaskService {
-
     @Autowired
-    private IInOutWarehouseTaskService inOutWarehouseTaskService;
+     private IInOutWarehouseTaskService inOutWarehouseTaskService;
     @Autowired
     private ICommonBillOperateHisService billOperateHisService;
 
@@ -180,4 +184,91 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
         return "NG";
     }
 
+    /**
+     * 移库任务列表
+     *
+     * @param sendWarehouse,receiveWarehouse,moveTaskNo
+     * @return
+     */
+    @Override
+    public List<InOutWarehouseTask> selectInOutWarehouseTaskRelocation(String sendWarehouse,String receiveWarehouse,String moveTaskNo) {
+        //查询页面信息
+        Wrapper<InOutWarehouseTask> inOutWarehouseTaskWrapper = new EntityWrapper<>();
+        inOutWarehouseTaskWrapper.eq(InOutWarehouseTask.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
+                .eq(InOutWarehouseTask.QueryFiles.TASK_TYPE_KEY, NumberConstant.CONSTANT3)
+                .eq(InOutWarehouseTask.QueryFiles.APPROVE_STATUS,NumberConstant.CONSTANT0)
+                .orderBy("establish_date", false);
+        if (!StringUtils.isEmpty(sendWarehouse)) {
+            inOutWarehouseTaskWrapper.like(InOutWarehouseTask.QueryFiles.SEND_WAREHOUSE, "%" + sendWarehouse + "%");
+        }
+        if (!StringUtils.isEmpty(receiveWarehouse)) {
+            inOutWarehouseTaskWrapper.like(InOutWarehouseTask.QueryFiles.RECEIVE_WAREHOUSE,"%" + receiveWarehouse + "%");
+        }
+        if (!StringUtils.isEmpty(moveTaskNo)) {
+            inOutWarehouseTaskWrapper.like(InOutWarehouseTask.QueryFiles.MOVE_TASK_NO, "%" + moveTaskNo + "%");
+        }
+        //查询所有移库任务
+        List<InOutWarehouseTask> inOutWarehouseTaskAllList = this.selectList(inOutWarehouseTaskWrapper);
+        if(!CollectionUtils.isEmpty(inOutWarehouseTaskAllList)){
+            for(InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskAllList){
+
+                //定义累计退库量
+                String stockReturnCount = "";
+
+                //查询退库量
+                List<InOutWarehouseTask> inOutWarehouseTaskList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
+                        .eq("task_type_key","4")
+                        .eq("contract_no",inOutWarehouseTask.getContractNo().equals(inOutWarehouseTask.getMoveTaskNo()))
+                        .eq("in_out_flag","2").orderBy("send_warehouse_name").groupBy("send_warehouse_name"));
+                if(!CollectionUtils.isEmpty(inOutWarehouseTaskList)){
+                    Float stockReturn = 0f;
+                    for(InOutWarehouseTask inoutwarehouse :inOutWarehouseTaskList){
+                        stockReturn = stockReturn + inoutwarehouse.getStockReturn();
+                    }
+                    inOutWarehouseTask.setReceiveWarehouse(inOutWarehouseTaskList.get(0).getReceiveWarehouse());
+                    inOutWarehouseTask.setStockReturnCount(String.valueOf(stockReturn));
+                    if(StringUtils.isEmpty(stockReturnCount)){
+                        stockReturnCount = "0";
+                    }
+                    stockReturnCount = String.valueOf(Float.valueOf(stockReturnCount)+stockReturn);
+                }
+
+                for (InOutWarehouseTask inOutWarehouseTask1 : inOutWarehouseTaskAllList) {
+                    if (inOutWarehouseTask1.getReceiveWarehouse().equals(inOutWarehouseTask.getReceiveWarehouse())) {
+                        inOutWarehouseTask1.setStockReturnCount(stockReturnCount);
+                    }
+
+                }
+
+            }
+        }
+
+        return inOutWarehouseTaskAllList;
+    }
+
+    /**
+     * 查看移库任务
+     * @param moveTaskNo
+     * @return
+     */
+    @Override
+    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 -> {
+                 List<InOutWarehouseTask> inOutWarehouseTaskList1 = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
+                    .eq("task_type_key","4")
+                    .eq("in_out_flag","2")
+                    .eq("contract_no",inOutWarehouseTask.getContractNo().equals(inOutWarehouseTask.getMoveTaskNo())));
+            //累计退库量
+            String stockReturnCount = "";
+            for(InOutWarehouseTask inOutWarehouseTask1 : inOutWarehouseTaskList1){
+                stockReturnCount = stockReturnCount + inOutWarehouseTask1.getStockReturnCount();
+            }
+                inOutWarehouseTask.setStockReturnCount(stockReturnCount);
+            });
+        }
+        return inOutWarehouseTaskList;
+    }
 }