Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp =================================================================== diff -u -r37126 -r37392 --- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp (.../operationReservationView.jsp) (revision 37126) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp (.../operationReservationView.jsp) (revision 37392) @@ -2,6 +2,7 @@ <%@page import="java.util.Date"%> <%@page import="com.forgon.Constants"%> <%@page import="org.apache.commons.lang3.time.DateUtils"%> +<%@page import="com.forgon.disinfectsystem.common.CssdUtils"%> <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%> <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> @@ -15,10 +16,17 @@ SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager"); request.setAttribute("kardexContainerHost", supplyRoomConfigManager.getSystemParamsObj().getKardexContainerHost()); request.setAttribute("kardexContainerPort", supplyRoomConfigManager.getSystemParamsObj().getKardexContainerPort()); + request.setAttribute("kardexContainerAddr", supplyRoomConfigManager.getSystemParamsObj().getKardexContainerAddr()); Date date = new Date(); Date tm = DateUtils.addDays(date, 1); String tms = Constants.SIMPLEDATEFORMAT_YYYYMMDD.format(tm); - request.setAttribute("tomorrowDate",tms); + String today = Constants.SIMPLEDATEFORMAT_YYYYMMDD.format(date); + + if(CssdUtils.getSystemSetConfigByNameBool("enableOperationReservationShippedToTraysOfKardexContainer", false)){ + request.setAttribute("dayDate",today); + }else{ + request.setAttribute("dayDate",tms); + } %> @@ -41,6 +49,7 @@ + @@ -56,7 +65,6 @@ var curUserName = '${userName}'; var hideButton = '<%=hideButton%>'; var profile = '${profile}'; - var SSTS_OR_Create = true; SSTS_OR_Create = false; @@ -80,10 +88,18 @@ SSTS_OR_Fetch = false } -var today = '<%=request.getAttribute("today")%>'; -var tomorrow = '${tomorrowDate}'; +var dayDate = '${dayDate}' var kardexContainerHost = '${kardexContainerHost}'; var kardexContainerPort = '${kardexContainerPort}'; +var kardexContainerAddr = '${kardexContainerAddr}'; +//BJDXZLYY-43：获取货柜连接开口设置 +if(sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer){ + var defaultKardexContainer = sessionStorage.getItem('defaultKardexContainer'); + if(defaultKardexContainer !== '' && defaultKardexContainer !== 'null' && defaultKardexContainer !== null){ + var arr = JSON.parse(defaultKardexContainer); + kardexContainerAddr = arr[1]; + } +} @@ -104,8 +120,8 @@ - - + + \ No newline at end of file