农资管理添加农场过滤条件，修复出入库记录表删除回滚问题

guoshilong

2022-08-12 9d9928e3a79c202c1718f7fec7c154090627eaba

农资管理添加农场过滤条件，修复出入库记录表删除回滚问题

 src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml

@@ -57,6 +57,9 @@
        <if test="land.tenantId!=null and land.tenantId != ''">
            and l.tenant_id =#{land.tenantId}
        </if>
        <if test="land.farmId !=null and land.farmId !=''">
            AND l.farm_id = #{land.farmId}
        </if>
    </select>

    <!--查询地块列表（不分页）-->

 src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml

@@ -37,7 +37,8 @@
        a.dict_value AS stype,
        d.dict_value AS dic1,
        c.dict_value AS dic2,
        stf.agricultural_name as agrname
        stf.agricultural_name as agrname,
        st.dept_id
        FROM sys_soldr st
        LEFT JOIN sys_stockfactory stf ON stf.id = st.stock_id1
        LEFT JOIN (SELECT dict_key, dict_value
@@ -62,6 +63,9 @@
        <if test="soldr.stockId1!=null and soldr.stockId1 != ''">
            and st.stock_id1 = #{soldr.stockId1}
        </if>
        <if test="soldr.deptId != null and soldr.deptId !=''">
            AND st.dept_id = #{soldr.deptId}
        </if>
    </select>

    <delete id="del">

 src/main/java/org/springblade/modules/soldrecord/mapper/SoldrecordMapper.java

@@ -43,6 +43,6 @@
    List<SoldrecordVO> selectSoldrecordPage(IPage page, SoldrecordVO soldrecord);
    List<SoldrecordVO> selectLists(IPage page, SoldrecordVO soldrecord);
    List<SoldrecordVO> selectListbg(IPage page, SoldrecordVO soldrecord);
    void updateSold(@Param("amount") Integer amount,@Param("id") Long id, @Param("census") Double census);
    void updateSold(@Param("amount") Integer amount,@Param("sid") Long sid, @Param("census") Double census);
    void delc(String id);
}

 src/main/java/org/springblade/modules/soldrecord/mapper/SoldrecordMapper.xml

@@ -95,16 +95,20 @@
        AND blade_dict_biz.tenant_id = #{soldrecord.codes}
    </if>) b ON b.dict_key = st.type
        LEFT JOIN ( SELECT id, real_name FROM blade_user ) f ON f.id=st.create_user
        LEFT JOIN sys_stockrecord str ON str.sr_id = st.id
        WHERE st.is_deleted = 0
        <if test="soldrecord.stockId1!=null and soldrecord.stockId1 != ''">
            and st.sid= #{soldrecord.stockId1}
        </if>
        <if test="soldrecord.deptId != null and soldrecord.deptId !=''">
            and str.dept_id = #{soldrecord.deptId}
        </if>
    </select>

    <update id="updateSold">
        update sys_soldr
        set amount1=#{amount}, census=#{census}
        where id = #{id}
        where sid = #{sid}
    </update>

    <delete id="delc">

 src/main/java/org/springblade/modules/soldrecord/service/ISoldrecordService.java

@@ -40,6 +40,6 @@
    IPage<SoldrecordVO> selectSoldrecordPage(IPage<SoldrecordVO> page, SoldrecordVO soldrecord);
    IPage<SoldrecordVO> selectLists(IPage<SoldrecordVO> page, SoldrecordVO soldrecord);
    IPage<SoldrecordVO> selectListbg(IPage<SoldrecordVO> page, SoldrecordVO soldrecord);
    void updateSold(Integer amount,Long id,Double census);
    void updateSold(Integer amount,Long sid,Double census);
    void delc(String id);
}

 src/main/java/org/springblade/modules/soldrecord/service/impl/SoldrecordServiceImpl.java

