墙盒、辅材发货单导入增加申请单状态验证；去除无用数据

src/main/java/com/starcharge/wios/Import/impl/AuxiliaryMaterialDeliveryImport.java

@@ -2,10 +2,14 @@ package com.starcharge.wios.Import.impl;
 
 import com.starcharge.wios.Import.Import;
 import com.starcharge.wios.dao.entity.Order;
+import com.starcharge.wios.dao.entity.Tauxiliarymaterials;
 import com.starcharge.wios.dao.mappers.OrderMapper;
+import com.starcharge.wios.dao.mappers.TauxiliarymaterialsMapper;
 import com.starcharge.wios.enums2.ProductType;
+import com.starcharge.wios.enums2.TauxiliarymaterialStatusEnum;
 import com.starcharge.wios.validation.CreateEntityGroup;
 import com.starcharge.wios.vo.DeliveryAddVo;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,9 +35,14 @@ public class AuxiliaryMaterialDeliveryImport implements Import {
     private Validator validator;
     @Autowired
     private OrderMapper orderMapper;
+    @Autowired
+    private TauxiliarymaterialsMapper tauxiliarymaterialsMapper;
 
     @Override
     public List<?> handle(List<Object> list) {
+        for(int i=list.size()-1;i>2;i--){
+            list.remove(i);
+        }
 //        List<String> headList = (List<String>)list.get(0);
         for(int i=1;i<list.size();i++){
             List<String> rowdata = (List<String>)list.get(i);
@@ -57,6 +66,15 @@ public class AuxiliaryMaterialDeliveryImport implements Import {
                 rowdata.add(sets.stream().map(ConstraintViolation::getMessage).reduce("error:",(s1,s2)->s1+";"+s2));
                 continue;
             }
+            Tauxiliarymaterials tauxiliarymaterialsquery=new Tauxiliarymaterials();
+            tauxiliarymaterialsquery.setInstallOrder(deliveryAddVo.getInstallOrder());
+            tauxiliarymaterialsquery.setApplyStatus(TauxiliarymaterialStatusEnum.已通过.name());
+            List<Tauxiliarymaterials> tauxiliarymaterials=this.tauxiliarymaterialsMapper.selectTAuxiliaryMaterialsList(tauxiliarymaterialsquery);
+            if(CollectionUtils.isEmpty(tauxiliarymaterials)){
+                rowdata.add("error:找不到已审批通过辅材申请单");
+            }else if(tauxiliarymaterials.stream().noneMatch(t->TauxiliarymaterialStatusEnum.未发货.name().equals(t.getLogisticStatus()))){
+                rowdata.add("error:找不到已审批且未发货的辅材申请单");
+            }
         }
         return list;
     }

src/main/java/com/starcharge/wios/Import/impl/DeliveryImport.java

@@ -3,15 +3,20 @@ package com.starcharge.wios.Import.impl;
 import com.starcharge.wios.Import.Import;
 import com.starcharge.wios.convert.DeliveryConvert;
 import com.starcharge.wios.dao.entity.Order;
+import com.starcharge.wios.dao.entity.WallboxApply;
 import com.starcharge.wios.dao.mappers.OrderMapper;
+import com.starcharge.wios.dao.mappers.WallboxApplyMapper;
 import com.starcharge.wios.dto.WarehouseDTO2;
 import com.starcharge.wios.dto.WarehouseQuery2;
 import com.starcharge.wios.enums2.ProductType;
 import com.starcharge.wios.service.WarehouseService;
 import com.starcharge.wios.validation.CreateEntityGroup;
 import com.starcharge.wios.vo.DeliveryAddVo;
+import com.starcharge.wios.vo.WallboxApplyInstallListVO;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import javax.validation.ConstraintViolation;
 import javax.validation.Validator;
@@ -36,10 +41,16 @@ public class DeliveryImport implements Import {
     private Validator validator;
     @Autowired
     private OrderMapper orderMapper;
-
+    @Autowired
+    private WallboxApplyMapper wallboxApplyMapper;
     @Override
     public List<?> handle(List<Object> list) {
 //        List<String> headList = (List<String>)list.get(0);
+
+        for(int i=list.size()-1;i>2;i--){
+            list.remove(i);
+        }
+
         for(int i=1;i<list.size();i++){
             List<String> rowdata = (List<String>)list.get(i);
             DeliveryAddVo deliveryAddVo=new DeliveryAddVo();
@@ -59,7 +70,15 @@ public class DeliveryImport implements Import {
                 rowdata.add(sets.stream().map(ConstraintViolation::getMessage).reduce("error:",(s1,s2)->s1+";"+s2));
                 continue;
             }
-
+            WallboxApply wallboxApplyquery=new WallboxApply();
+            wallboxApplyquery.setOrderId(deliveryAddVo.getInstallOrder());
+            wallboxApplyquery.setCheckStatus(2l);
+            List<WallboxApplyInstallListVO> wallboxs= this.wallboxApplyMapper.selectWallboxApplyListFromOrder(wallboxApplyquery);
+            if(CollectionUtils.isEmpty(wallboxs)){
+                rowdata.add("error:未找到已审批墙盒申请单!");
+            }else if(wallboxs.stream().noneMatch(w-> StringUtils.isEmpty(w.getTrackingStatus())||"0".equals(w.getTrackingStatus()))){
+                rowdata.add("error:已审批墙盒申请单必须为未发货状态!");
+            }
 //            String error = "error:";
 //            if(ProductType.品牌墙盒.name().equals(deliveryAddVo.getMaterialCategory())||
 //                    ProductType.三方墙盒.name().equals(deliveryAddVo.getMaterialCategory())){

src/main/java/com/starcharge/wios/vo/WallboxApplyInstallListVO.java

@@ -82,7 +82,8 @@ public class WallboxApplyInstallListVO {
     /** 物流状态 */
     @ApiModelProperty(value = "物流状态")
     private String logisticsStatus;
-
+    /** 物流状态0未发货，1已发货 */
+    private String trackingStatus;
     @ApiModelProperty(value = "数量")
     private String number;
 }