李宇
2021-02-07 422622d3121acde709e79ca9b92f30c47e05272c
修改枪领用
已修改3个文件
5 ■■■■■ 文件已修改
src/main/java/com/nanometer/smartlab/dao/SysWarehouseContainerDao.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/dao/SysWarehouseContainerDao.xml
@@ -49,7 +49,7 @@
    <if test="warehouseId != null and warehouseId != ''">
      and ss.id like #{warehouseId}
    </if>
    order by ss.name ASC
    order by ss.name ASC,su.create_time DESC
    <if test="first != null and pageSize != null">
      limit #{first}, #{pageSize}
    </if>
src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
@@ -69,7 +69,7 @@
            }
            if(opeUseFlow.getCreateTime()==null){
                opeUseFlow.setCreateTime(new Timestamp(System.currentTimeMillis()));
                opeUseFlow.setCreateTime(new Timestamp(System.currentTimeMillis()+1000));
            }
            this.opeUseFlowDao.insertOpeUseFlow(opeUseFlow);
src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java
@@ -339,7 +339,6 @@
            ors.setContainerId(reagentReceiving.getLabContainerId());
            ors.setHouseId(reagentReceiving.getLabId());
            ors.setUserId(reagentReceiving.getApplyUserId());
            opeReagentStatusService.updateReagentStatus(ors);
            if (opeReagentStatusService.isAllowWarehouseUse(ors)) {
                // 减少库存