Merge remote-tracking branch 'origin/master'

d9156dda · zhangqiliang · 09c69fd0 · 634f614e · d9156dda · d9156dda
--- a/src/main/java/com/starcharge/wios/Import/impl/DeliveryImport.java
+++ b/src/main/java/com/starcharge/wios/Import/impl/DeliveryImport.java
@@ -2,6 +2,7 @@ package com.starcharge.wios.Import.impl;
 import com.starcharge.wios.Import.Import;
 import com.starcharge.wios.convert.DeliveryConvert;
+import com.starcharge.wios.enums2.ProductType;
 import com.starcharge.wios.validation.CreateEntityGroup;
 import com.starcharge.wios.vo.DeliveryAddVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,7 @@ import org.springframework.stereotype.Service;
 import javax.validation.ConstraintViolation;
 import javax.validation.Validator;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
@@ -22,6 +24,9 @@ import java.util.Set;
 @Service
 public class DeliveryImport implements Import {
+    public interface BatchCreateEntityGroup {
+    }
    @Autowired
    private Validator validator;
@@ -30,12 +35,39 @@ public class DeliveryImport implements Import {
 //        List<String> headList = (List<String>)list.get(0);
        for(int i=1;i<list.size();i++){
            List<String> rowdata = (List<String>)list.get(i);
-            DeliveryAddVo deliveryAddVo= DeliveryConvert.INSTANCE.convertImportAddVo(rowdata);
+            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.setWarehouseId(rowdata.get(8));
+            deliveryAddVo.setArrivalWarehouseId(rowdata.get(9));
+            deliveryAddVo.setReceiver(rowdata.get(10));
            Set<ConstraintViolation<DeliveryAddVo>> sets =  validator.validate(deliveryAddVo, CreateEntityGroup.class);
            if(!sets.isEmpty()){
                rowdata.add(sets.stream().map(ConstraintViolation::getMessage).reduce("error:",(s1,s2)->s1+";"+s2));
                continue;
            }
+            String error = "error:";
+            try{ProductType.valueOf(deliveryAddVo.getMaterialCategory());}
+            catch (Exception e){
+                error+="物料类型必须是："+ Arrays.stream(ProductType.values()).map(p->p.name()).reduce("",(s1,s2)->s1+"、"+s2)+";";
+            }
+            if(ProductType.品牌墙盒.name().equals(deliveryAddVo.getMaterialCategory())){
+                //判断订单中是否品牌墙盒
+            }
+            if(error.length()>0){
+                rowdata.add(error);
+                continue;
+            }
        }
        return list;
    }

--- a/src/main/java/com/starcharge/wios/vo/DeliveryAddVo.java
+++ b/src/main/java/com/starcharge/wios/vo/DeliveryAddVo.java
 package com.starcharge.wios.vo;
+import com.starcharge.wios.Import.impl.DeliveryImport;
 import com.starcharge.wios.validation.CreateEntityGroup;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,8 +34,8 @@ public class DeliveryAddVo {
     * @mbg.generated
     */
    @ApiModelProperty(value = "安装单号")
-    @NotNull(groups = CreateEntityGroup.class,message = "缺少安装单号")
+    @NotNull(groups = {CreateEntityGroup.class, DeliveryImport.BatchCreateEntityGroup.class},message = "缺少安装单号")
-    @NotEmpty(groups = CreateEntityGroup.class,message = "缺少安装单号")
+    @NotEmpty(groups = {CreateEntityGroup.class, DeliveryImport.BatchCreateEntityGroup.class},message = "缺少安装单号")
    private String installOrder;
    /**
@@ -72,8 +73,8 @@ public class DeliveryAddVo {
     * @mbg.generated
     */
    @ApiModelProperty(value = "物料编码",required = true)
-    @NotNull(groups = CreateEntityGroup.class,message = "缺少物料编码")
+    @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料编码")
-    @NotEmpty(groups = CreateEntityGroup.class,message = "缺少物料编码")
+    @NotEmpty(groups =  { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料编码")
    private String materialCode;
    /**
@@ -82,8 +83,8 @@ public class DeliveryAddVo {
     * @mbg.generated
     */
    @ApiModelProperty(value = "物料名称",required = true)
-    @NotNull(groups = CreateEntityGroup.class,message = "缺少物料名称")
+    @NotNull(groups =  { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料名称")
-    @NotEmpty(groups = CreateEntityGroup.class,message = "缺少物料名称")
+    @NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料名称")
    private String materialName;
    /**
@@ -92,8 +93,8 @@ public class DeliveryAddVo {
     * @mbg.generated
     */
    @ApiModelProperty(value = "物料厂商",required = true)
-    @NotNull(groups = CreateEntityGroup.class,message = "缺少物料厂商")
+    @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料厂商")
-    @NotEmpty(groups = CreateEntityGroup.class,message = "缺少物料厂商")
+    @NotEmpty(groups =  { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料厂商")
    private String materialCompany;
    /**
@@ -104,6 +105,8 @@ public class DeliveryAddVo {
    @ApiModelProperty(value = "物流单号",required = true)
 //    @NotNull(groups = CreateEntityGroup.class)
 //    @NotEmpty(groups = CreateEntityGroup.class)
+    @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物流单号")
+    @NotEmpty(groups =  { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物流单号")
    private String logisticOrder;
    /**
@@ -129,8 +132,8 @@ public class DeliveryAddVo {
     * @mbg.generated
     */
    @ApiModelProperty(value = "申请团队")
-    @NotNull(groups = CreateEntityGroup.class,message = "缺少申请团队")
+    @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少申请团队")
-    @NotEmpty(groups = CreateEntityGroup.class,message = "缺少申请团队")
+    @NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少申请团队")
    private String team;
    /**
@@ -139,7 +142,8 @@ public class DeliveryAddVo {
     * @mbg.generated
     */
    @ApiModelProperty(value = "是否产品或辅料 1 是 0 否")
-    @NotNull(groups = CreateEntityGroup.class)
+    @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料类型(品牌墙盒/三方墙盒/辅材)")
+    @NotEmpty(groups = {DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料类型(品牌墙盒/三方墙盒/辅材)")
    private String isproduct;
@@ -157,6 +161,8 @@ public class DeliveryAddVo {
     * @mbg.generated
     */
    @ApiModelProperty(value = "到货仓库id")
+    @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少收货仓库id")
+    @NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少收货仓库id")
    private String arrivalWarehouseId;
    /**
     * 发货仓库id
@@ -164,6 +170,8 @@ public class DeliveryAddVo {
     * @mbg.generated
     */
    @ApiModelProperty(value = "发货仓库id")
+    @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少发货仓库id")
+    @NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少发货仓库id")
    private String warehouseId;
    /**
     * 发货仓库
@@ -179,6 +187,8 @@ public class DeliveryAddVo {
     * @mbg.generated
     */
    @ApiModelProperty(value = "收货人")
+    @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少收货人")
+    @NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少收货人")
    private String receiver;
    /**
     * 物料的SN号
@@ -186,6 +196,8 @@ public class DeliveryAddVo {
     * @mbg.generated
     */
    @ApiModelProperty(value = "物料的SN号")
+    @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料的SN号")
+    @NotEmpty(groups = {DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料的SN号")
    private String materialSn;
    /**
     * 安装状态,0-未安装，1-已安装

--- a/src/main/resources/static/templates/墙盒发货单导入模板.xls
+++ b/src/main/resources/static/templates/墙盒发货单导入模板.xls
--- a/src/main/resources/static/templates/辅材发货单导入模板.xls
+++ b/src/main/resources/static/templates/辅材发货单导入模板.xls