仓库字段调整 导入调整

liyong

8 小时以前 66e910032e4ef806749d958fa15cf3368d411ccd

仓库字段调整 导入调整

 src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java

@@ -15,10 +15,17 @@
@Data
public class ProductModelExportDto {

    @Excel(name = "产品名称")
    private String productName;

    @Excel(name = "规格型号")
    private String model;

    @Excel(name = "单位")
    @Excel(name = "主单位")
    private String unit;


    @Excel(name = "辅单位")
    private String subUnit;

}

 src/main/java/com/ruoyi/basic/pojo/ProductModel.java

@@ -39,9 +39,12 @@
    /**
     * 单位
     */
    @Excel(name = "单位")
    @Excel(name = "主单位")
    private String unit;

    @Excel(name = "辅单位")
    private String subUnit;

    /**
     * 生产炒机
     */

 src/main/java/com/ruoyi/stock/controller/StockInventoryController.java

@@ -57,7 +57,7 @@
    @ApiOperation("扣减库存")
    public R subtractStockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
        stockInventoryDto.setRecordType(String.valueOf(StockOutQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_OUT.getCode()));
        stockInventoryDto.setRecordId(0L);
        stockInventoryDto.setRecordId(stockInventoryDto.getId());
        return R.ok(stockInventoryService.subtractStockInventory(stockInventoryDto));
    }


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

@@ -14,6 +14,7 @@
    private String productName;
    private String model;
    private String unit;
    private String subUnit;


    //入库类型

 src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java

@@ -25,8 +25,14 @@
    @Excel(name = "主单位")
    private String unit;

    @Excel(name = "辅单位")
    private String subUnit;

    @Excel(name = "数量(主单位)")
    private BigDecimal qualitity;

    @Excel(name = "数量(辅单位)")
    private BigDecimal subQualitity;
//
//    @Excel(name = "最新更新时间")
//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -38,9 +38,12 @@
    @NotBlank(message = "不能为空")
    private Long productModelId;

    @ApiModelProperty("数量")
    @ApiModelProperty("数量(主单位)")
    private BigDecimal qualitity;

    @ApiModelProperty("数量(辅单位)")
    private BigDecimal subQualitity;

    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -65,7 +65,7 @@
        stockInRecordService.add(stockInRecordDto);
        //再进行新增库存数量库存
        //先查询库存表中的产品是否存在，不存在新增，存在更新   阳光彩印添加仓库编码， 添加比对仓库
        StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()).eq(StockInventory::getWarehouseCode,stockInventoryDto.getWarehouseCode()));
        StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()));
        if (ObjectUtils.isEmpty(oldStockInventory)) {
            StockInventory newStockInventory = new StockInventory();
            newStockInventory.setProductModelId(stockInventoryDto.getProductModelId());
@@ -96,7 +96,7 @@
        stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
        stockOutRecordDto.setType("0");
        stockOutRecordService.add(stockOutRecordDto);
        StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()));
        StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()).eq(StockInventory::getProductCode,stockInventoryDto.getProductCode()));
        if (ObjectUtils.isEmpty(oldStockInventory)) {
            throw new RuntimeException("产品库存不存在");
        }
@@ -127,6 +127,9 @@
            list.forEach(dto -> {
                boolean matched = false;
                for (SalesLedgerProduct item : salesLedgerProducts) {
                    if (ObjectUtils.isEmpty(dto.getWarehouseCode())) {
                        return;
                    }
                    if (item.getProductCategory().equals(dto.getProductName()) &&
                            item.getSpecificationModel().equals(dto.getModel())) {
                        StockInventoryDto stockInventoryDto = new StockInventoryDto();
@@ -136,6 +139,7 @@
                        stockInventoryDto.setRecordId(0L);
                        stockInventoryDto.setRecordType(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode());
                        stockInventoryDto.setQualitity(dto.getQualitity());
                        stockInventoryDto.setSubQualitity(dto.getSubQualitity());
                        stockInventoryDto.setProductModelId(item.getProductModelId());
                        this.addstockInventory(stockInventoryDto);
                        matched = true;

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

@@ -31,6 +31,15 @@
            <if test="ew.lockedQuantity != null and ew.lockedQuantity !=''">
                locked_quantity = locked_quantity + #{ew.lockedQuantity},
            </if>
            <if test="ew.warehouseCode != null and ew.warehouseCode !=''">
                warehouse_code = #{ew.warehouseCode},
            </if>
            <if test="ew.warehouseName != null and ew.warehouseName !=''">
                warehouse_name = #{ew.warehouseName},
            </if>
            <if test="ew.productCode != null and ew.productCode !=''">
                product_code = #{ew.productCode},
            </if>
            update_time = now()
        </set>
        where product_model_id = #{ew.productModelId}
@@ -73,6 +82,7 @@
        )
        select si.id,
        si.qualitity,
        si.sub_qualitity,
        COALESCE(si.locked_quantity, 0) as locked_quantity,
        si.product_model_id,
        si.create_time,
@@ -86,6 +96,7 @@
        si.warehouse_name,
        si.product_code,
        pm.unit,
        pm.sub_unit,
        p.product_name
        from stock_inventory si
        left join product_model pm on si.product_model_id = pm.id