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 Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js =================================================================== diff -u -r37356 -r37392 --- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js (.../operationReservationView.js) (revision 37356) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js (.../operationReservationView.js) (revision 37392) @@ -165,7 +165,7 @@ } }); } -function createTousseNode(isParentNode, itemId, tousseDefinitionId, name, amount, goodIndex, accessStatus, barcode, storageName) { +function createTousseNode(isParentNode, itemId, tousseDefinitionId, name, amount, goodIndex, accessStatus, barcode, storageName, inStorageId) { var node; if (isParentNode) { //创建父节点 @@ -196,6 +196,7 @@ node.attributes.accessStatus = accessStatus; node.attributes.barcode = barcode; node.attributes.storageName = storageName; + node.attributes.inStorageId = inStorageId; node.attributes.goodIndex = goodIndex; return node; } @@ -255,7 +256,8 @@ var accessStatus = tousseStorageInfos[i].accessStatus; var barcode = tousseStorageInfos[i].barcode; var storageName = tousseStorageInfos[i].storageName; - var childNode = createTousseNode(false, itemId, tousseDefinitionId, name, 1, '', accessStatus, barcode, storageName); + var inStorageId = tousseStorageInfos[i].inStorageId; + var childNode = createTousseNode(false, itemId, tousseDefinitionId, name, 1, '', accessStatus, barcode, storageName, inStorageId); parentNode.appendChild(childNode); } } @@ -311,8 +313,13 @@ } //取出或存入托盘 -function sendKardexContainerTCPCommand(status){ - var storageLocationId = top.Ext.getCmp("storageLocationId").getValue(); +function sendKardexContainerTCPCommand(status,storageLocationId,storageLocationName){ + if(!storageLocationId){ + storageLocationId = top.Ext.getCmp("storageLocationId").getValue(); + }else { + top.Ext.getCmp('storageLocationId').setValue(storageLocationId); + top.Ext.getCmp('storageLocationName').setRawValue(storageLocationName); + } var storageLocationAddr = top.Ext.getCmp("storageLocationAddr").getValue(); var kardexContainerHost = top.Ext.getCmp("kardexContainerHost").getValue(); var kardexContainerPort = top.Ext.getCmp("kardexContainerPort").getValue(); @@ -537,8 +544,24 @@ width: 80, dataIndex: 'storageName' }, { + header: '操作', + width: 70, + hidden:!sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer, + renderer:function(v,p,record){ + var status = '取出'; + var storageLocationId = record.inStorageId|| ''; + var storageLocationName = record.storageName || ''; + var accessStatus = record.accessStatus || ''; + if(storageLocationName == '' || accessStatus !== '待取出'){ + return '' + }else { + var content = "取出托盘"; + return content; + } + } + }, { header: '删除', - width: 80, + width: 60, dataIndex: 'deleteButton', renderer: renderDeleteButton }], @@ -1068,7 +1091,8 @@ items: [{ xtype: 'hidden', id: 'storageLocationAddr', - name: 'storageLocationAddr' + name: 'storageLocationAddr', + value:kardexContainerAddr }, { xtype: 'combo', id: 'storageLocationAddrName', @@ -1083,6 +1107,7 @@ triggerAction: 'all', forceSelection: true, anchor: '99%', + value:kardexContainerAddr, store: new Ext.data.SimpleStore({ fields: ['queryMode', 'queryValue'], data: kardexContainerOpeningStore @@ -1563,7 +1588,7 @@ name: 'query_operationTime_start', id: 'query_operationTime_start', readOnly: true, - value: tomorrow, + value: dayDate, altFormats: 'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', editable: false, format: 'Y-m-d', @@ -1580,7 +1605,7 @@ name: 'query_operationTime_end', id: 'query_operationTime_end', readOnly: true, - value: tomorrow, + value: dayDate, altFormats: 'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', editable: false, format: 'Y-m-d', @@ -1716,6 +1741,21 @@ handler: function () { synOperationReservation(); } + }, '-', { + text: '终止', + iconCls: 'btn_ext_pause', + hidden: !sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer, + handler: function () { + terminateInvoicePlan(grid); + } + }, '-', { + text: '库存查看', + iconCls: 'btn_ext_add_tousse', + hidden: !sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer, + handler: function () { + var url = WWWROOT+'/disinfectsystem/storageLocationManage/storageLocationLookView.jsp'; + top.addTab('storageLocationLook','库存查看',url); + } }]; grid = new Ext.ux.ForgonPageGrid({