fix: 净重拆分为详细数据而不是总书记

gongchunyi

11 小时以前 78e42bab93977566994be06f5d6b042c9f5a67f5

fix: 净重拆分为详细数据而不是总书记

 src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java

@@ -50,4 +50,7 @@
    private LocalDateTime weighingDate;

    private String  parentName;

    @ApiModelProperty("净重(总数)")
    private BigDecimal netWeight;
}

 src/main/java/com/ruoyi/stock/pojo/StockInRecord.java

@@ -67,4 +67,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime weighingDate;

    @ApiModelProperty("净重")
    private BigDecimal netWeight;
}

 src/main/java/com/ruoyi/stock/pojo/StockInventory.java

@@ -63,7 +63,4 @@

    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty("净重")
    private BigDecimal netWeight;
}

 src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java

@@ -61,6 +61,7 @@
        stockInRecordDto.setRecordType(stockInventoryDto.getRecordType());
        stockInRecordDto.setStockInNum(stockInventoryDto.getQualitity());
        stockInRecordDto.setWeighingDate(stockInventoryDto.getWeighingDate());
        stockInRecordDto.setNetWeight(stockInventoryDto.getNetWeight());
        stockInRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
        stockInRecordDto.setType("0");
        stockInRecordService.add(stockInRecordDto);
@@ -71,7 +72,6 @@
            StockInventory newStockInventory = new StockInventory();
            newStockInventory.setProductModelId(stockInventoryDto.getProductModelId());
            newStockInventory.setQualitity(stockInventoryDto.getQualitity());
            newStockInventory.setNetWeight(stockInventoryDto.getNetWeight());
            newStockInventory.setVersion(1);
            newStockInventory.setRemark(stockInventoryDto.getRemark());
            newStockInventory.setLockedQuantity(stockInventoryDto.getLockedQuantity());

 src/main/resources/mapper/stock/StockInventoryMapper.xml

@@ -19,9 +19,6 @@
            <if test="ew.qualitity != null">
                qualitity = qualitity + #{ew.qualitity},
            </if>
            <if test="ew.netWeight != null">
                net_weight = net_weight + #{ew.netWeight},
            </if>
            <if test="ew.version != null">
                version = version + 1,
            </if>
@@ -59,8 +56,9 @@
        where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
    </update>
    <select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
        select si.id,
        si.net_weight,
        select
        si.id,
        COALESCE(sir.total_net_weight, 0) as net_weight,
        si.qualitity,
        COALESCE(si.locked_quantity, 0) as locked_quantity,
        si.product_model_id,
@@ -79,6 +77,13 @@
        left join product_model pm on si.product_model_id = pm.id
        left join product p on pm.product_id = p.id
        left join product p1 on p.parent_id = p1.id
        left join (
        select
        product_model_id,
        sum(net_weight) as total_net_weight
        from stock_in_record
        group by product_model_id
        ) sir on si.product_model_id = sir.product_model_id
        <where>
            1=1
            <if test="ew.parentId != null and ew.parentId !=''">