Skip to content

W
wios
提交 9b0efb78 作者: luyincheng
操作

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

墙盒、辅材发货导入service
辅材申请审批问题
父级 2d4830e3
正在显示 包含 45 行增加 和 51 行删除
src/main/java/com/starcharge/wios/Import/impl/AuxiliaryMaterialDeliveryImport.java
...@@ -39,13 +39,18 @@ public class AuxiliaryMaterialDeliveryImport implements Import { ...@@ -39,13 +39,18 @@ public class AuxiliaryMaterialDeliveryImport implements Import {
List<String> rowdata = (List<String>)list.get(i); List<String> rowdata = (List<String>)list.get(i);
DeliveryAddVo deliveryAddVo=new DeliveryAddVo(); DeliveryAddVo deliveryAddVo=new DeliveryAddVo();
deliveryAddVo.setInstallOrder(rowdata.get(0)); deliveryAddVo.setInstallOrder(rowdata.get(0));
deliveryAddVo.setMaterialCode(rowdata.get(1)); deliveryAddVo.setLogisticOrder(rowdata.get(1));
deliveryAddVo.setMaterialName(rowdata.get(2)); try {
deliveryAddVo.setMaterialCompany(rowdata.get(3)); deliveryAddVo.setQuantity(Integer.parseInt(rowdata.get(2)));
deliveryAddVo.setLogisticOrder(rowdata.get(4)); }catch (Exception e){
deliveryAddVo.setTeam(rowdata.get(5)); rowdata.add("error:发货数量必填且为整数");
//deliveryAddVo.setWarehouseName(rowdata.get(6)); }
//deliveryAddVo.set // 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); Set<ConstraintViolation<DeliveryAddVo>> sets = validator.validate(deliveryAddVo, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class);
if(!sets.isEmpty()){ if(!sets.isEmpty()){
......
src/main/java/com/starcharge/wios/Import/impl/DeliveryImport.java
...@@ -45,15 +45,14 @@ public class DeliveryImport implements Import { ...@@ -45,15 +45,14 @@ public class DeliveryImport implements Import {
DeliveryAddVo deliveryAddVo=new DeliveryAddVo(); DeliveryAddVo deliveryAddVo=new DeliveryAddVo();
deliveryAddVo.setInstallOrder(rowdata.get(0)); deliveryAddVo.setInstallOrder(rowdata.get(0));
deliveryAddVo.setMaterialSn(rowdata.get(1)); deliveryAddVo.setMaterialSn(rowdata.get(1));
deliveryAddVo.setMaterialCategory(rowdata.get(2)); deliveryAddVo.setLogisticOrder(rowdata.get(2));
deliveryAddVo.setMaterialCode(rowdata.get(3)); // deliveryAddVo.setMaterialCategory(rowdata.get(2));
deliveryAddVo.setMaterialName(rowdata.get(4)); // deliveryAddVo.setMaterialCode(rowdata.get(3));
deliveryAddVo.setMaterialCompany(rowdata.get(5)); // deliveryAddVo.setMaterialName(rowdata.get(4));
deliveryAddVo.setLogisticOrder(rowdata.get(6)); // deliveryAddVo.setMaterialCompany(rowdata.get(5));
deliveryAddVo.setTeam(rowdata.get(7)); // deliveryAddVo.setLogisticOrder(rowdata.get(6));
//deliveryAddVo.setWarehouseName(rowdata.get(8)); // deliveryAddVo.setTeam(rowdata.get(7));
//deliveryAddVo.setArrivalWarehouseId(rowdata.get(9));
//deliveryAddVo.setReceiver(rowdata.get(10));
Set<ConstraintViolation<DeliveryAddVo>> sets = validator.validate(deliveryAddVo, DeliveryImport.BatchCreateEntityGroup.class); Set<ConstraintViolation<DeliveryAddVo>> sets = validator.validate(deliveryAddVo, DeliveryImport.BatchCreateEntityGroup.class);
if(!sets.isEmpty()){ if(!sets.isEmpty()){
...@@ -61,25 +60,25 @@ public class DeliveryImport implements Import { ...@@ -61,25 +60,25 @@ public class DeliveryImport implements Import {
continue; continue;
} }
String error = "error:"; // String error = "error:";
if(ProductType.品牌墙盒.name().equals(deliveryAddVo.getMaterialCategory())|| // if(ProductType.品牌墙盒.name().equals(deliveryAddVo.getMaterialCategory())||
ProductType.三方墙盒.name().equals(deliveryAddVo.getMaterialCategory())){ // ProductType.三方墙盒.name().equals(deliveryAddVo.getMaterialCategory())){
if(ProductType.品牌墙盒.name().equals(deliveryAddVo.getMaterialCategory())){ // if(ProductType.品牌墙盒.name().equals(deliveryAddVo.getMaterialCategory())){
//判断订单中是否品牌墙盒 // //判断订单中是否品牌墙盒
Order order=this.orderMapper.selectById(deliveryAddVo.getInstallOrder()); // Order order=this.orderMapper.selectById(deliveryAddVo.getInstallOrder());
if(order==null||!"CAMS".equals(order)){ // if(order==null||!"CAMS".equals(order)){
error+="订单必须是CAMS品牌墙盒订单;"; // error+="订单必须是CAMS品牌墙盒订单;";
} // }
} // }
}else { // }else {
error+="物料类型必须是："+ ProductType.品牌墙盒.name()+"/"+ProductType.三方墙盒.name()+";"; // error+="物料类型必须是："+ ProductType.品牌墙盒.name()+"/"+ProductType.三方墙盒.name()+";";
//
} // }
//
if(error.length()>0){ // if(error.length()>0){
rowdata.add(error); // rowdata.add(error);
continue; // continue;
} // }
} }
return list; return list;
} }
......
src/main/java/com/starcharge/wios/controller/TauxiliarymaterialsController.java
...@@ -152,16 +152,16 @@ public class TauxiliarymaterialsController { ...@@ -152,16 +152,16 @@ public class TauxiliarymaterialsController {
tauxiliarymaterialsCheckDto.getTauxiliarymaterialsCheckVoList().stream() tauxiliarymaterialsCheckDto.getTauxiliarymaterialsCheckVoList().stream()
.filter(dto->{ .filter(dto->{
Tauxiliarymaterials exist=null; Tauxiliarymaterials exist=null;
if(dto.getId()>0){ if(dto.getId()!=null&&dto.getId()>0){
exist=this.tauxiliarymaterialsMapper.selectByPrimaryKey(dto.getId()); exist=this.tauxiliarymaterialsMapper.selectByPrimaryKey(dto.getId());
}else if(StringUtils.hasLength(dto.getApplyOrder())){ }else if(StringUtils.hasLength(dto.getApplyOrder())){
exist=this.tauxiliarymaterialsMapper.selectByApplyOrder(dto.getApplyOrder()); } exist=this.tauxiliarymaterialsMapper.selectByApplyOrder(dto.getApplyOrder()); }
if(exist==null){ if(exist==null){
return false;
}else{
//已审批
if(TauxiliarymaterialStatusEnum.getEnumByName(0,exist.getApplyStatus()).getValue()>1){
return false; return false;
}else{
//已审批
if(TauxiliarymaterialStatusEnum.getEnumByName(0,exist.getApplyStatus()).getValue()>1){
return false;
} }
} }
return true; return true;
......
src/main/java/com/starcharge/wios/vo/DeliveryAddVo.java
...@@ -74,8 +74,6 @@ public class DeliveryAddVo { ...@@ -74,8 +74,6 @@ public class DeliveryAddVo {
* @mbg.generated * @mbg.generated
*/ */
@ApiModelProperty(value = "物料编码",required = true) @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; private String materialCode;
/** /**
...@@ -84,8 +82,6 @@ public class DeliveryAddVo { ...@@ -84,8 +82,6 @@ public class DeliveryAddVo {
* @mbg.generated * @mbg.generated
*/ */
@ApiModelProperty(value = "物料名称",required = true) @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; private String materialName;
/** /**
...@@ -94,8 +90,6 @@ public class DeliveryAddVo { ...@@ -94,8 +90,6 @@ public class DeliveryAddVo {
* @mbg.generated * @mbg.generated
*/ */
@ApiModelProperty(value = "物料厂商",required = true) @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; private String materialCompany;
/** /**
...@@ -133,8 +127,6 @@ public class DeliveryAddVo { ...@@ -133,8 +127,6 @@ public class DeliveryAddVo {
* @mbg.generated * @mbg.generated
*/ */
@ApiModelProperty(value = "申请团队") @ApiModelProperty(value = "申请团队")
@NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少申请团队")
@NotEmpty(groups = { DeliveryImport.BatchCreateEntityGroup.class, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class},message = "缺少申请团队")
private String team; private String team;
/** /**
...@@ -143,8 +135,6 @@ public class DeliveryAddVo { ...@@ -143,8 +135,6 @@ public class DeliveryAddVo {
* @mbg.generated * @mbg.generated
*/ */
@ApiModelProperty(value = "是否产品或辅料 1 是 0 否") @ApiModelProperty(value = "是否产品或辅料 1 是 0 否")
@NotNull(groups = { DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料类型(品牌墙盒/三方墙盒/辅材)")
@NotEmpty(groups = {DeliveryImport.BatchCreateEntityGroup.class},message = "缺少物料类型(品牌墙盒/三方墙盒/辅材)")
private String isproduct; private String isproduct;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论