领用添加备注，个人领用页面查看

lyfO_o

2021-10-22 fe59eb7ea9e69a14f5a7b7ddabd244f2dc134788

领用添加备注，个人领用页面查看

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

@@ -170,6 +170,7 @@
        printTable.put("project", selectOne.getProject());
        SysLaboratory sysLaboratory = sysLaboratoryService.getSysLaboratory(selectOne.getHouseId());
        printTable.put("lab", sysLaboratory.getName());
        printTable.put("note",selectOne.getNote() == null?"":selectOne.getNote());
        //整理数据
        List<PersonUseDetail> applyInfo = opeUseFlowService.getApplyInfo(selectOne.getReceiptNumber());
        assert applyInfo.size() > 0;

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

@@ -220,6 +220,8 @@
    //private boolean flag = false;
    //领用单号
    private String receiptNumber;
    //备注
    private String note;
    // 试剂库
    private LazyDataModel<SysReagent> reagentDataModel;
    // 直接入库试剂List
@@ -1271,7 +1273,7 @@
     */
    public void associatedFlowReceiptNumber() {
        try {
            opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber);
            opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber, note);
            //弹出打印窗口
            RequestContext.getCurrentInstance().execute("document.getElementById('indirectPrint').click()");
        } catch (Exception e) {
@@ -1287,7 +1289,7 @@

    public void associatedFlowReceiptNumber2() {
        try {
            opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber);
            opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber,note);
            //弹出打印窗口
            RequestContext.getCurrentInstance().execute("document.getElementById('indirectPrint').click()");
        } catch (Exception e) {
@@ -1299,7 +1301,7 @@

    public void closeDialog() {
        try {
            opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber);
            opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber,note);
            onCancelBtnClick();
        } catch (Exception e) {
            logger.info(e.getMessage());
@@ -1309,7 +1311,7 @@

    public void closeDialog2() {
        try {
            opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber);
            opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber,note);
            onCancelBtnClick();
        } catch (Exception e) {
            logger.info(e.getMessage());
@@ -1648,7 +1650,7 @@

                    sum += list2.get(i).getSelectNum();
                }
                this.opeWarehouseReserveService.reagentDStore4(opeList,userId);
                this.opeWarehouseReserveService.reagentDStore4(opeList,userId,receiptNum);
                for(int i=0;i<list2.size();i++){

                    List<String> reagentCodes = opeReagentStatusService
@@ -3196,4 +3198,12 @@
        opeApplyService.updateOpeApplyStatus(ApplyStatus.SUPPLIER_CONFIRM, null, ids);
        FacesUtils.warn("操作成功。");
    }

    public String getNote() {
        return note;
    }

    public void setNote(String note) {
        this.note = note;
    }
}

 src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.java

@@ -31,7 +31,7 @@

    OpeUseFlow getOpeUseFlowByCode(@Param("reagentCode") String reagentCode);

    void updateReceiptNumber(String code, String receiptNumber);
    void updateReceiptNumber(String code, String receiptNumber,String note);

    List<Map> getRegentInfoFromReceiptNumber(String receiptNumber);


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

@@ -52,6 +52,7 @@
    <update id="updateReceiptNumber">
        update ope_use_flow
        set receipt_number = #{1}
        , note = #{2}
        where reagent_code = #{0}
    </update>
    <sql id="queryWhereSql">
@@ -232,6 +233,7 @@
    </select>
    <select id="selectPersonalUseInfo" resultType="com.nanometer.smartlab.entity.OpeUseFlow">
        SELECT ouf.receipt_number receiptNumber,
        ouf.note,
        count(ouf.reagent_code) applyNum,
        su.name username,
        su.project ,
@@ -345,6 +347,7 @@
    </select>
    <select id="selectByReceiptNumber" resultType="com.nanometer.smartlab.entity.OpeUseFlow">
        SELECT ouf.receipt_number receiptNumber,
        ouf.note,
        count(ouf.reagent_code) applyNum,
        su.name username,
        su.project ,

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

@@ -42,6 +42,7 @@
    private String operatestateName;
    private String operateState;
    private String receiptNumber;
    private String note;
    //人员信息
    private String project;
    private String phone;
@@ -278,4 +279,12 @@
    public void setPhone(String phone) {
        this.phone = phone;
    }

    public String getNote() {
        return note;
    }

    public void setNote(String note) {
        this.note = note;
    }
}

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

@@ -38,15 +38,15 @@

    OpeUseFlow getOpeUseFlowByCode(String reagentCode);

    void updateReceiptNumber(String code, String receiptNumber);
    void updateReceiptNumber(String code, String receiptNumber,String note);

    void updateReceiptNumberByCode(List<OpeApplyReserve> codeTmp,String receiptNumber);
    void updateReceiptNumberByCode(List<OpeApplyReserve> codeTmp,String receiptNumber,String note);

    Map<String, Integer> getRegentInfoFromReceiptNumber(String receiptNumber);

    Map<String,String>  getApplyUserByReagentCode(String reagentCode);

    void updateReceiptNumberByCode2(List<OpeWarehouseReserve> codeTmp, String receiptNumber);
    void updateReceiptNumberByCode2(List<OpeWarehouseReserve> codeTmp, String receiptNumber,String note);

    int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName);


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

