退货，收货，发货的状态优化

src/main/java/com/starcharge/wios/controller/DeliveryController.java

@@ -92,7 +92,7 @@ public class DeliveryController {
     @PostMapping("/query")
     @ApiOperation(value = "发货列表查询")
     public BaseResponse<List<Delivery>> queryDelivery(Delivery delivery){
-        List<String> list= Arrays.asList("已发货");
+        List<String> list= Arrays.asList("已发货","已收货","退货已申请","退货已驳回","退货已通过","退货完成");
         delivery.setLogisticStatusList(list);
         return new BaseResponse(this.deliveryMapper.selectDeliveryList(delivery));
     }

src/main/java/com/starcharge/wios/controller/RejectController.java

@@ -3,6 +3,9 @@ package com.starcharge.wios.controller;
 import com.ihidea.component.api.v2.BaseResponse;
 import com.ihidea.core.support.exception.ServiceException;
 import com.ihidea.core.support.session.SessionInfo;
+import com.ihidea.core.util.HttpClientUtils;
+import com.starcharge.warehouse.query.MaterialsQuery;
+import com.starcharge.wios.auth.filter.LoginFilter;
 import com.starcharge.wios.auth.service.TokenService;
 import com.starcharge.wios.convert.RejectConvert;
 import com.starcharge.wios.dao.entity.Delivery;
@@ -14,6 +17,7 @@ import com.starcharge.wios.enums2.TauxiliarymaterialStatusEnum;
 import com.starcharge.wios.service.CommonUpdateService;
 import com.starcharge.wios.service.SnowFlakeService;
 import com.starcharge.wios.utils.ExcelUtils;
+import com.starcharge.wios.utils.SpringContextUtil;
 import com.starcharge.wios.validation.CreateEntityGroup;
 import com.starcharge.wios.validation.ParamsValidate;
 import com.starcharge.wios.validation.UpdateEntityGroup;
@@ -25,17 +29,20 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.var;
+import org.apache.http.Header;
+import org.apache.http.HeaderElement;
+import org.apache.http.HttpHeaders;
+import org.apache.http.ParseException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * @projectName:xr-wios
@@ -82,7 +89,7 @@ public class RejectController {
     @PostMapping("/query")
     @ApiOperation(value = "退货列表查询")
     public BaseResponse<List<Delivery>> queryReject(Delivery Delivery){
-        List<String> list= Arrays.asList("已申请","已驳回","已通过","已关闭");
+        List<String> list= Arrays.asList("退货已申请","退货已驳回","退货已通过","退货完成");
         Delivery.setLogisticStatusList(list);
         return new BaseResponse(this.deliveryMapper.selectDeliveryList(Delivery));
     }
@@ -113,6 +120,21 @@ public class RejectController {
         this.commonUpdateService.UpdateColumns(deliveryUpdateDTO,false);
         return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO));
     }
+    @PostMapping("/confirmReject")
+    @ApiOperation("确认退货接口")
+    @ParamsValidate
+    public BaseResponse<DeliveryUpdateDTO> confirmReject(@RequestBody @Validated(UpdateEntityGroup.class) DeliveryUpdateDTO deliveryUpdateDTO, BindingResult bindingResult){
+        //var data=RejectConvert.INSTANCE.convertAddVo(rejectAddVo);   HttpServletRequest
+        Delivery before=this.deliveryMapper.selectByPrimaryKey(deliveryUpdateDTO.getId());
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("warehouseId",before.getArrivalWarehouseId());
+        params.put("materialsCode",before.getMaterialCode());
+        String token = SpringContextUtil.getToken();
+        String jsonStr = HttpClientUtils.post("http://192.168.1.106:9061/api/api/reject/restoreInventoryQuantity", params, "UTF-8","UTF-8");
+        System.out.println("获取分支的数据"+jsonStr);
+        this.commonUpdateService.UpdateColumns(deliveryUpdateDTO,false);
+        return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO));
+    }
 
     /*@PostMapping("/export")
     @ApiOperation(value = "导出退货单列表")