[feat] 库存查询

库存查询主表,实体类,Mapper.xml文件新增:共享可用库存数、固定可用库存数、锁定库存数、盘亏数
所有与数量有关的数据都改为Integer类型
修改生产Bom实体类中的 委外工序数等数量相关的数据都改为Integer类型
修改生产Bom的实现类中的业务方法,把所有数量相关的数据由BigDecimal改为Integer类型
修改 仓库库存报损对象 所有与数量有关的数据都改为Integer类型
修改 仓库库存报损子表对象 所有与数量有关的数据都改为Integer类型
修改库存报损的实现类中的业务方法,把所有数量相关的数据由BigDecimal改为Integer类型
修改 仓库出库单和仓库入库单实现层方法,把入库数等库存查询相关的数据由BigDecimal改为Integer类型

ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderBom.java

@@ -94,24 +94,24 @@ public class SysMakeorderBom extends BaseEntity
     private Long sortNo;
 
 //    委外工序数
-    private int processNum;
+    private Integer processNum;
 
 //    已委外数量
-    private int hasOutNum;
+    private Integer hasOutNum;
 
 //    可用库存数
-    private BigDecimal storageNum;
+    private Integer storageNum;
 
 //    已领料数
-    private int hasPickNum;
+    private Integer hasPickNum;
 
 //    订单数量
-    private int orderNum;
+    private Integer orderNum;
 
 //    客户期望交付时间
     private Date deliveryTime;
 
-    private int finishNum;
+    private Integer finishNum;
 
 //    已完成数
     public void setId(Long id) 
@@ -285,67 +285,69 @@ public class SysMakeorderBom extends BaseEntity
         this.warehouseDept = warehouseDept;
     }
 
