辅材列表导入模板、导入服务；发货导入删除测试代码

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

@@ -40,9 +40,7 @@ public class AuxiliaryMaterialDeliveryImport implements Import {
 
     @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);

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

+package com.starcharge.wios.Import.impl;
+
+import com.starcharge.wios.Import.Import;
+import com.starcharge.wios.dao.entity.WallboxApply;
+import com.starcharge.wios.validation.CreateEntityGroup;
+import com.starcharge.wios.vo.DeliveryAddVo;
+import com.starcharge.wios.vo.TauxiliarymaterialsVo;
+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;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @projectName:wios
+ * @packageName:com.starcharge.wios.Import.impl
+ * @Description:TODO
+ * @Author:luyincheng
+ * @CreateDate: 2024/1/2215:59
+ */
+@Service
+public class AuxiliaryMaterialImport implements Import {
+
+    @Autowired
+    private Validator validator;
+    @Override
+    public List<?> handle(List<Object> list) {
+
+        for(int i=1;i<list.size();i++){
+            List<String> rowdata = (List<String>)list.get(i);
+            TauxiliarymaterialsVo tauxiliarymaterialsVo = new TauxiliarymaterialsVo();
+            tauxiliarymaterialsVo.setTeam(rowdata.get(0));
+            tauxiliarymaterialsVo.setMaterialCode(rowdata.get(1));
+            tauxiliarymaterialsVo.setMaterialName(rowdata.get(2));
+            tauxiliarymaterialsVo.setMeasurementUnit(rowdata.get(3));
+            tauxiliarymaterialsVo.setSpecification(rowdata.get(4));
+            tauxiliarymaterialsVo.setApplyQuantity(rowdata.get(5));
+            tauxiliarymaterialsVo.setRecipents(rowdata.get(6));
+            tauxiliarymaterialsVo.setReceiveAddress(rowdata.get(7));
+            tauxiliarymaterialsVo.setAreaName(rowdata.get(8));
+            tauxiliarymaterialsVo.setReceivePhone(rowdata.get(9));
+
+            Set<ConstraintViolation<TauxiliarymaterialsVo>> sets =  validator.validate(tauxiliarymaterialsVo, CreateEntityGroup.class);
+            if(!sets.isEmpty()){
+                rowdata.add(sets.stream().map(ConstraintViolation::getMessage).reduce("error:",(s1,s2)->s1+";"+s2));
+                continue;
+            }
+
+        }
+        return list;
+    }
+}

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

@@ -47,9 +47,7 @@ public class DeliveryImport implements Import {
     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);

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

@@ -6,14 +6,14 @@ import com.ihidea.core.support.exception.ServiceException;
 import com.ihidea.core.support.session.SessionInfo;
 import com.starcharge.wios.auth.service.TokenService;
 import com.starcharge.wios.convert.TauxiliarymaterialsConvert;
-import com.starcharge.wios.dao.entity.Delivery;
-import com.starcharge.wios.dao.entity.Tauxiliarymaterials;
-import com.starcharge.wios.dao.entity.TauxiliarymaterialsCriteria;
+import com.starcharge.wios.dao.entity.*;
 import com.starcharge.wios.dao.mappers.DeliveryMapper;
 import com.starcharge.wios.dao.mappers.TauxiliarymaterialsMapper;
 import com.starcharge.wios.dto.TauxiliarymaterialsCheckDto;
 import com.starcharge.wios.enums2.LogisticCompany;
 import com.starcharge.wios.enums2.TauxiliarymaterialStatusEnum;
+import com.starcharge.wios.service.SupplierService;
+import com.starcharge.wios.service.SupplierStaffService;
 import com.starcharge.wios.utils.ExcelUtils;
 import com.starcharge.wios.utils.NumberUtil;
 import com.starcharge.wios.validation.CreateEntityGroup;
@@ -87,6 +87,43 @@ public class TauxiliarymaterialsController {
         tauxiliarymaterialsMapper.insertSelective(tauxiliarymaterials);
         return new BaseResponse<>(tauxiliarymaterials);
     }
