提供确认退货接口和修改退货的相关状态

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

@@ -15,6 +15,7 @@ import com.starcharge.wios.dao.entity.Reject;
 import com.starcharge.wios.dao.mappers.DeliveryMapper;
 import com.starcharge.wios.dao.mappers.RejectMapper;
 import com.starcharge.wios.dto.DeliveryUpdateDTO;
+import com.starcharge.wios.enums2.LogisticStatus;
 import com.starcharge.wios.enums2.TauxiliarymaterialStatusEnum;
 import com.starcharge.wios.service.CommonUpdateService;
 import com.starcharge.wios.service.SnowFlakeService;
@@ -136,11 +137,10 @@ public class RejectController {
         Map<String, String> params = new HashMap<String, String>();
         params.put("warehouseId",before.getArrivalWarehouseId());
         params.put("materialsCode",before.getMaterialCode());
-        String jsonStr = HttpClientUtils.post(url, params, "UTF-8", "UTF-8");
-        System.out.println("外联数据"+jsonStr);
+        String jsonStr = HttpClientUtils.post(url,params,"UTF-8", "UTF-8");
         JSONObject jsonObject=JSONObject.parseObject(jsonStr);
         String code=jsonObject.getString("code");
-        if (StringUtil.isNullOrEmpty(code) || !"200".equals(code)){
+        if (StringUtil.isNullOrEmpty(code)){
             throw new ServiceException("库存恢复失败");
         }
         deliveryUpdateDTO.setLogisticStatus("退货已申请");

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

@@ -69,7 +69,7 @@ public class TauxiliarymaterialsController {
         SessionInfo sessionInfo = tokenService.getUser();
         var tauxiliarymaterials=TauxiliarymaterialsConvert.INSTANCE.convertListVo(tauxiliarymaterialsVo);
         var now=LocalDateTime.now();
-        tauxiliarymaterials.setApplyStatus(TauxiliarymaterialStatusEnum.已申请.name());
+        tauxiliarymaterials.setApplyStatus(TauxiliarymaterialStatusEnum.退货已申请.name());
         tauxiliarymaterials.setLogisticStatus(TauxiliarymaterialStatusEnum.未发货.name());
         tauxiliarymaterials.setReceivingStatus(TauxiliarymaterialStatusEnum.未收货.name());
         tauxiliarymaterials.setApplyTime(now);
@@ -246,7 +246,7 @@ public class TauxiliarymaterialsController {
         TauxiliarymaterialsCriteria criteria=new TauxiliarymaterialsCriteria();
         criteria.createCriteria().andApplyTimeGreaterThanOrEqualTo(LocalDateTime.now().minusMonths(3))
                 .andMaterialCodeEqualTo(materialCode)
-                .andApplyStatusEqualTo(TauxiliarymaterialStatusEnum.已通过.name());
+                .andApplyStatusEqualTo(TauxiliarymaterialStatusEnum.退货已通过.name());
         return new BaseResponse<>(this.tauxiliarymaterialsMapper.selectByExample(criteria));
     }
     @GetMapping("/getRecentHasChecked")

src/main/java/com/starcharge/wios/enums2/TauxiliarymaterialStatusEnum.java

@@ -14,7 +14,7 @@ import java.util.stream.Collectors;
  * @CreateDate: 2023/9/2515:49
  */
 public enum TauxiliarymaterialStatusEnum {
-    已申请(0,1),已驳回(0,2),已通过(0,3),已关闭(0,4),
+    退货已申请(0,1),退货已驳回(0,2),退货已通过(0,3),退货完成(0,4),
     未发货(1,1),已发货(1,1),
     未收货(2,1), 已收货(2,1);