Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-02 05f71eff9a356615db7629e8a439d451dfab60f7

Merge remote-tracking branch 'remotes/origin/yufei' into master

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

@@ -412,8 +412,14 @@
                    return;
                }

                // 检查ARP号
                if (this.sysUserService.isSysUserExist(this.sysUser.getArp(), null, null, this.sysUser.getId())) {
                // 检查ARP号 //除自己外的arp
//                if (this.sysUserService.isSysUserExist(this.sysUser.getArp(), null, null, this.sysUser.getId())) {
//                    FacesUtils.warn("ARP已存在。");
//                    return;
//                }
                List<SysUser> list = sysUserService.getUserByArp(this.sysUser.getArp());
                assert list.size() < 2;
                if (list.size() > 0 && !list.get(0).getId().equals(this.sysUser.getId())) {
                    FacesUtils.warn("ARP已存在。");
                    return;
                }

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

@@ -51,4 +51,6 @@
    HazardousWasteUser getUserByAccount(Map params);

    List<LaboratoryVo.LaboratoryUser> getUserByProject(@Param("project") String project);

    List<SysUser> getUserByArp(String arp);
}

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

@@ -272,6 +272,10 @@
    AND waster = '1'
    AND project = #{project};
    </select>
    <select id="getUserByArp" resultMap="SysUser">
        select * from sys_user
        where arp = #{0} and valid_flag = 1
    </select>
    <update id="updateUserPointBySelective" parameterType="java.util.Map">
    update sys_user set point=#{point}
    <where>

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

@@ -44,4 +44,6 @@
    HazardousWasteUser getUserByAccount(String account,String name);

    List<LaboratoryVo.LaboratoryUser> getUserByProject(String project);

    List<SysUser> getUserByArp(String arp);
}

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

@@ -369,5 +369,10 @@
        return sysUserDao.getUserByProject(project);
    }

    @Override
    public List<SysUser> getUserByArp(String arp) {
        return sysUserDao.getUserByArp(arp);
    }


}

 src/main/webapp/login.xhtml

@@ -16,7 +16,7 @@


</h:head>
<h:body style="margin: 0px">
<h:body style="margin: 0px;height: 100%">
    <div class="login">
        <div name="north" style="background: url(resources/images/head_bg.png) no-repeat;background-size: 100% 100%;">
            <h:form id="northForm">

 src/main/webapp/personal_use_info.xhtml

@@ -196,13 +196,13 @@
        </h:form>
    </p:dialog>
    <p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false"
              width="1380">
              width="1258">
        <div id="printTarget">
            <div style=" margin: 20mm 27mm 0mm 30mm;">
            <div style=" margin: 20mm 16mm 0mm 10mm;">
                <h:form id="printDialog" style="width: 1100px">

                    <p:outputPanel style="text-align: center;font-size: 14px;font-weight: 700;">#{personalUseInfoController.printTable['head']}</p:outputPanel>
                    <p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{personalUseInfoController.printTable['title']}</p:outputPanel>
                    <p:outputPanel style="text-align: center;font-size: 17px;font-weight: 700;">#{personalUseInfoController.printTable['head']}</p:outputPanel>
                    <p:outputPanel style="text-align: center;font-size: 16px;margin: 20px;font-weight: 700;">#{personalUseInfoController.printTable['title']}</p:outputPanel>
                    <div>
                        <div style="display: flex;flex-direction: row;justify-content: flex-end;width: 1081px;">
                            <div style="width: 98px;">单据编号:</div>

 src/main/webapp/resources/css/mybootstrap.css

@@ -1,10 +1,12 @@
* {
    font-size: 14px;
}

html, body {
html{
    width: 100%;
    height: 100%;
}
body {
    width: 100%;
}

:focus {
@@ -185,11 +187,9 @@
    border-color: #1B9AF7;
}

#printTarget{
    border: solid 0 black ;


}
/*#printTarget{*/
/*    border: solid 0 black ;*/
/*}*/

#apply-ui a{
    display: none !important;

 src/main/webapp/warehouse_reagent_use.xhtml

@@ -204,12 +204,12 @@


    <p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false">
        <div id="printTarget">
            <div style="margin: 11mm 27mm 0mm 30mm;">
        <div id="printTarget" style="margin-right: -51px;">
            <div style="margin: 25mm 17mm 0mm 15mm;">
        <h:form id="printDialog" style="width: 1100px">

            <p:outputPanel style="text-align: center;font-size: 14px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
            <p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
            <p:outputPanel style="text-align: center;font-size: 17px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
            <p:outputPanel style="text-align: center;font-size: 16px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
            <div>
                <div style="display: flex;flex-direction: row;justify-content: flex-end;width: 1081px;">
                    <div style="width: 98px;">单据编号:</div>

 src/main/webapp/warehouse_reagent_use_person.xhtml

@@ -114,12 +114,12 @@
        </p:panel>
    </h:form>
    <p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false">
        <div id="printTarget">
            <div style=" margin: 11mm 27mm 0mm 30mm;">
        <div id="printTarget" style="margin-right: -51px;">
            <div style="margin: 25mm 17mm 0mm 15mm; ">
                <h:form id="printDialog" style="width: 1100px">

                    <p:outputPanel style="text-align: center;font-size: 14px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
                    <p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
                    <p:outputPanel style="text-align: center;font-size: 17px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
                    <p:outputPanel style="text-align: center;font-size: 16px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
                    <div>
                        <div style="display: flex;flex-direction: row;justify-content: flex-end;width: 1081px;">
                            <div style="width: 98px;">单据编号:</div>