+    @Autowired
+    private SupplierStaffService supplierStaffService;
+    @Autowired
+    private SupplierService supplierService;
+/*    @PostMapping("/addbatch")
+    @ApiOperation("批量新增辅材申请")
+    @ParamsValidate
+    @Transactional
+    public BaseResponse<List<Tauxiliarymaterials>> AddTauxiliarymaterialsBatch( @RequestBody @Validated(CreateEntityGroup.class) List<TauxiliarymaterialsVo> tauxiliarymaterialsVoList, BindingResult bindingResult){
+        SessionInfo sessionInfo = tokenService.getUser();
+
+        String userId = sessionInfo.getUserId();
+
+        SupplierStaff infoByAccount = supplierStaffService.getByAccountId(Integer.valueOf(userId));
+        Supplier supplier = supplierService.getById(infoByAccount.getSupplierId());
+        if (supplier == null) {
+            throw new ServiceException("供应商不存在");
+        }
+        return new BaseResponse<>(tauxiliarymaterialsVoList.stream().map(tauxiliarymaterialsVo->{
+            var tauxiliarymaterials=TauxiliarymaterialsConvert.INSTANCE.convertListVo(tauxiliarymaterialsVo);
+            var now=LocalDateTime.now();
+            tauxiliarymaterials.setApplyStatus(TauxiliarymaterialStatusEnum.已申请.name());
+            tauxiliarymaterials.setLogisticStatus(TauxiliarymaterialStatusEnum.未发货.name());
+            tauxiliarymaterials.setReceivingStatus(TauxiliarymaterialStatusEnum.未收货.name());
+            tauxiliarymaterials.setApplyTime(now);
+            tauxiliarymaterials.setCreatedBy(sessionInfo.getUserId());
+            tauxiliarymaterials.setCreatedTime(now);
+            tauxiliarymaterials.setUpdatedBy(sessionInfo.getUserId());
+            tauxiliarymaterials.setUpdatedTime(now);
+            tauxiliarymaterials.setAreaName(tauxiliarymaterialsVo.getAreaName());
+            tauxiliarymaterials.setWarehouseName(supplier.getWarehouseName());
+            //暂时代替申请单号
+            tauxiliarymaterials.setApplyOrder("FC"+NumberUtil.getRandomOrderId());
+            tauxiliarymaterialsMapper.insertSelective(tauxiliarymaterials);
+            return tauxiliarymaterials;
+        }).collect(Collectors.toList()));
+    }*/
     @GetMapping("/detail")
     @ApiOperation(value = "查询辅材申请详情")
     public BaseResponse<Tauxiliarymaterials> detail(@RequestParam int id){

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

@@ -31,8 +31,8 @@ public class TauxiliarymaterialsVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "物料编码")
-    @NotEmpty(groups = {CreateEntityGroup.class})
-    @NotNull(groups = {CreateEntityGroup.class})
+    @NotEmpty(groups = {CreateEntityGroup.class},message = "缺少物料编码")
+    @NotNull(groups = {CreateEntityGroup.class},message = "缺少物料编码")
     private String materialCode;
 
     /**
@@ -41,8 +41,8 @@ public class TauxiliarymaterialsVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "物料名称")
-    @NotEmpty(groups = {CreateEntityGroup.class})
-    @NotNull(groups = {CreateEntityGroup.class})
+    @NotEmpty(groups = {CreateEntityGroup.class},message = "缺少物料名称")
+    @NotNull(groups = {CreateEntityGroup.class},message = "缺少物料名称")
     private String materialName;
 
     /**
@@ -51,8 +51,8 @@ public class TauxiliarymaterialsVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "计量单位")
-    @NotEmpty(groups = {CreateEntityGroup.class})
-    @NotNull(groups = {CreateEntityGroup.class})
+    @NotEmpty(groups = {CreateEntityGroup.class},message = "缺少物料单位")
+    @NotNull(groups = {CreateEntityGroup.class},message = "缺少物料单位")
     private String measurementUnit;
 
     /**
@@ -61,8 +61,8 @@ public class TauxiliarymaterialsVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "申请数量")
-    @NotEmpty(groups = {CreateEntityGroup.class})
-    @NotNull(groups = {CreateEntityGroup.class})
+    @NotEmpty(groups = {CreateEntityGroup.class},message = "缺少申请数量")
+    @NotNull(groups = {CreateEntityGroup.class},message = "缺少申请数量")
     private String applyQuantity;
 
 
@@ -72,8 +72,8 @@ public class TauxiliarymaterialsVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "申请团队")
-    @NotEmpty(groups = {CreateEntityGroup.class})
-    @NotNull(groups = {CreateEntityGroup.class})
+    @NotEmpty(groups = {CreateEntityGroup.class},message = "缺少申请团队")
+    @NotNull(groups = {CreateEntityGroup.class},message = "缺少申请团队")
     private String team;
 
 
@@ -83,8 +83,8 @@ public class TauxiliarymaterialsVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "收货人")
-    @NotEmpty(groups = {CreateEntityGroup.class})
-    @NotNull(groups = {CreateEntityGroup.class})
+    @NotEmpty(groups = {CreateEntityGroup.class},message = "缺少收货人")
+    @NotNull(groups = {CreateEntityGroup.class},message = "缺少收货人")
     private String recipents;
 
     /**
@@ -93,8 +93,8 @@ public class TauxiliarymaterialsVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "收货地址")
-    @NotEmpty(groups = {CreateEntityGroup.class})
-    @NotNull(groups = {CreateEntityGroup.class})
+    @NotEmpty(groups = {CreateEntityGroup.class},message = "缺少收货地址")
+    @NotNull(groups = {CreateEntityGroup.class},message = "缺少收货地址")
     private String receiveAddress;
 
     /**
@@ -103,8 +103,8 @@ public class TauxiliarymaterialsVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "联系电话")
-    @NotEmpty(groups = {CreateEntityGroup.class})
-    @NotNull(groups = {CreateEntityGroup.class})
+    @NotEmpty(groups = {CreateEntityGroup.class},message = "缺少联系电话")
+    @NotNull(groups = {CreateEntityGroup.class},message = "缺少联系电话")
     private String receivePhone;
 
     /**
@@ -121,8 +121,8 @@ public class TauxiliarymaterialsVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "规格型号")
-    @NotEmpty(groups = {CreateEntityGroup.class})
-    @NotNull(groups = {CreateEntityGroup.class})
+    @NotEmpty(groups = {CreateEntityGroup.class},message = "缺少规格型号")
+    @NotNull(groups = {CreateEntityGroup.class},message = "缺少规格型号")
     private String specification;
 
     /**
@@ -162,6 +162,8 @@ public class TauxiliarymaterialsVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "所属区域")
+    @NotEmpty(groups = {CreateEntityGroup.class},message = "缺少所属区域")
+    @NotNull(groups = {CreateEntityGroup.class},message = "缺少所属区域")
     private String areaName;
     /**
      * 仓库名称