园区仓库区分类型

zrj

2024-10-30 a953966925a2b16e23a2fbbcf8ef6a3efe089635

园区仓库区分类型

 src/main/java/org/springblade/modules/yw/entity/SuppliesEntity.java

@@ -32,6 +32,12 @@
     */
    @ApiModelProperty(value = "所属企业id")
    private Long firmId;

    /**
     * 类型 1：园区仓库 2：企业仓库
     */
    @ApiModelProperty(value = "类型 1：园区仓库 2：企业仓库")
    private Integer type;
    /**
     * 物资库名称
     */

 src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java

@@ -124,9 +124,11 @@
     */
    private void setSupplies(EmergencySuppliesExcel emergencySuppliesExcel, EmergencySuppliesEntity emergencySuppliesEntity) {
        QueryWrapper<SuppliesEntity> wrapper = new QueryWrapper<>();
        wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId())
            .eq("name",emergencySuppliesExcel.getSuppliesName())
        wrapper.eq("name",emergencySuppliesExcel.getSuppliesName())
            .eq("is_deleted",0);
        if (!emergencySuppliesExcel.getSuppliesName().contains("园区")){
            wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId());
        }
        SuppliesEntity suppliesEntity = suppliesService.getOne(wrapper);
        if (null!=suppliesEntity){
            emergencySuppliesEntity.setSuppliesId(suppliesEntity.getId());