@@ -374,12 +374,12 @@
    }

    @Override
    public void updateReceiptNumber(String code, String receiptNumber) {
        opeUseFlowDao.updateReceiptNumber(code, receiptNumber);
    public void updateReceiptNumber(String code, String receiptNumber,String note) {
        opeUseFlowDao.updateReceiptNumber(code, receiptNumber,note);
    }

    @Transactional
    public void updateReceiptNumberByCode(List<OpeApplyReserve> selectedTmpOrderList,String receiptNumber) {
    public void updateReceiptNumberByCode(List<OpeApplyReserve> selectedTmpOrderList,String receiptNumber,String note) {

        for (OpeApplyReserve oar : selectedTmpOrderList) {
            if (oar.getFlag() == 1) {
@@ -387,14 +387,14 @@
                for (String statusId : oar.getReagentCode()) {
                    String code = opeReagentStatusService.getOpeReagentStatus(statusId).getReagentCode();
                    //此时状态为领用待入库
                    this.updateReceiptNumber(code, receiptNumber);
                    this.updateReceiptNumber(code, receiptNumber,note);
                }
            }else{
                //根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
                List<String> codeTmp = opeReagentStatusService
                        .generateReagentCode(oar.getStartReagentCode2(), oar.getEndReagentCode2());
                for (String code : codeTmp) {
                    this.updateReceiptNumber(code, receiptNumber);
                    this.updateReceiptNumber(code, receiptNumber,note);
                }
            }

@@ -432,21 +432,21 @@
    }

    @Override
    public void updateReceiptNumberByCode2(List<OpeWarehouseReserve> selectTmpList, String receiptNumber) {
    public void updateReceiptNumberByCode2(List<OpeWarehouseReserve> selectTmpList, String receiptNumber,String note) {
        for (OpeWarehouseReserve owr : selectTmpList) {
            if (owr.getFlag() == 1) {
                //库中领取 code存的是 试剂状态的id
                for (String statusId : owr.getReagentCodes()) {
                    String code = opeReagentStatusService.getOpeReagentStatus(statusId).getReagentCode();
                    //此时状态为领用待入库
                    this.updateReceiptNumber(code, receiptNumber);
                    this.updateReceiptNumber(code, receiptNumber,note);
                }
            }else{
                //根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
                List<String> codeTmp = opeReagentStatusService
                        .generateReagentCode(owr.getStartReagentCode2(), owr.getEndReagentCode2());
                for (String code : codeTmp) {
                    this.updateReceiptNumber(code, receiptNumber);
                    this.updateReceiptNumber(code, receiptNumber,note);
                }
            }


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

@@ -33,7 +33,7 @@

    void reagentDStore3(List<OpeApply> reagentDStoreList, String loginUserId);

    void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId);
    void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId,String receiptNumber);

    public List<OpeWarehouseReserve> selectByReId(String id);
    public void updateByReId(String newReId,String oldReId);

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

@@ -443,7 +443,7 @@
        }
    }

    public void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId){
    public void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId,String receiptNumber){
        if (reagentDStoreList == null) {
            return;
        }
@@ -518,6 +518,7 @@
                    metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
                    List<BaseMeta> baseMetaList2 = baseMetaDao.getBaseMetaList(metaMap2);
                    ouf.setOperateState(baseMetaList2.get(0).getId());
                    ouf.setReceiptNumber(receiptNumber);
                    this.opeUseFlowService.insertOpeUseFlow(ouf);
                }
            }

 src/main/webapp/personal_use_info.xhtml

@@ -234,7 +234,7 @@
                        </div>
                    </div>

                    <div style="margin-bottom: 20px;">
                    <div style="margin-bottom: 10px;">
                        <div style="display: inline-flex;">
                            <div style="width: 100px;margin-left: 10px;">课题组：</div>
                            <div style="width: 300px;">#{personalUseInfoController.printTable['project']}</div>
@@ -249,6 +249,13 @@
                        </div>
                    </div>

                    <div style="margin-bottom: 20px;">
                        <div style="display: inline-flex;">
                            <div style="width: 100px;margin-left: 10px;">备注：</div>
                            <div>#{personalUseInfoController.printTable['note']}</div>
                        </div>
                    </div>





 src/main/webapp/warehouse_reagent_use.xhtml

@@ -237,7 +237,7 @@
                </div>
            </div>

            <div style="margin-bottom: 20px;">
            <div style="margin-bottom: 10px;">
                <div style="display: inline-flex;">
                    <div style="width: 100px;margin-left: 10px;">课题组</div>
                    <div style="width: 300px;">#{warehouseStockMngController.printTable['project']}</div>
@@ -253,6 +253,16 @@
                </div>
            </div>

            <div style="margin-bottom: 20px;">
                <div style="display: inline-flex;">
                    <div style="width: 100px;margin-left: 10px;">备注</div>
                    <div style="">
                        <p:inputText value="#{warehouseStockMngController.note}" style="width: 950px;">
                        <p:ajax event="valueChange"   />
                        </p:inputText></div>
                </div>
            </div>



        <p:dataTable id="printTB" styleClass="apply-list"

 src/main/webapp/warehouse_reagent_use_person.xhtml

@@ -151,7 +151,7 @@
                        </div>
                    </div>

                    <div style="margin-bottom: 20px;">
                    <div style="margin-bottom: 10px;">
                        <div style="display: inline-flex;">
                            <div style="width: 100px;margin-left: 10px;">课题组：</div>
                            <div style="width: 300px;">#{warehouseStockMngController.printTable['project']}</div>
@@ -167,6 +167,16 @@
                        </div>
                    </div>

                    <div style="margin-bottom: 20px;">
                        <div style="display: inline-flex;">
                            <div style="width: 100px;margin-left: 10px;">备注</div>
                            <div style="">
                                <p:inputText value="#{warehouseStockMngController.note}" style="width: 950px;">
                                    <p:ajax event="valueChange"   />
                                </p:inputText></div>
                        </div>
                    </div>