Skip to content

W
wios
提交 d7efb7c5 作者: luyincheng
操作

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

墙盒、辅材发货导入service
辅材申请状态回退
父级 a70f9291
正在显示 包含 95 行增加 和 29 行删除
src/main/java/com/starcharge/wios/Import/impl/AuxiliaryMaterialDeliveryImport.java 0 → 100644
package com.starcharge.wios.Import.impl;
import com.starcharge.wios.Import.Import;
import com.starcharge.wios.dao.entity.Order;
import com.starcharge.wios.dao.mappers.OrderMapper;
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;
import org.springframework.stereotype.Service;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
import java.util.List;
import java.util.Set;
/**
* @projectName:xr-wios
* @packageName:com.starcharge.wios.Import.impl
* @Description:TODO
* @Author:luyincheng
* @CreateDate: 2023/10/1317:01
*/
@Service
public class AuxiliaryMaterialDeliveryImport implements Import {
public interface AuxiliaryBatchCreateEntityGroup {
}
@Autowired
private Validator validator;
@Autowired
private OrderMapper orderMapper;
@Override
public List<?> handle(List<Object> list) {
// 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=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
Set<ConstraintViolation<DeliveryAddVo>> sets = validator.validate(deliveryAddVo, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.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
...@@ -2,7 +2,12 @@ package com.starcharge.wios.Import.impl; ...@@ -2,7 +2,12 @@ package com.starcharge.wios.Import.impl;
import com.starcharge.wios.Import.Import; import com.starcharge.wios.Import.Import;
import com.starcharge.wios.convert.DeliveryConvert; import com.starcharge.wios.convert.DeliveryConvert;
import com.starcharge.wios.dao.entity.Order;
import com.starcharge.wios.dao.mappers.OrderMapper;
import com.starcharge.wios.dto.WarehouseDTO2;
import com.starcharge.wios.dto.WarehouseQuery2;
import com.starcharge.wios.enums2.ProductType; import com.starcharge.wios.enums2.ProductType;
import com.starcharge.wios.service.WarehouseService;
import com.starcharge.wios.validation.CreateEntityGroup; import com.starcharge.wios.validation.CreateEntityGroup;
import com.starcharge.wios.vo.DeliveryAddVo; import com.starcharge.wios.vo.DeliveryAddVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -29,6 +34,8 @@ public class DeliveryImport implements Import { ...@@ -29,6 +34,8 @@ public class DeliveryImport implements Import {
@Autowired @Autowired
private Validator validator; private Validator validator;
@Autowired
private OrderMapper orderMapper;
@Override @Override
public List<?> handle(List<Object> list) { public List<?> handle(List<Object> list) {
...@@ -44,24 +51,29 @@ public class DeliveryImport implements Import { ...@@ -44,24 +51,29 @@ public class DeliveryImport implements Import {
deliveryAddVo.setMaterialCompany(rowdata.get(5)); deliveryAddVo.setMaterialCompany(rowdata.get(5));
deliveryAddVo.setLogisticOrder(rowdata.get(6)); deliveryAddVo.setLogisticOrder(rowdata.get(6));
deliveryAddVo.setTeam(rowdata.get(7)); deliveryAddVo.setTeam(rowdata.get(7));
deliveryAddVo.setWarehouseId(rowdata.get(8)); //deliveryAddVo.setWarehouseName(rowdata.get(8));
deliveryAddVo.setArrivalWarehouseId(rowdata.get(9)); //deliveryAddVo.setArrivalWarehouseId(rowdata.get(9));
deliveryAddVo.setReceiver(rowdata.get(10)); //deliveryAddVo.setReceiver(rowdata.get(10));
Set<ConstraintViolation<DeliveryAddVo>> sets = validator.validate(deliveryAddVo, CreateEntityGroup.class); Set<ConstraintViolation<DeliveryAddVo>> sets = validator.validate(deliveryAddVo, DeliveryImport.BatchCreateEntityGroup.class);
if(!sets.isEmpty()){ if(!sets.isEmpty()){
rowdata.add(sets.stream().map(ConstraintViolation::getMessage).reduce("error:",(s1,s2)->s1+";"+s2)); rowdata.add(sets.stream().map(ConstraintViolation::getMessage).reduce("error:",(s1,s2)->s1+";"+s2));
continue; continue;
} }
String error = "error:"; String error = "error:";
try{ProductType.valueOf(deliveryAddVo.getMaterialCategory());} if(ProductType.品牌墙盒.name().equals(deliveryAddVo.getMaterialCategory())||
catch (Exception e){ ProductType.三方墙盒.name().equals(deliveryAddVo.getMaterialCategory())){
error+="物料类型必须是："+ Arrays.stream(ProductType.values()).map(p->p.name()).reduce("",(s1,s2)->s1+"、"+s2)+";"; 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(ProductType.品牌墙盒.name().equals(deliveryAddVo.getMaterialCategory())){
//判断订单中是否品牌墙盒
} }
if(error.length()>0){ if(error.length()>0){
......
src/main/java/com/starcharge/wios/enums2/TauxiliarymaterialStatusEnum.java
...@@ -14,7 +14,8 @@ import java.util.stream.Collectors; ...@@ -14,7 +14,8 @@ import java.util.stream.Collectors;
* @CreateDate: 2023/9/2515:49 * @CreateDate: 2023/9/2515:49
*/ */
public enum TauxiliarymaterialStatusEnum { public enum TauxiliarymaterialStatusEnum {
退货已申请(0,1),退货已驳回(0,2),退货已通过(0,3),退货完成(0,4),已申请(0,5), 已申请(0,1),已驳回(0,2),已通过(0,3),已关闭(0,4),
退货已申请(3,1),退货已驳回(3,2),退货已通过(3,3),退货完成(3,4),
未发货(1,1),已发货(1,1), 未发货(1,1),已发货(1,1),
未收货(2,1), 已收货(2,1); 未收货(2,1), 已收货(2,1);
......
src/main/java/com/starcharge/wios/vo/DeliveryAddVo.java
package com.starcharge.wios.vo; package com.starcharge.wios.vo;
import com.starcharge.wios.Import.impl.AuxiliaryMaterialDeliveryImport;
import com.starcharge.wios.Import.impl.DeliveryImport; import com.starcharge.wios.Import.impl.DeliveryImport;
import com.starcharge.wios.validation.CreateEntityGroup; import com.starcharge.wios.validation.CreateEntityGroup;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -34,8 +35,8 @@ public class DeliveryAddVo { ...@@ -34,8 +35,8 @@ public class DeliveryAddVo {
* @mbg.generated * @mbg.generated
*/ */
@ApiModelProperty(value = "安装单号") @ApiModelProperty(value = "安装单号")
@NotNull(groups = {CreateEntityGroup.class, DeliveryImport.BatchCreateEntityGroup.class},message = "缺少安装单号") @NotNull(groups = {CreateEntityGroup.class, DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少安装单号")
@NotEmpty(groups = {CreateEntityGroup.class, DeliveryImport.BatchCreateEntityGroup.class},message = "缺少安装单号") @NotEmpty(groups = {CreateEntityGroup.class, DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少安装单号")
private String installOrder; private String installOrder;
/** /**
...@@ -73,8 +74,8 @@ public class DeliveryAddVo { ...@@ -73,8 +74,8 @@ public class DeliveryAddVo {
* @mbg.generated * @mbg.generated
*/ */
@ApiModelProperty(value = "物料编码",required = true) @ApiModelProperty(value = "物料编码",required = true)
@NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料编码") @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少物料编码")
@NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料编码") @NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少物料编码")
private String materialCode; private String materialCode;
/** /**
...@@ -83,8 +84,8 @@ public class DeliveryAddVo { ...@@ -83,8 +84,8 @@ public class DeliveryAddVo {
* @mbg.generated * @mbg.generated
*/ */
@ApiModelProperty(value = "物料名称",required = true) @ApiModelProperty(value = "物料名称",required = true)
@NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料名称") @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少物料名称")
@NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料名称") @NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少物料名称")
private String materialName; private String materialName;
/** /**
...@@ -93,8 +94,8 @@ public class DeliveryAddVo { ...@@ -93,8 +94,8 @@ public class DeliveryAddVo {
* @mbg.generated * @mbg.generated
*/ */
@ApiModelProperty(value = "物料厂商",required = true) @ApiModelProperty(value = "物料厂商",required = true)
@NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料厂商") @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少物料厂商")
@NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料厂商") @NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少物料厂商")
private String materialCompany; private String materialCompany;
/** /**
...@@ -105,8 +106,8 @@ public class DeliveryAddVo { ...@@ -105,8 +106,8 @@ public class DeliveryAddVo {
@ApiModelProperty(value = "物流单号",required = true) @ApiModelProperty(value = "物流单号",required = true)
// @NotNull(groups = CreateEntityGroup.class) // @NotNull(groups = CreateEntityGroup.class)
// @NotEmpty(groups = CreateEntityGroup.class) // @NotEmpty(groups = CreateEntityGroup.class)
@NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物流单号") @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少物流单号")
@NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物流单号") @NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少物流单号")
private String logisticOrder; private String logisticOrder;
/** /**
...@@ -132,8 +133,8 @@ public class DeliveryAddVo { ...@@ -132,8 +133,8 @@ public class DeliveryAddVo {
* @mbg.generated * @mbg.generated
*/ */
@ApiModelProperty(value = "申请团队") @ApiModelProperty(value = "申请团队")
@NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少申请团队") @NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少申请团队")
@NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少申请团队") @NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少申请团队")
private String team; private String team;
/** /**
...@@ -161,8 +162,6 @@ public class DeliveryAddVo { ...@@ -161,8 +162,6 @@ public class DeliveryAddVo {
* @mbg.generated * @mbg.generated
*/ */
@ApiModelProperty(value = "到货仓库id") @ApiModelProperty(value = "到货仓库id")
@NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少收货仓库id")
@NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少收货仓库id")
private String arrivalWarehouseId; private String arrivalWarehouseId;
/** /**
* 发货仓库id * 发货仓库id
...@@ -170,8 +169,6 @@ public class DeliveryAddVo { ...@@ -170,8 +169,6 @@ public class DeliveryAddVo {
* @mbg.generated * @mbg.generated
*/ */
@ApiModelProperty(value = "发货仓库id") @ApiModelProperty(value = "发货仓库id")
@NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少发货仓库id")
@NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少发货仓库id")
private String warehouseId; private String warehouseId;
/** /**
* 发货仓库 * 发货仓库
...@@ -187,8 +184,6 @@ public class DeliveryAddVo { ...@@ -187,8 +184,6 @@ public class DeliveryAddVo {
* @mbg.generated * @mbg.generated
*/ */
@ApiModelProperty(value = "收货人") @ApiModelProperty(value = "收货人")
@NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少收货人")
@NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少收货人")
private String receiver; private String receiver;
/** /**
* 物料的SN号 * 物料的SN号
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论