update

游杰
1 parent 2552fae6
Showing 2 changed files with 9 additions and 79 deletions
src/main/java/com/huaheng/pc/config/address/domain/Address.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -44,6 +44,7 @@ public class Address implements Serializable {
     /**
     @TableField(value = "param")
     @ApiModelProperty(value="参数")
+     */
     private String param;
     /**
@@ -84,4 +85,12 @@ public class Address implements Serializable {
     public void setUrl(String url) {
         this.url = url;
     }
+
+    public Integer getArea() {
+        return area;
+    }
+
+    public void setArea(Integer area) {
+        this.area = area;
+    }
 }
 \ No newline at end of file
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.api.wcs.domain.WcsTask;
 import com.huaheng.api.wcs.service.taskAssignService.TaskAssignService;
-import com.huaheng.api.wcs.service.taskAssignService.TaskAssignServiceImpl;
 import com.huaheng.common.constant.HttpConstant;
 import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.common.exception.service.ServiceException;
@@ -18,56 +17,37 @@ import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.service.ConfigService;
 import com.huaheng.pc.config.address.service.AddressService;
-import com.huaheng.pc.config.configValue.domain.ConfigValue;
-import com.huaheng.pc.config.configValue.service.ConfigValueService;
-import com.huaheng.pc.config.configWarning.service.ConfigWarningService;
 import com.huaheng.pc.config.container.domain.Container;
 import com.huaheng.pc.config.container.service.ContainerService;
-import com.huaheng.pc.config.containerCapacity.service.ContainerCapacityService;
 import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference;
 import com.huaheng.pc.config.cycleCountPreference.service.CycleCountPreferenceService;
 import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.service.LocationService;
 import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
 import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService;
-import com.huaheng.pc.inventory.cycleCountHeader.service.CycleCountHeaderService;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
-import com.huaheng.pc.inventory.inventoryTransaction.service.InventoryTransactionService;
 import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
 import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
 import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
 import com.huaheng.pc.receipt.receiptContainerHeader.service.ReceiptContainerHeaderService;
-import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
-import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
 import com.huaheng.pc.receipt.receiving.service.ReceivingService;
-import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService;
 import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader;
 import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
-import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
-import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
 import com.huaheng.pc.task.taskHeader.domain.MobileTask;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.BasicResponseHandler;
-import org.apache.http.impl.client.DefaultHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.stream.Collectors;
 @Service
@@ -117,7 +97,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     private ConfigService configService;
-
     @Override
     public List<TaskHeader> getTasksStatus(Short lastStatus) {
         return taskHeaderMapper.getTasksStatus(lastStatus);
@@ -143,7 +122,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     public List<TaskHeader> preferenceRealize(List<TaskHeader> taskHeaderList) {
         //盘点任务头，默认不显示库位，容器。
         List<TaskHeader> taskHeaders = new ArrayList<>();
-        for (TaskHeader item:taskHeaderList){
         for (TaskHeader item : taskHeaderList) {
             //盘点明细
             CycleCountDetail cycleCountDetailtemp = new CycleCountDetail();
@@ -152,7 +130,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             cycleCountDetailtemp.setId(item.getAllocationHeadId());  //明细ID
             LambdaQueryWrapper<CycleCountDetail> detailLambdaQueryWrapper = Wrappers.lambdaQuery(cycleCountDetailtemp);
             CycleCountDetail cycleCountDetail = cycleCountDetailService.getOne(detailLambdaQueryWrapper);
-            if(StringUtils.isNull(cycleCountDetail)){
             if (StringUtils.isNull(cycleCountDetail)) {
                 throw new SecurityException("没有找到子任务对应的盘点明细！");
             }
@@ -162,18 +139,15 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             cycleCountPreferenceTemp.setWarehouseCode(cycleCountDetail.getWarehouseCode());
             LambdaQueryWrapper<CycleCountPreference> preferenceLambdaQueryWrapper = Wrappers.lambdaQuery(cycleCountPreferenceTemp);
             CycleCountPreference cycleCountPreference = cycleCountPreferenceService.getOne(preferenceLambdaQueryWrapper);
-            if(StringUtils.isNull(cycleCountPreference)){
             if (StringUtils.isNull(cycleCountPreference)) {
                 throw new SecurityException("没有找到盘点首选项！");
             }
             //根据首选项判断数据
-            if(!cycleCountPreference.getPromptLocation()){
             if (!cycleCountPreference.getPromptLocation()) {
                 //库位
                 item.setFromLocation("");
                 item.setToLocation("");
             }
-            if(!cycleCountPreference.getPromptLpn()){
             if (!cycleCountPreference.getPromptLpn()) {
                 //容器
                 item.setContainerCode("");
@@ -205,7 +179,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             LambdaQueryWrapper<TaskDetail> td = Wrappers.lambdaQuery(taskDetail1);
             List<TaskDetail> taskDetailList = taskDetailService.list(td);
             TaskDetail taskDetail = null;
-            if(taskDetailList != null && taskDetailList.size() > 0) {
             if (taskDetailList != null && taskDetailList.size() > 0) {
                 taskDetail = taskDetailList.get(0);
                 if (taskDetail == null) {
@@ -250,7 +223,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                     LambdaQueryWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
                     receiptContainerDetailLambdaQueryWrapper.eq(ReceiptContainerDetail::getReceiptContainerId, receiptContainerHeader.getId());
                     List<ReceiptContainerDetail> receiptContainerDetailList = receiptContainerDetailService.list(receiptContainerDetailLambdaQueryWrapper);
-                    for(ReceiptContainerDetail receiptContainerDetail : receiptContainerDetailList) {
                     for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetailList) {
                         LambdaQueryWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaQueryWrapper1 = Wrappers.lambdaQuery();
                         receiptContainerDetailLambdaQueryWrapper1.eq(ReceiptContainerDetail::getId, receiptContainerDetail.getId());
@@ -303,8 +275,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         InventoryHeader inventoryHeader = inventoryHeaderService.getOne(inventoryHeaderLambdaQueryWrapper);
         Container container = new Container();
         container.setStatus(QuantityConstant.STATUS_CONTAINER_EMPTY);
-        if(inventoryHeader != null) {
-            if(QuantityConstant.STATUS_CONTAINER_SOME.equals(inventoryHeader.getContainerStatus())) {
         if (inventoryHeader != null) {
             if (QuantityConstant.STATUS_CONTAINER_SOME.equals(inventoryHeader.getContainerStatus())) {
                 container.setStatus(QuantityConstant.STATUS_CONTAINER_SOME);
@@ -333,7 +303,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             String value = configService.getKey(QuantityConstant.RULE_CONNECT_WCS);
             int connectWCS = Integer.parseInt(value);
-            if(connectWCS == QuantityConstant.RULE_WCS_CONNECT) {
             if (connectWCS == QuantityConstant.RULE_WCS_CONNECT) {
                 // 给wcs传递任务
                 AjaxResult ajaxResult = taskAssignService.wcsTaskAssign(task);
@@ -364,7 +333,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                     cycleCountDetailService.updataDetailStatus(item.getBillDetailId(), QuantityConstant.CYCLECOUNT_STATUS_EXECUTING);
                 }
             }
-            if(taskDetails != null && taskDetails.size() > 0) {
             if (taskDetails != null && taskDetails.size() > 0) {
                 if (!taskDetailService.saveOrUpdateBatch(taskDetails)) {
                     throw new ServiceException("更新任务明细失败");
@@ -380,7 +348,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult completeTaskByWMS(Integer[] taskIds, String[] weightConvert) {
-        for (int i = 0;i<taskIds.length;i++) {
         for (int i = 0; i < taskIds.length; i++) {
             TaskHeader task = taskHeaderService.getById(taskIds[i]);
@@ -400,13 +367,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             }
             //整盘入库,空托入库库位自动分配
             //整盘入库手动完成分配库位，已分配则略过
-            if(task.getTaskType().equals(QuantityConstant.TASK_TYPE_WHOLERECEIPT) || task.getTaskType().equals(QuantityConstant.TASK_TYPE_EMPTYRECEIPT)){
-                if(StringUtils.isEmpty(task.getToLocation())){
             if (task.getTaskType().equals(QuantityConstant.TASK_TYPE_WHOLERECEIPT) || task.getTaskType().equals(QuantityConstant.TASK_TYPE_EMPTYRECEIPT)) {
                 if (StringUtils.isEmpty(task.getToLocation())) {
                     //自动分配库位
-                  AjaxResult ajaxResult = this.setLocationCode(task.getId(),0 );
-                  task.setToLocation((String)ajaxResult.getData());
                     AjaxResult ajaxResult = this.setLocationCode(task.getId(), 0);
                     task.setToLocation((String) ajaxResult.getData());
                 }
@@ -429,7 +392,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     public void completeTask(TaskHeader task) {
         int taskType = task.getTaskType().intValue();
         //区分任务类型
-        switch(taskType) {
         switch (taskType) {
             //整盘入库、补充入库
             case QuantityConstant.TASK_TYPE_WHOLERECEIPT:
@@ -481,15 +443,12 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         List<TaskHeader> list = this.list(taskQueryWrapper);
         if (list.isEmpty()) {
             throw new ServiceException("库位(" + locationCode + ")没有任务！");
-        } else if(list.get(0).getStatus().equals(QuantityConstant.TASK_STATUS_COMPLETED)) {
         } else if (list.get(0).getStatus().equals(QuantityConstant.TASK_STATUS_COMPLETED)) {
             //如果已完成则不管
             throw new ServiceException("库位(" + locationCode + ")任务已经完成！");
         }
         TaskHeader taskHeader = list.get(0);
         int taskType = taskHeader.getTaskType().intValue();
-        if(taskType == QuantityConstant.TASK_TYPE_WHOLERECEIPT
-                || taskType == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT){
         if (taskType == QuantityConstant.TASK_TYPE_WHOLERECEIPT
                 || taskType == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT) {
             //入库任务
@@ -510,7 +469,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         if (receiptContainerHeaderList.isEmpty()) {
             throw new ServiceException("该容器没有任务！");
         }
-        if (receiptContainerHeaderList.size() > 1){
         if (receiptContainerHeaderList.size() > 1) {
             throw new ServiceException("该容器存在多条任务");
         }
@@ -521,7 +479,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         lambdaQueryWrapper.eq(ReceiptContainerDetail::getReceiptContainerId, receiptContainerHeaderList.get(0).getId());
         List<ReceiptContainerDetail> containerDetailList = receiptContainerDetailService.list(lambdaQueryWrapper);
         ReceiptContainerHeader containerHeader = receiptContainerHeaderList.get(0);
-        if (containerDetailList.isEmpty()){
         if (containerDetailList.isEmpty()) {
             throw new ServiceException("没有组盘明细，请先组盘！");
         }
@@ -600,12 +557,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         }
         if (receiptContainerHeader.getStatus() == QuantityConstant.RECEIPT_HEADER_BUILD.shortValue()) {
             String ids = String.valueOf(receiptContainerHeader.getId());
-            if (StringUtils.isEmpty(ids)){
             if (StringUtils.isEmpty(ids)) {
                 return AjaxResult.error("id不能为空");
             }
             List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
-            if (StringUtils.isEmpty(ids)){
             if (StringUtils.isEmpty(ids)) {
                 return AjaxResult.error("id不能为空");
             }
@@ -622,8 +577,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     }
-
-
     @Transactional(rollbackFor = Exception.class)
     public void combineInventory(TaskHeader task) {
         LambdaQueryWrapper<InventoryHeader> inventoryHeaderErapper = Wrappers.lambdaQuery();
@@ -631,20 +584,16 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 .eq(InventoryHeader::getLocationCode, task.getToLocation())
                 .eq(InventoryHeader::getContainerCode, task.getContainerCode());
         InventoryHeader header = inventoryHeaderService.getOne(inventoryHeaderErapper);
-        if(header != null) {
         if (header != null) {
             LambdaQueryWrapper<InventoryDetail> inventory = Wrappers.lambdaQuery();
             inventory.eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
                     .eq(InventoryDetail::getLocationCode, task.getToLocation())
                     .eq(InventoryDetail::getContainerCode, task.getContainerCode());
             List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventory);
-            for(int i=0; i < inventoryDetailList.size() -1; i++) {
-                for(int j = inventoryDetailList.size() - 1; j > i; j--) {
             for (int i = 0; i < inventoryDetailList.size() - 1; i++) {
                 for (int j = inventoryDetailList.size() - 1; j > i; j--) {
                     InventoryDetail inventoryDetail = inventoryDetailList.get(i);
                     InventoryDetail inventoryDetail2 = inventoryDetailList.get(j);
-                    if(inventoryDetail.getMaterialCode().equals(inventoryDetail2.getMaterialCode())
                     if (inventoryDetail.getMaterialCode().equals(inventoryDetail2.getMaterialCode())
                             && inventoryDetail.getBatch().equals(inventoryDetail2.getBatch())
                             && inventoryDetail.getLot().equals(inventoryDetail2.getLot())
@@ -663,7 +612,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             }
             BigDecimal totalQty = new BigDecimal(0);
             int totalLines = 0;
-            for(InventoryDetail inventoryDetail : inventoryDetailList) {
             for (InventoryDetail inventoryDetail : inventoryDetailList) {
                 totalQty = totalQty.add(inventoryDetail.getQty());
                 totalLines++;
@@ -706,16 +654,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     /**
      * 自动空托出库
-     * */
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult createAutoEmptyOut(String warehouseCode){
     public AjaxResult createAutoEmptyOut(String warehouseCode) {
         /*先查询容器表，选中空托盘，再查询库存核实*/
         //该容器中有库位信息，并且状态是空
         List<Location> locationsList = locationService.selectContainerEmpty(warehouseCode);
-        if(locationsList.size() == 0){
         if (locationsList.size() == 0) {
             throw new ServiceException("立库中没有空容器！");
         }
@@ -727,20 +672,16 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         containerTmp.setCode(location.getContainerCode());
         LambdaQueryWrapper<Container> containerLambda = Wrappers.lambdaQuery(containerTmp);
         Container container = containerService.getOne(containerLambda);
-        if(container == null){
         if (container == null) {
             throw new ServiceException("选中的库位容器错误，请确认库位和容器！");
         }
         //生成空容器出库任务
         inventoryHeaderService.createEmptyOut(container.getCode(), location.getCode());
-        return AjaxResult.success("空容器出库任务已下发!",container.getCode());
         return AjaxResult.success("空容器出库任务已下发!", container.getCode());
     }
     /**
      * 自动分配库位
-     * @param taskId  任务号
-     * @param high 1是高库位，否则低库位
      *
      * @param taskId 任务号
      * @param high   1是高库位，否则低库位
@@ -748,11 +689,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult setLocationCode(Integer taskId, Integer high)    {
     public AjaxResult setLocationCode(Integer taskId, Integer high) {
         TaskHeader taskHeader = this.getById(taskId);
         if (taskHeader == null) {
-            throw new ServiceException("找不到id为"+ taskId +"的任务！");
             throw new ServiceException("找不到id为" + taskId + "的任务！");
         }
         if (StringUtils.isNotEmpty(taskHeader.getToLocation())) {
@@ -760,10 +699,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         }
         LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
-        locationLambdaQueryWrapper.eq(Location::getWarehouseCode,ShiroUtils.getWarehouseCode())
-                .eq(Location::getContainerCode,"")
-                .eq(Location::getStatus,QuantityConstant.STATUS_LOCATION_EMPTY)
-                .eq(Location::getDeleted,false);
         locationLambdaQueryWrapper.eq(Location::getWarehouseCode, ShiroUtils.getWarehouseCode())
                 .eq(Location::getContainerCode, "")
                 .eq(Location::getStatus, QuantityConstant.STATUS_LOCATION_EMPTY)
@@ -784,7 +719,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         //给组盘分配库位
         int internalTaskType = taskHeader.getInternalTaskType();
-        if(internalTaskType == QuantityConstant.TASK_TYPE_WHOLERECEIPT || internalTaskType == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT) {
         if (internalTaskType == QuantityConstant.TASK_TYPE_WHOLERECEIPT || internalTaskType == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT) {
             ReceiptContainerHeader receiptContainerHeader = new ReceiptContainerHeader();
             receiptContainerHeader.setId(taskHeader.getAllocationHeadId());
@@ -797,8 +731,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             condition.setTaskId(taskHeader.getId());
             LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery(condition);
             List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
-            if(taskDetailList != null && taskDetailList.size() > 0) {
-                for(TaskDetail taskDetail : taskDetailList) {
             if (taskDetailList != null && taskDetailList.size() > 0) {
                 for (TaskDetail taskDetail : taskDetailList) {
                     if (taskDetail != null) {
@@ -812,7 +744,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         taskHeader.setToLocation(location.getCode());
         LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(taskHeader);
         this.update(taskHeader, taskHeaderLambdaQueryWrapper);
-        return AjaxResult.success("生成库位成功",location.getCode());
         return AjaxResult.success("生成库位成功", location.getCode());
     }
@@ -820,24 +751,19 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     @Override
     public int getUncompleteTaskInNear(Location location) {
         Location location1 = locationService.getNear(location);
-        if(location1 == null) {
-            return  0;
         if (location1 == null) {
             return 0;
         }
         String locationCode = location1.getCode();
         LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
         taskHeaderLambdaQueryWrapper.eq(TaskHeader::getToLocation, locationCode)
-                                    .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
                 .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
         List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
-        if(taskHeaderList == null || taskHeaderList.size() == 0) {
         if (taskHeaderList == null || taskHeaderList.size() == 0) {
             taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
             taskHeaderLambdaQueryWrapper.eq(TaskHeader::getFromLocation, locationCode)
                     .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
             taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
-            if(taskHeaderList == null || taskHeaderList.size() == 0) {
             if (taskHeaderList == null || taskHeaderList.size() == 0) {
                 return 0;
             }
@@ -846,18 +772,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     }
     @Override
-    public List<TaskHeader> remoteList(){
     public List<TaskHeader> remoteList() {
         LambdaQueryWrapper<TaskHeader> wrapper = Wrappers.lambdaQuery();
-        wrapper.ge(TaskHeader::getStatus,QuantityConstant.TASK_STATUS_RELEASE)
-                .lt(TaskHeader::getStatus,QuantityConstant.TASK_STATUS_COMPLETED);
         wrapper.ge(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_RELEASE)
                 .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
         return list(wrapper);
     }
-
-
     @Override
     public List<TaskHeader> getUnCompleteTaskList()  {
         LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();