修改仓库领用模块：补贴条码入库显示人员信息

gdg

2021-01-29 3133c40cf7f5467db6c172b436f509c85e096eff

修改仓库领用模块：补贴条码入库显示人员信息

 src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java

@@ -1148,7 +1148,7 @@
                this.opeWarehouseReserveService.reagentDStore3(opeList,userId);

                //扣库存
                opeWarehouseReserveService.btWarehouseReserveReduce(list2,userId);
                opeWarehouseReserveService.btWarehouseReserveReduce(list2);
            }

            for(int i=0;i<list2.size();i++){
@@ -1593,7 +1593,7 @@
                        opeUseFlow.setHouseId(list2.get(i).getWarehouseId());
                        opeUseFlow.setContainerId(warehouseReserveInfo.get(0).getContainerId());
                        opeUseFlow.setCreateTime(warehouseReserveInfo.get(0).getUpdateTime());
                        opeUseFlow.setUserId(userId);
                        opeUseFlow.setUserId(warehouseReserveInfo.get(0).getUserId());
                        opeUseFlow.setRemainder(list2.get(i).getReagent().getMainMetering()!=null?list2.get(i).getReagent().getMainMetering():new BigDecimal(0));
                        opeUseFlow.setStoreType(StoreType.DIRECTSTORE);


 src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml

@@ -12,6 +12,7 @@
    <result property="validFlag" column="valid_flag" typeHandler="com.nanometer.smartlab.entity.handler.ValidFlagHandler"></result>

    <result property="reagentId" column="reagent_id"></result>
    <result property="userId" column="user_id"></result>
    <association property="reagent" javaType="com.nanometer.smartlab.entity.SysReagent">
          <id property="id" column="reagentId"/>
        <result property="name" column="name"></result>
@@ -106,12 +107,12 @@
  </select>

    <insert id="insertOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
        insert into ope_warehouse_reserve(id, reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,container_id)
        values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{containerId})
        insert into ope_warehouse_reserve(id, reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,container_id,user_id)
        values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{containerId},#{userId})
    </insert>
    <insert id="insertOpeWarehouseReserve2" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
        insert into ope_warehouse_reserve(id, reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,apply_code,order_code,container_id)
        values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{applyCode},#{orderCode},#{containerId})
        insert into ope_warehouse_reserve(id, reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,apply_code,order_code,container_id,user_id)
        values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{applyCode},#{orderCode},#{containerId},#{userId})
    </insert>

    <update id="updateOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
@@ -126,6 +127,9 @@
        </if>
        <if test="warehouseId != null and warehouseId !=''">
            warehouseId=#{warehouseId},
        </if>
        <if test="userId != null and userId !=''">
            user_id=#{userId},
        </if>
        </set>
        where id=#{id}
@@ -174,6 +178,7 @@
        owr.reserve,
        owr.article_number,
        owr.container_id,
        owr.user_id,
        owr.update_time
        FROM
        ope_warehouse_reserve owr

 src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java

@@ -32,6 +32,7 @@
    private String orderCode;
    //新增 货柜id
    private String containerId;
    private String userId;


    /**
@@ -199,4 +200,12 @@
    public void setContainerId(String containerId) {
        this.containerId = containerId;
    }

    public String getUserId() {
        return userId;
    }

    public void setUserId(String userId) {
        this.userId = userId;
    }
}

 src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java

@@ -678,12 +678,12 @@
            if (codeList == null){
                //无条码入库 不需要增加状态和流向
                //1.1库存表增加
                opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo);
                opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId);
            }else{
                //条码入库
                assert codeList.size() > 0;
                //1.1入库(库存表增加)
                opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo);
                opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId);
                //1.2试剂状态表增加,流向增加
                opeReagentStatusService.orderInputWarehouseReagentStatusAndUseFlow(opeApplyReserve,consigneeId,codeList,oo);
            }

 src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java

@@ -38,11 +38,11 @@
    public List<OpeWarehouseReserve> selectByReId(String id);
    public void updateByReId(String newReId,String oldReId);

    void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo);
    void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo,String consigneeId);

    List<OpeWarehouseReserve> selectWarehouseByReagentIdAndArticleNumber(String id,String articleNumber,boolean flag);

    void btWarehouseReserveReduce(List<OpeApplyReserve> opeList,String userId);
    void btWarehouseReserveReduce(List<OpeApplyReserve> opeList);

    List<OpeWarehouseReserve> selectWarehouseByRidAndArticleNumberAndWarehouse(String id, String articleNumber, String warehouseId);


 src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java

@@ -596,7 +596,7 @@

    @Override
    @Transactional
    public void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo) {
    public void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo,String consigneeId) {

        OpeWarehouseReserve ope = this.opeWarehouseReserveService
                .getOpeWarehouseReserve2(opeApplyReserve.getReagent().getId(), opeApplyReserve.getArticleNumber(),opeApplyReserve.getHouseId());
@@ -618,6 +618,8 @@
            //批号
            ope.setArticleNumber(opeApplyReserve.getArticleNumber());
            ope.setId(IDUtils.uuid());
            //新增收货人 保存在仓库库存表
            ope.setUserId(consigneeId);
            opeWarehouseReserveDao.insertOpeWarehouseReserve2(ope);
        }else {
            ope.setReserve(ope.getReserve() + opeApplyReserve.getArrivalNum());
@@ -677,7 +679,7 @@
    }

    @Override
    public void btWarehouseReserveReduce(List<OpeApplyReserve> opeList,String userId) {
    public void btWarehouseReserveReduce(List<OpeApplyReserve> opeList) {
        if (opeList.size() < 1) {
            return;
        }
@@ -712,7 +714,7 @@
                            OpeUseFlow opeUseFlow = new OpeUseFlow();
                            opeUseFlow.setReagentCode(reagentCodes.get(0));
                            opeUseFlow.setStatus(ArrivalStatus.WAREHOUSE);
                            opeUseFlow.setUserId(userId);
                            opeUseFlow.setUserId(warehouseReserve.getUserId());
                            //仓库地点
                            opeUseFlow.setHouseId(warehouseReserve.getWarehouseId());
                            opeUseFlow.setContainerId(warehouseReserve.getContainerId());
@@ -829,6 +831,7 @@
                opeWarehouseReserve.setReserve(0);
                opeWarehouseReserve.setWarehouseId(opeApply.getHouseId());
                opeWarehouseReserve.setContainerId(opeApply.getContainerId());
                opeWarehouseReserve.setUserId(loginUserId);
            }
            opeWarehouseReserve.setReserve(opeWarehouseReserve.getReserve() + opeApply.getArrivalNum());
            if (StringUtils.isBlank(opeWarehouseReserve.getId())) {

 src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java

@@ -307,6 +307,7 @@
                    opeWarehouseReserve.setArticleNumber(inWarehouseInfo.getArticleNumber());
                    opeWarehouseReserve.setReserve(0);
                    opeWarehouseReserve.setWarehouseId(inWarehouseInfo.getWarehouseId());
                    opeWarehouseReserve.setUserId("admin");
                }
                //库存加1
                opeWarehouseReserve.setReserve(opeWarehouseReserve.getReserve() + 1);