-    public int getProcessNum() {
+
+    public String getMaterialModel() {
+        return materialModel;
+    }
+
+    public void setMaterialModel(String materialModel) {
+        this.materialModel = materialModel;
+    }
+
+    public Date getDeliveryTime() {
+        return deliveryTime;
+    }
+
+    public void setDeliveryTime(Date deliveryTime) {
+        this.deliveryTime = deliveryTime;
+    }
+
+
+    public Integer getProcessNum() {
         return processNum;
     }
 
-    public void setProcessNum(int processNum) {
+    public void setProcessNum(Integer processNum) {
         this.processNum = processNum;
     }
 
-    public int getHasOutNum() {
+    public Integer getHasOutNum() {
         return hasOutNum;
     }
 
-    public void setHasOutNum(int hasOutNum) {
+    public void setHasOutNum(Integer hasOutNum) {
         this.hasOutNum = hasOutNum;
     }
 
-    public BigDecimal getStorageNum() {
+    public Integer getStorageNum() {
         return storageNum;
     }
 
-    public void setStorageNum(BigDecimal storageNum) {
+    public void setStorageNum(Integer storageNum) {
         this.storageNum = storageNum;
     }
 
-    public int getHasPickNum() {
+    public Integer getHasPickNum() {
         return hasPickNum;
     }
 
-    public void setHasPickNum(int hasPickNum) {
+    public void setHasPickNum(Integer hasPickNum) {
         this.hasPickNum = hasPickNum;
     }
 
-    public String getMaterialModel() {
+    public Integer getOrderNum() {
-        return materialModel;
-    }
-
-    public void setMaterialModel(String materialModel) {
-        this.materialModel = materialModel;
-    }
-
-    public int getOrderNum() {
         return orderNum;
     }
 
-    public void setOrderNum(int orderNum) {
+    public void setOrderNum(Integer orderNum) {
         this.orderNum = orderNum;
     }
 
-    public Date getDeliveryTime() {
+    public Integer getFinishNum() {
-        return deliveryTime;
-    }
-
-    public void setDeliveryTime(Date deliveryTime) {
-        this.deliveryTime = deliveryTime;
-    }
-
-    public int getFinishNum() {
         return finishNum;
     }
 
-    public void setFinishNum(int finishNum) {
+    public void setFinishNum(Integer finishNum) {
         this.finishNum = finishNum;
     }
 

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderBomServiceImpl.java

@@ -81,7 +81,7 @@ public class SysMakeorderBomServiceImpl implements ISysMakeorderBomService
 //            获取可用库存数
             WarehouseInventoryInquiry inquiry = inquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(bom.getMaterialNo());
             if(inquiry == null){
-                bom.setStorageNum(BigDecimal.ZERO);
+                bom.setStorageNum(0);
             }else{
                 bom.setStorageNum(inquiry.getAvailableStockNum());
             }

ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiry.java

@@ -67,27 +67,39 @@ public class WarehouseInventoryInquiry extends BaseEntity
 
     /** 物料历史总数量 */
     @Excel(name = "物料历史总数量", sort = 8)
-    private BigDecimal historicalTotal;
+    private Integer historicalTotal;
+
+    /** 共享可用库存数 */
+    private Integer sharedAvailableStockNum;
+
+    /** 固定可用库存数*/
+    private Integer fixedAvailableStockNum;
+
+    /** 锁定库存数*/
+    private Integer lockStockNum;
+
+    /** 盘亏数*/
+    private Integer stockLossesNum;
 
     /** 可用库存数 */
     @Excel(name = "可用库存数", sort = 9)
-    private BigDecimal availableStockNum;
+    private Integer availableStockNum;
 
     /** 物料归属可用库存数 */
 //    @Excel(name = "物料归属可用库存数")
-    private BigDecimal attributionAvailableStockNum;
+    private Integer attributionAvailableStockNum;
 
     /** 物料无归属可用库存数 */
 //    @Excel(name = "物料无归属可用库存数")
-    private BigDecimal noattributionAvailableStockNum;
+    private Integer noattributionAvailableStockNum;
 
     /** 物料使用数 */
     @Excel(name = "使用数", sort = 10)
-    private BigDecimal useNum;
+    private Integer useNum;
 
     /** 物料报损数 */
     @Excel(name = "报损数", sort = 11)
-    private BigDecimal reportDamageNum;
+    private Integer reportDamageNum;
 
     /** 物料使用状态（0 使用中、1 已作废） */
     @Excel(name = "使用状态", sort = 12, dictType = "useStatus")
@@ -200,61 +212,89 @@ public class WarehouseInventoryInquiry extends BaseEntity
     {
         return materialSpecification;
     }
-    public void setHistoricalTotal(BigDecimal historicalTotal)
+
-    {
+
+    public Integer getHistoricalTotal() {
+        return historicalTotal;
+    }
+
+    public void setHistoricalTotal(Integer historicalTotal) {
         this.historicalTotal = historicalTotal;
     }
 
-    public BigDecimal getHistoricalTotal()
+    public Integer getSharedAvailableStockNum() {
-    {
+        return sharedAvailableStockNum;
-        return historicalTotal;
     }
-    public void setAvailableStockNum(BigDecimal availableStockNum)
+
-    {
+    public void setSharedAvailableStockNum(Integer sharedAvailableStockNum) {
-        this.availableStockNum = availableStockNum;
+        this.sharedAvailableStockNum = sharedAvailableStockNum;
     }
 
-    public BigDecimal getAvailableStockNum()
+    public Integer getFixedAvailableStockNum() {
-    {
+        return fixedAvailableStockNum;
+    }
+
+    public void setFixedAvailableStockNum(Integer fixedAvailableStockNum) {
+        this.fixedAvailableStockNum = fixedAvailableStockNum;
+    }
+
+    public Integer getLockStockNum() {
+        return lockStockNum;
+    }
+
+    public void setLockStockNum(Integer lockStockNum) {
+        this.lockStockNum = lockStockNum;
+    }
+
+    public Integer getStockLossesNum() {
+        return stockLossesNum;
+    }
+
+    public void setStockLossesNum(Integer stockLossesNum) {
+        this.stockLossesNum = stockLossesNum;
+    }
+
+    public Integer getAvailableStockNum() {
         return availableStockNum;
     }
-    public void setAttributionAvailableStockNum(BigDecimal attributionAvailableStockNum)
+
-    {
+    public void setAvailableStockNum(Integer availableStockNum) {
-        this.attributionAvailableStockNum = attributionAvailableStockNum;
+        this.availableStockNum = availableStockNum;
     }
 
-    public BigDecimal getAttributionAvailableStockNum()
+    public Integer getAttributionAvailableStockNum() {
-    {
         return attributionAvailableStockNum;
     }
-    public void setNoattributionAvailableStockNum(BigDecimal noattributionAvailableStockNum)
+
-    {
+    public void setAttributionAvailableStockNum(Integer attributionAvailableStockNum) {
-        this.noattributionAvailableStockNum = noattributionAvailableStockNum;
+        this.attributionAvailableStockNum = attributionAvailableStockNum;
     }
 
-    public BigDecimal getNoattributionAvailableStockNum()
+    public Integer getNoattributionAvailableStockNum() {
-    {
         return noattributionAvailableStockNum;
     }
-    public void setUseNum(BigDecimal useNum)
+
-    {
+    public void setNoattributionAvailableStockNum(Integer noattributionAvailableStockNum) {
-        this.useNum = useNum;
+        this.noattributionAvailableStockNum = noattributionAvailableStockNum;
     }
 
-    public BigDecimal getUseNum()
+    public Integer getUseNum() {
-    {
         return useNum;
     }
-    public void setReportDamageNum(BigDecimal reportDamageNum)
+
-    {
+    public void setUseNum(Integer useNum) {
-        this.reportDamageNum = reportDamageNum;
+        this.useNum = useNum;
     }
 
-    public BigDecimal getReportDamageNum()
+    public Integer getReportDamageNum() {
-    {
         return reportDamageNum;
     }
-    public void setMaterialUseStatus(String materialUseStatus) 
+
+    public void setReportDamageNum(Integer reportDamageNum) {
+        this.reportDamageNum = reportDamageNum;
+    }
+
+    public void setMaterialUseStatus(String materialUseStatus)
     {
         this.materialUseStatus = materialUseStatus;
     }
@@ -307,6 +347,10 @@ public class WarehouseInventoryInquiry extends BaseEntity
             .append("materialModel", getMaterialModel())
             .append("materialSpecification", getMaterialSpecification())
             .append("historicalTotal", getHistoricalTotal())
+            .append("sharedAvailableStockNum", getSharedAvailableStockNum())
+            .append("fixedAvailableStockNum", getFixedAvailableStockNum())
+            .append("lockStockNum", getLockStockNum())
+            .append("stockLossesNum", getStockLossesNum())
             .append("availableStockNum", getAvailableStockNum())
             .append("attributionAvailableStockNum", getAttributionAvailableStockNum())
             .append("noattributionAvailableStockNum", getNoattributionAvailableStockNum())

ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamage.java

@@ -55,11 +55,11 @@ public class WarehouseInventoryReportDamage extends BaseEntity
 
     /** 物料数合计 */
     @Excel(name = "物料数合计")
-    private int materialTotal;
+    private Integer materialTotal;
 
     /** 数量合计 */
     @Excel(name = "数量合计")
-    private BigDecimal numTotal;
+    private Integer numTotal;
 
     /** 仓库ID */
     @Excel(name = "仓库ID")
@@ -198,25 +198,25 @@ public class WarehouseInventoryReportDamage extends BaseEntity
     {
         return materialName;
     }
-    public void setMaterialTotal(int materialTotal)
-    {
-        this.materialTotal = materialTotal;
-    }
 
-    public int getMaterialTotal()
+
-    {
+    public Integer getMaterialTotal() {
         return materialTotal;
     }
-    public void setNumTotal(BigDecimal numTotal)
+
-    {
+    public void setMaterialTotal(Integer materialTotal) {
-        this.numTotal = numTotal;
+        this.materialTotal = materialTotal;
     }
 
-    public BigDecimal getNumTotal()
+    public Integer getNumTotal() {
-    {
         return numTotal;
     }
-    public void setWarehouseCode(String warehouseCode) 
+
+    public void setNumTotal(Integer numTotal) {
+        this.numTotal = numTotal;
+    }
+
+    public void setWarehouseCode(String warehouseCode)
     {
         this.warehouseCode = warehouseCode;
     }

ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamageChild.java

@@ -59,7 +59,7 @@ public class WarehouseInventoryReportDamageChild extends BaseEntity
 
     /** 实际报废数量 */
     @Excel(name = "实际报废数量", sort = 6)
-    private BigDecimal actualScrapQuantity;
+    private Integer actualScrapQuantity;
 
     /** 报废类型 */
     @Excel(name = "报废类型", sort = 8)
@@ -189,16 +189,16 @@ public class WarehouseInventoryReportDamageChild extends BaseEntity
     {
         return materialBrand;
     }
-    public void setActualScrapQuantity(BigDecimal actualScrapQuantity) 
-    {
-        this.actualScrapQuantity = actualScrapQuantity;
-    }
 
-    public BigDecimal getActualScrapQuantity() 
+    public Integer getActualScrapQuantity() {
-    {
         return actualScrapQuantity;
     }
-    public void setScrapType(String scrapType) 
+
+    public void setActualScrapQuantity(Integer actualScrapQuantity) {
+        this.actualScrapQuantity = actualScrapQuantity;
+    }
+
+    public void setScrapType(String scrapType)
     {
         this.scrapType = scrapType;
     }

ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java

@@ -195,7 +195,7 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
         String loginName = ShiroUtils.getLoginName();
         warehouseInventoryReportDamage.setCreateBy(loginName);
         warehouseInventoryReportDamage.setCreateTime(DateUtils.getNowDate());
-        BigDecimal sumTotal = BigDecimal.ZERO;
+        Integer sumTotal = 0;
        //报损子表数据
         //判断子表数据是否为空
         if(StringUtils.isNotEmpty(warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList())){
@@ -206,7 +206,7 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
                     throw new BusinessException("物料"+reportDamageChild.getMaterialNo()+"库存查询记录为空！请检查");
                 }
                 //子表数据不为空，则插入子表数据
-                sumTotal = sumTotal.add(reportDamageChild.getActualScrapQuantity());
+                sumTotal += reportDamageChild.getActualScrapQuantity();
                 reportDamageChild.setMakeNo(warehouseInventoryReportDamage.getMakeNo());
                 reportDamageChild.setReportDamageCode(newCode);
                 if(warehouseInventoryReportDamage.getApplyTime()!=null){
@@ -242,12 +242,12 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
         if(detailInsertResult<=0){
             throw new BusinessException("新增库存历史失败！");
         }
-        BigDecimal reportDamageNum = inventoryInquiry.getReportDamageNum();
+//        BigDecimal reportDamageNum = inventoryInquiry.getReportDamageNum();
-        reportDamageNum = reportDamageNum.add(damageChild.getActualScrapQuantity());
+//        reportDamageNum = reportDamageNum.add(damageChild.getActualScrapQuantity());
-        inventoryInquiry.setReportDamageNum(reportDamageNum);
+//        inventoryInquiry.setReportDamageNum(reportDamageNum);
-        BigDecimal availableNum = inventoryInquiry.getAvailableStockNum();
+//        BigDecimal availableNum = inventoryInquiry.getAvailableStockNum();
-        availableNum = availableNum.subtract(damageChild.getActualScrapQuantity());
+//        availableNum = availableNum.subtract(damageChild.getActualScrapQuantity());
-        inventoryInquiry.setAvailableStockNum(availableNum);
+//        inventoryInquiry.setAvailableStockNum(availableNum);
         inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName());
         inventoryInquiry.setUpdateTime(DateUtils.getNowDate());
         return inventoryInquiryMapper.updateWarehouseInventoryInquiry(inventoryInquiry);
@@ -264,7 +264,7 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
 //        inquiryDetail.setMaterialUnit(damageChild.getMaterialUnit());
 //        inquiryDetail.setMaterialType(damageChild.getMaterialType());
         inquiryDetail.setInventoryIncreaseDecrease("0");
-        BigDecimal decreaseNum = damageChild.getActualScrapQuantity();
+        Integer decreaseNum = damageChild.getActualScrapQuantity();
 //        inquiryDetail.setAvailableStockNum(decreaseNum);
         inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate());
         inquiryDetail.setCreateBy(ShiroUtils.getLoginName());
@@ -283,13 +283,13 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
         String loginName = ShiroUtils.getLoginName();
         warehouseInventoryReportDamage.setUpdateBy(loginName);
         warehouseInventoryReportDamage.setUpdateTime(DateUtils.getNowDate());
-        BigDecimal sumTotal = BigDecimal.ZERO;
+        Integer sumTotal = 0;
         if(StringUtils.isNotEmpty(warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList())){
             //清除现在的子表信息
             warehouseInventoryReportDamageChildService.deleteWarehouseInventoryReportDamageChildByCode(warehouseInventoryReportDamage.getReportDamageCode());
             for(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild:warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList()){
                 //子表数据不为空，则插入子表数据
-                sumTotal = sumTotal.add(warehouseInventoryReportDamageChild.getActualScrapQuantity());
+                sumTotal += warehouseInventoryReportDamageChild.getActualScrapQuantity();
                 warehouseInventoryReportDamageChild.setMakeNo(warehouseInventoryReportDamage.getMakeNo());
                 warehouseInventoryReportDamageChild.setReportDamageCode(warehouseInventoryReportDamage.getReportDamageCode());
                 warehouseInventoryReportDamageChild.setCreateTime(DateUtils.getNowDate());

ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java

@@ -568,16 +568,16 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
     //    更新物料对应库存查询记录
     public int updateWarehouseInventoryInquiry(WarehouseOutOrderDetail outOrderDetail,WarehouseInventoryInquiry inventoryInquiry){
 //              更新可用库存数
-        BigDecimal stockNum = inventoryInquiry.getAvailableStockNum();
+        Integer stockNum = inventoryInquiry.getAvailableStockNum();
-        if((stockNum.compareTo(BigDecimal.ZERO) <= 0)){
+        if(stockNum <= 0){
             throw new BusinessException("出库失败！该物料无可用库存数");
         }
         int outNum = outOrderDetail.getActualOutOrderSum();
-        stockNum = stockNum.subtract(BigDecimal.valueOf(outNum));
+        stockNum -= outNum;
         inventoryInquiry.setAvailableStockNum(stockNum);
 //              更新使用数
-        BigDecimal useNum = inventoryInquiry.getUseNum();
+        Integer useNum = inventoryInquiry.getUseNum();
-        useNum = useNum.add(BigDecimal.valueOf(outNum));
+        useNum += outNum;
         inventoryInquiry.setUseNum(useNum);
 
         inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName());

ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java

@@ -736,11 +736,11 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
         }
         //查询该物料报损数，更新库存查询报损数
         List<WarehouseInventoryReportDamageChild> damageChildren = damageChildMapper.selectWarehouseInventoryReportDamageChildByMaterialNo(materialNo);
-        BigDecimal scrapSum = BigDecimal.ZERO;
+        Integer scrapSum = 0;
         if(StringUtils.isNotEmpty(damageChildren)){
             for (WarehouseInventoryReportDamageChild damageChild:damageChildren) {
-                BigDecimal scrapNum = damageChild.getActualScrapQuantity();
+                Integer scrapNum = damageChild.getActualScrapQuantity();
-                scrapSum = scrapSum.add(scrapSum);
+                scrapSum += scrapSum;
             }
         }
 //      存在库存查询记录，更新可用库存数
@@ -748,14 +748,14 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
             WarehouseInventoryInquiry inventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo);
 //      增加可用库存数
             Integer storage = warehouseStorageOrderDetail.getStorageNum();
-            BigDecimal storagenum = BigDecimal.valueOf(storage);
+            Integer storagenum = storage;
-            BigDecimal avaliableStorage = inventoryInquiry.getAvailableStockNum();
+            Integer avaliableStorage = inventoryInquiry.getAvailableStockNum();
-            avaliableStorage = avaliableStorage.add(storagenum);
+            avaliableStorage += storagenum;
             inventoryInquiry.setAvailableStockNum(avaliableStorage);
             inventoryInquiry.setReportDamageNum(scrapSum);
 //      设置历史总数
-            BigDecimal historicalTotal = inventoryInquiry.getHistoricalTotal();
+            Integer historicalTotal = inventoryInquiry.getHistoricalTotal();
-            historicalTotal = historicalTotal.add(storagenum);
+            historicalTotal += storagenum;
             inventoryInquiry.setHistoricalTotal(historicalTotal);
             inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName());
             inventoryInquiry.setUpdateTime(DateUtils.getNowDate());
@@ -771,7 +771,7 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
             inventoryInquiry.setMaterialType(warehouseStorageOrderDetail.getMaterialType());
             inventoryInquiry.setMaterialProcessMethod(warehouseStorageOrderDetail.getMaterialProcessMethod());
             Integer storage = warehouseStorageOrderDetail.getStorageNum();
-            BigDecimal storagenum = BigDecimal.valueOf(storage);
+            Integer storagenum = storage;
             //      设置历史总数
             inventoryInquiry.setHistoricalTotal(storagenum);
             inventoryInquiry.setAvailableStockNum(storagenum);

ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml

@@ -18,6 +18,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialSpecification"            column="material_specification"    />
         <result property="warehouseDept"                    column="warehouse_dept"    />
         <result property="historicalTotal"                  column="historical_total"    />
+        <result property="sharedAvailableStockNum"          column="shared_available_stock_num"/>
+        <result property="lockStockNum"                     column="lock_stock_num"    />
+        <result property="fixedAvailableStockNum"           column="fixed_available_stock_num"    />
+        <result property="stockLossesNum"                   column="stock_losses_num"    />
         <result property="availableStockNum"                column="available_stock_num"    />
         <result property="attributionAvailableStockNum"     column="attribution_available_stock_num"    />
         <result property="noattributionAvailableStockNum"   column="noattribution_available_stock_num"    />
@@ -35,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select inventory_inquiry_id, material_no, material_name, material_type,
                material_photoUrl, material_brand, material_unit, material_describe,
                material_process_method, material_model, material_specification,warehouse_dept,
-               historical_total, available_stock_num, attribution_available_stock_num,
+               historical_total, shared_available_stock_num, lock_stock_num, fixed_available_stock_num, stock_losses_num,available_stock_num, attribution_available_stock_num,
                noattribution_available_stock_num, use_num, report_damage_num, material_use_status,
                remark, create_time, create_by, update_by, update_time
         from warehouse_inventory_inquiry
@@ -83,6 +87,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialSpecification != null">material_specification,</if>
             <if test="warehouseDept != null">warehouse_dept,</if>
             <if test="historicalTotal != null">historical_total,</if>
+            <if test="sharedAvailableStockNum != null">shared_available_stock_num,</if>
+            <if test="lockStockNum != null">lock_stock_num,</if>
+            <if test="fixedAvailableStockNum != null">fixed_available_stock_num,</if>
+            <if test="stockLossesNum != null">stock_losses_num,</if>
             <if test="availableStockNum != null">available_stock_num,</if>
             <if test="attributionAvailableStockNum != null">attribution_available_stock_num,</if>
             <if test="noattributionAvailableStockNum != null">noattribution_available_stock_num,</if>
@@ -108,6 +116,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialSpecification != null">#{materialSpecification},</if>
             <if test="warehouseDept != null">#{warehouseDept},</if>
             <if test="historicalTotal != null">#{historicalTotal},</if>
+            <if test="sharedAvailableStockNum != null">#{sharedAvailableStockNum},</if>
+            <if test="lockStockNum != null">#{lockStockNum},</if>
+            <if test="fixedAvailableStockNum != null">#{fixedAvailableStockNum},</if>
+            <if test="stockLossesNum != null">#{stockLossesNum},</if>
             <if test="availableStockNum != null">#{availableStockNum},</if>
             <if test="attributionAvailableStockNum != null">#{attributionAvailableStockNum},</if>
             <if test="noattributionAvailableStockNum != null">#{noattributionAvailableStockNum},</if>
@@ -137,6 +149,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialSpecification != null">material_specification = #{materialSpecification},</if>
             <if test="warehouseDept != null">warehouse_dept = #{warehouseDept},</if>
             <if test="historicalTotal != null">historical_total = #{historicalTotal},</if>
+            <if test="sharedAvailableStockNum != null">shared_available_stock_num = #{sharedAvailableStockNum},</if>
+            <if test="lockStockNum != null">lock_stock_num = #{lockStockNum},</if>
+            <if test="fixedAvailableStockNum != null">fixed_available_stock_num = #{fixedAvailableStockNum},</if>
+            <if test="stockLossesNum != null">stock_losses_num = #{stockLossesNum},</if>
             <if test="availableStockNum != null">available_stock_num = #{availableStockNum},</if>
             <if test="attributionAvailableStockNum != null">attribution_available_stock_num = #{attributionAvailableStockNum},</if>
             <if test="noattributionAvailableStockNum != null">noattribution_available_stock_num = #{noattributionAvailableStockNum},</if>