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

gdg

2021-02-23 8b6a2a67a0bf081252648ba46fffd5591b3afc98

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

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

@@ -263,16 +263,19 @@
//        DateAxis axis = new DateAxis("Dates");
//        Axis xAxis = lineModel.getAxis(AxisType.X);

        Axis xAxis = new CategoryAxis();
        xAxis.setTickAngle(-50);
        if(chartSensorsList.size()>30 && chartSensorsList.size()<240) {
            xAxis.setTickCount(200);
        }else if(chartSensorsList.size()>=240) {
            xAxis.setTickCount(240);
        }
        Axis xAxis = new DateAxis();

        lineModel.getAxes().put(AxisType.X, xAxis);
        lineModel.setShowDatatip(true);
//        axis.setTickFormat("%b %d, %Y");
        if (periodType == 1) {
            xAxis.setTickFormat("%m-%d:%H");
        }
        if (periodType == 2) {
            xAxis.setTickFormat("%m-%d");
        }
        if (periodType == 3) {
            xAxis.setTickFormat("%m-%d");
        }
//        axis.setMax(DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm"));
//        axis.setMin(minDate);
//        axis.setTickFormat("%Y-%m-%d %H:%M");

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

@@ -531,6 +531,13 @@
        selectedTmpOrderList = null;
    }

    public void hideOrderTmp() {
        //清空
        selectedTmpOrderList = null;
        //隐藏
        RequestContext.getCurrentInstance().execute("document.getElementById('showTabOrder').style.display='none'");
    }

    public void  clearInputStorageTmp(){
        selectedInputStorageTmpOrderList = null;
    }
@@ -563,6 +570,10 @@

    }

    public void hide(){
        selectedTmpList = null;
        RequestContext.getCurrentInstance().execute("document.getElementById('showTab').style.display='none'");
    }
    public void cancelOrderTmp(){
        if (trulySelectedOrderList == null || trulySelectedOrderList.size()<=0){
            FacesUtils.info("至少选择一个");

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

@@ -81,8 +81,19 @@
  </insert>

  <update id="updateOpeOrder" parameterType="com.nanometer.smartlab.entity.OpeOrder">
    update ope_order set order_code=#{orderCode}, order_name=#{orderName}, status=#{status}, memo=#{memo},
    consignee_user_id=#{consigneeUserId}, order_user_id=#{orderUserId}, arrival_time=#{arrivalTime}, update_time=now(),supplier_id=#{supplyId},supplier_name=#{supplyName}
    update ope_order
    <set>
      <if test="orderCode != null">order_code=#{orderCode},</if>
      <if test="orderName != null">order_name=#{orderName},</if>
      <if test="status != null">status=#{status},</if>
      <if test="memo != null">memo=#{memo},</if>
      <if test="consigneeUserId != null">consignee_user_id=#{consigneeUserId},</if>
      <if test="orderUserId != null">order_user_id=#{orderUserId},</if>
      <if test="arrivalTime != null">arrival_time=#{arrivalTime},</if>
      <if test="supplyId != null">supplier_id=#{supplyId},</if>
      <if test="supplyName != null">supplier_name=#{supplyName},</if>
      update_time=now()
    </set>
    where id=#{id}
  </update>


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

@@ -264,7 +264,7 @@
    <if test="productSn != null and productSn != ''">
      and sr.product_sn like concat("%", #{productSn} ,"%")
    </if>
    ORDER BY sr.create_time desc
    ORDER BY length(sr.name),sr.create_time desc
    <if test="first != null and pageSize != null">
      limit #{first}, #{pageSize}
    </if>

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

@@ -27,4 +27,6 @@
    List<ContainerStatusMngDto> selectInfo(Map<String, Object> params) throws RuntimeException;

    int countAll(Map<String, Object> params) throws  RuntimeException;

    //获得
}

 src/main/webapp/container_status_mng.xhtml

@@ -74,7 +74,7 @@
        </p:panel>
    </h:form>

    <p:dialog modal="true" header="查看" dynamic="true" appendTo="@(body)" id="dialog" widgetVar="dialog" resizable="false" width="1000">
    <p:dialog modal="true" header="查看" dynamic="true" appendTo="@(body)" id="dialog" widgetVar="dialog" resizable="false" width="1500">
        <h:form id="dialogForm" styleClass="container-status-form" style="padding-bottom: 40px">
            <p:panelGrid columns="2" styleClass="content2 grid-padding-bottom2">
                <p:panel styleClass="center-header">

 src/main/webapp/warehouse_reagent_direct_store.xhtml

@@ -184,13 +184,16 @@
        <p:tabView dynamic="true" style="margin-left: 26px">
            <p:tab title="试剂库">
                <h:form id="applyMngNewReagentForm">
                    <p:panelGrid styleClass="apply-mng-new-reagent-filter" columns="5" style="margin-left: -18px">
                    <p:panelGrid styleClass="apply-mng-new-reagent-filter" columns="7" style="margin-left: -18px">
                        <p:outputLabel value="试剂名称："></p:outputLabel>
                        <p:inputText value="#{warehouseStockMngController.applyNewReagentName}"></p:inputText>

                        <p:outputLabel value="CAS："></p:outputLabel>
                        <p:inputText value="#{warehouseStockMngController.applyNewCas}"></p:inputText>

                        <p:outputLabel value="产品编号："></p:outputLabel>
                        <p:inputText value="#{warehouseStockMngController.productSn}"></p:inputText>

                        <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
                    </p:panelGrid>


 src/main/webapp/warehouse_stock_mng.xhtml

@@ -15,7 +15,10 @@
            <div id ="showTab" style="display: none">
                <h:form id="tmp">
                    <p:panel styleClass="center-body">
                        <p:panelGrid columns="3" styleClass="btn">
                        <p:panelGrid columns="4" styleClass="btn">
                            <p:commandButton value="返回" styleClass="import-btn" process="@form"
                                             actionListener="#{warehouseStockMngController.hide}"
                                             update="@(.tempTable)"/>
                            <p:commandButton value="删除" styleClass="del-btn" process="@form"
                                             actionListener="#{warehouseStockMngController.cancel}"
                                             update="@(.tempTable)"/>
@@ -196,7 +199,11 @@
            <div id ="showTabOrder" style="display: none">
                <h:form id="tmpOrder" styleClass="tmpOrder">
                    <p:panel styleClass="center-body">
                        <p:panelGrid columns="3" styleClass="btn">
                        <p:panelGrid columns="4" styleClass="btn">
                            <p:commandButton value="返回" styleClass="import-btn" process="@form"
                                             actionListener="#{warehouseStockMngController.hideOrderTmp}"
                                             update="@(.tmpOrder)"
                            />
                            <p:commandButton value="删除" styleClass="del-btn" process="@form"
                                             actionListener="#{warehouseStockMngController.cancelOrderTmp}"
                                             update="@(.tmpOrder)"