修改枪领用

李宇

2021-02-07 422622d3121acde709e79ca9b92f30c47e05272c

修改枪领用

 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>
@@ -79,7 +79,7 @@
  </insert>

  <update id="updateSysWarehouseContainer" parameterType="com.nanometer.smartlab.entity.SysWarehouseContainer">
    update sys_warehouse_container set warehouse_id=#{warehouseId}, type=#{type}, container_code=#{containerCode}, 
    update sys_warehouse_container set warehouse_id=#{warehouseId}, type=#{type}, container_code=#{containerCode},
    info_code=#{infoCode}, structure=#{structure}, name=#{name}, character_left=#{characterLeft}, character_right=#{characterRight},
    update_time=now(),
    controller_code=#{controllerCode}

 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)) {
                // 减少库存