墙盒、辅材发货导入模板更新

墙盒、辅材发货导入service
辅材申请审批问题

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

@@ -39,13 +39,18 @@ public class AuxiliaryMaterialDeliveryImport implements Import {
             List<String> rowdata = (List<String>)list.get(i);
             DeliveryAddVo deliveryAddVo=new DeliveryAddVo();
             deliveryAddVo.setInstallOrder(rowdata.get(0));
-            deliveryAddVo.setMaterialCode(rowdata.get(1));
-            deliveryAddVo.setMaterialName(rowdata.get(2));
-            deliveryAddVo.setMaterialCompany(rowdata.get(3));
-            deliveryAddVo.setLogisticOrder(rowdata.get(4));
-            deliveryAddVo.setTeam(rowdata.get(5));
-            //deliveryAddVo.setWarehouseName(rowdata.get(6));
-            //deliveryAddVo.set
+            deliveryAddVo.setLogisticOrder(rowdata.get(1));
+            try {
+                deliveryAddVo.setQuantity(Integer.parseInt(rowdata.get(2)));
+            }catch (Exception e){
+                rowdata.add("error:发货数量必填且为整数");
+            }
+//            deliveryAddVo.setMaterialCode(rowdata.get(1));
+//            deliveryAddVo.setMaterialName(rowdata.get(2));
+//            deliveryAddVo.setMaterialCompany(rowdata.get(3));
+//            deliveryAddVo.setLogisticOrder(rowdata.get(4));
+//            deliveryAddVo.setTeam(rowdata.get(5));
+
 
             Set<ConstraintViolation<DeliveryAddVo>> sets =  validator.validate(deliveryAddVo, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class);
             if(!sets.isEmpty()){

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

@@ -45,15 +45,14 @@ public class DeliveryImport implements Import {
             DeliveryAddVo deliveryAddVo=new DeliveryAddVo();
             deliveryAddVo.setInstallOrder(rowdata.get(0));
             deliveryAddVo.setMaterialSn(rowdata.get(1));
-            deliveryAddVo.setMaterialCategory(rowdata.get(2));
-            deliveryAddVo.setMaterialCode(rowdata.get(3));
-            deliveryAddVo.setMaterialName(rowdata.get(4));
-            deliveryAddVo.setMaterialCompany(rowdata.get(5));
-            deliveryAddVo.setLogisticOrder(rowdata.get(6));
-            deliveryAddVo.setTeam(rowdata.get(7));
-            //deliveryAddVo.setWarehouseName(rowdata.get(8));
-            //deliveryAddVo.setArrivalWarehouseId(rowdata.get(9));
-            //deliveryAddVo.setReceiver(rowdata.get(10));
+            deliveryAddVo.setLogisticOrder(rowdata.get(2));
+//            deliveryAddVo.setMaterialCategory(rowdata.get(2));
+//            deliveryAddVo.setMaterialCode(rowdata.get(3));
+//            deliveryAddVo.setMaterialName(rowdata.get(4));
+//            deliveryAddVo.setMaterialCompany(rowdata.get(5));
+//            deliveryAddVo.setLogisticOrder(rowdata.get(6));
+//            deliveryAddVo.setTeam(rowdata.get(7));
+
 
             Set<ConstraintViolation<DeliveryAddVo>> sets =  validator.validate(deliveryAddVo, DeliveryImport.BatchCreateEntityGroup.class);
             if(!sets.isEmpty()){
@@ -61,25 +60,25 @@ public class DeliveryImport implements Import {
                 continue;
             }
 
-            String error = "error:";
-            if(ProductType.品牌墙盒.name().equals(deliveryAddVo.getMaterialCategory())||
-                    ProductType.三方墙盒.name().equals(deliveryAddVo.getMaterialCategory())){
-                if(ProductType.品牌墙盒.name().equals(deliveryAddVo.getMaterialCategory())){
-                    //判断订单中是否品牌墙盒
-                    Order order=this.orderMapper.selectById(deliveryAddVo.getInstallOrder());
-                    if(order==null||!"CAMS".equals(order)){
-                        error+="订单必须是CAMS品牌墙盒订单;";
-                    }
-                }
-            }else {
-                error+="物料类型必须是："+ ProductType.品牌墙盒.name()+"/"+ProductType.三方墙盒.name()+";";
-
-            }
-
-            if(error.length()>0){
-                rowdata.add(error);
-                continue;
-            }
+//            String error = "error:";
+//            if(ProductType.品牌墙盒.name().equals(deliveryAddVo.getMaterialCategory())||
+//                    ProductType.三方墙盒.name().equals(deliveryAddVo.getMaterialCategory())){
+//                if(ProductType.品牌墙盒.name().equals(deliveryAddVo.getMaterialCategory())){
+//                    //判断订单中是否品牌墙盒
+//                    Order order=this.orderMapper.selectById(deliveryAddVo.getInstallOrder());
+//                    if(order==null||!"CAMS".equals(order)){
+//                        error+="订单必须是CAMS品牌墙盒订单;";
+//                    }
+//                }
+//            }else {
+//                error+="物料类型必须是："+ ProductType.品牌墙盒.name()+"/"+ProductType.三方墙盒.name()+";";
+//
+//            }
+//
+//            if(error.length()>0){
+//                rowdata.add(error);
+//                continue;
+//            }
         }
         return list;
     }

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

@@ -152,16 +152,16 @@ public class TauxiliarymaterialsController {
         tauxiliarymaterialsCheckDto.getTauxiliarymaterialsCheckVoList().stream()
                 .filter(dto->{
                     Tauxiliarymaterials exist=null;
-                    if(dto.getId()>0){
+                    if(dto.getId()!=null&&dto.getId()>0){
                         exist=this.tauxiliarymaterialsMapper.selectByPrimaryKey(dto.getId());
                     }else if(StringUtils.hasLength(dto.getApplyOrder())){
                         exist=this.tauxiliarymaterialsMapper.selectByApplyOrder(dto.getApplyOrder());                    }
-                    if(exist==null){
-                        return false;
-                    }else{
-                        //已审批
-                        if(TauxiliarymaterialStatusEnum.getEnumByName(0,exist.getApplyStatus()).getValue()>1){
+                        if(exist==null){
                             return false;
+                        }else{
+                            //已审批
+                            if(TauxiliarymaterialStatusEnum.getEnumByName(0,exist.getApplyStatus()).getValue()>1){
+                                return false;
                         }
                     }
                     return true;

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

@@ -74,8 +74,6 @@ public class DeliveryAddVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "物料编码",required = true)
-    @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少物料编码")
-    @NotEmpty(groups =  { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少物料编码")
     private String materialCode;
 
     /**
@@ -84,8 +82,6 @@ public class DeliveryAddVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "物料名称",required = true)
-    @NotNull(groups =  { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少物料名称")
-    @NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少物料名称")
     private String materialName;
 
     /**
@@ -94,8 +90,6 @@ public class DeliveryAddVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "物料厂商",required = true)
-    @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少物料厂商")
-    @NotEmpty(groups =  { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少物料厂商")
     private String materialCompany;
 
     /**
@@ -133,8 +127,6 @@ public class DeliveryAddVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "申请团队")
-    @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少申请团队")
-    @NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少申请团队")
     private String team;
 
     /**
@@ -143,8 +135,6 @@ public class DeliveryAddVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "是否产品或辅料 1 是 0 否")
-    @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料类型(品牌墙盒/三方墙盒/辅材)")
-    @NotEmpty(groups = {DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料类型(品牌墙盒/三方墙盒/辅材)")
     private String isproduct;