@@ -49,8 +49,8 @@
    }

    @Override
    public void updateSold(Integer amount,Long id,Double census) {
        baseMapper.updateSold(amount,id,census);
    public void updateSold(Integer amount,Long sid,Double census) {
        baseMapper.updateSold(amount,sid,census);
    }

    @Override

 src/main/java/org/springblade/modules/soldrecord/vo/SoldrecordVO.java

@@ -40,4 +40,5 @@
    Integer cnum;
    String codes;
    String username;
    String deptId;
}

 src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml

@@ -54,7 +54,10 @@
            AND blade_dict_biz.tenant_id = #{stock.codes}
        </if>) a ON
        a.dict_key = stf.type
        WHERE st.is_deleted = 0 and state=0
        WHERE st.is_deleted = 0 and state=0 AND st.amount != 0
        <if test="stock.deptId !=null and stock.deptId !=''">
            and st.dept_id = #{stock.deptId}
        </if>
        <if test="stock.stype!=null and stock.stype != ''">
            and stf.type = #{stock.stype}
        </if>

 src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java

@@ -220,6 +220,7 @@
                soldr.setSpecsVal2(stockrecord.getSpecsVal2());
                soldr.setType(stockrecord.getType1());
                soldr.setCensus(v);
                soldr.setDeptId(stockrecord.getDeptId());
                //已出库农资数量
                List<Map<String, Object>> maps = soldrService.selectCz(stockrecord.getSid());
                if (maps.size()!=0) {
@@ -323,16 +324,16 @@
        Stockrecord stockRecord = stockrecordService.getById(ids);
        //根据stockRecord中的库存记录id找到对应的库存数据
        Stock stock = stockService.getById(stockRecord.getSid());
        //根据stockRecord中的srId找到对应的已出库记录表的对应数据
        Soldrecord soldrecord = soldrecordService.getById(stockRecord.getSrId());
        //根据stockId、specs1、specs_val1、specs_val2、sid、type找到soldr表中对应的数据
        Soldr soldr = soldrService.getByServalParam(soldrecord.getStockId1(),soldrecord.getSpecs1(),soldrecord.getSpecsVal1(),soldrecord.getSpecsVal2(),soldrecord.getSid(),soldrecord.getType());
        //对库存表操作
        //判断stockType1  0出库  1入库
        if (soldr.getAmount1()!=soldrecord.getAmount1()){
            throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
        }else {
            if (stockRecord.getStockType1() == 0) {
        if (stockRecord.getStockType1() == 0) {
            //根据stockRecord中的srId找到对应的已出库记录表的对应数据
            Soldrecord soldrecord = soldrecordService.getById(stockRecord.getSrId());
            //根据stockId、specs1、specs_val1、specs_val2、sid、type找到soldr表中对应的数据
            Soldr soldr = soldrService.getByServalParam(soldrecord.getStockId1(),soldrecord.getSpecs1(),soldrecord.getSpecsVal1(),soldrecord.getSpecsVal2(),soldrecord.getSid(),soldrecord.getType());
            if (soldr.getAmount1()<soldrecord.getAmount1()){//已出库农资的数量比出库记录表中的数量少，不能回退
                throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
            }else {
                //0出库     删除记录后原库存添加
                stock.setAmount(stock.getAmount() + stockRecord.getAmount1());
                //对已出库表操作   soldr出库数量记录表已出库农资减少     soldrecord出库记录表的数据也要删除
@@ -345,8 +346,13 @@
                    soldr.setAmount1(sub);
                    soldrService.updateById(soldr);
                }
            }
        }
        else {
            //1 入库    删除记录后原库存减少
            if (stockRecord.getAmount1() > stock.getAmount()) { //出入库记录表中的数量比库存的数量多不让回退
                throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
            } else {
                //1 入库    删除记录后原库存减少
                stock.setAmount(stock.getAmount() - stockRecord.getAmount1());
            }
        }

 src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml

@@ -89,6 +89,9 @@
        <if test="stockrecord.sid!=null and stockrecord.sid != ''">
            and st.sid = #{stockrecord.sid}
        </if>
        <if test="stockrecord.deptId != null and stockrecord.deptId !=''">
            and st.dept_id = #{stockrecord.deptId}
        </if>
        ORDER BY st.create_time desc
    </select>