Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js =================================================================== diff -u -r36704 -r36800 --- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js (.../operationReservationInvoiceView.js) (revision 36704) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js (.../operationReservationInvoiceView.js) (revision 36800) @@ -230,7 +230,7 @@ var storageLocationStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ - url : WWWROOT + '/disinfectSystem/baseData/storageLocationAction!loadStorageLocationForOperationReservationInvoice.do', + url : WWWROOT + '/disinfectSystem/baseData/storageLocationAction!loadStorageLocationByOrgUnitCode.do', method : 'POST' }), reader : new Ext.data.JsonReader({ @@ -244,9 +244,8 @@ ]), listeners : { beforeload:function(thiz){ - var invoicePlanId = top.Ext.getCmp('invoicePlanIdHidden').getValue(); - if(invoicePlanId){ - thiz.baseParams["invoicePlanId"] = invoicePlanId; + if(top.Ext.getCmp('orgUnitCoding')){ + thiz.baseParams["orgUnitCode"] = top.Ext.getCmp('orgUnitCoding').getValue(); } } } @@ -1469,7 +1468,8 @@ items:[{ xtype:'hidden', id:'storageLocationAddr', - name:'storageLocationAddr' + name:'storageLocationAddr', + value:kardexContainerAddr },{ xtype : 'combo', id : 'storageLocationAddrName', @@ -1484,6 +1484,7 @@ triggerAction : 'all', forceSelection : true, anchor : '99%', + value:kardexContainerAddr, store : new Ext.data.SimpleStore({ fields : ['queryMode','queryValue'], data : [['一号开口','S01-1'],['二号开口','S01-2'],['三号开口','S01-3']] @@ -1518,13 +1519,12 @@ fieldLabel : '托盘选择', id : 'storageLocationName', name : 'storageLocationName', + queryParam: 'spell', minChars : 0, valueField : 'name', displayField : 'name', store : storageLocationStore, triggerAction : 'all', - readOnly : true, - editable: false, forceSelection : true, allowBlank : true, anchor : '99%', Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.jsp =================================================================== diff -u -r36704 -r36800 --- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.jsp (.../operationReservationInvoiceView.jsp) (revision 36704) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.jsp (.../operationReservationInvoiceView.jsp) (revision 36800) @@ -11,6 +11,7 @@ SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager"); request.setAttribute("kardexContainerHost", supplyRoomConfigManager.getSystemParamsObj().getKardexContainerHost()); request.setAttribute("kardexContainerPort", supplyRoomConfigManager.getSystemParamsObj().getKardexContainerPort()); + request.setAttribute("kardexContainerAddr", supplyRoomConfigManager.getSystemParamsObj().getKardexContainerAddr()); %> @@ -70,6 +71,7 @@ var today = '<%=request.getAttribute("today")%>'; var kardexContainerHost = '${kardexContainerHost}'; var kardexContainerPort = '${kardexContainerPort}'; +var kardexContainerAddr = '${kardexContainerAddr}'; Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js =================================================================== diff -u -r36771 -r36800 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 36771) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 36800) @@ -2473,6 +2473,39 @@ anchor: '100%', allowBlank: true }] + }, { + layout: 'form', + labelWidth: 220, + columnWidth: .25, + hidden:!sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer, + items:[{ + xtype:'hidden', + id:'kardexContainerAddr', + name:'kardexContainerAddr' + },{ + xtype : 'combo', + id : 'kardexContainerAddrName', + name : 'kardexContainerAddrName', + valueField : 'queryValue', + displayField : 'queryMode', + width:180, + fieldLabel : '卡迪斯货柜手术发货单默认开口', + mode : 'local', + readOnly : true, + editable: false, + triggerAction : 'all', + forceSelection : true, + anchor : '100%', + store : new Ext.data.SimpleStore({ + fields : ['queryMode','queryValue'], + data : [['一号开口','S01-1'],['二号开口','S01-2'],['三号开口','S01-3']] + }), + listeners:{ + select:function(combo, record, index){ + Ext.getCmp('kardexContainerAddr').setValue(record.data.queryValue); + } + } + }] } ] }, { @@ -3694,6 +3727,11 @@ kardexContainerPort = Ext.getCmp("kardexContainerPort").getValue(); } + var kardexContainerAddr = ''; + if(sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer){ + kardexContainerAddr = Ext.getCmp("kardexContainerAddr").getValue(); + } + if (sstsConfig.enableExpensiveGoods) { var supplierCertificationExpTime = Ext.getCmp("supplierCertificationExpTime").getValue(); if (supplierCertificationExpTime == "") { @@ -3952,6 +3990,7 @@ invoiceModeTousseRange:invoiceModeTousseRange, kardexContainerHost:kardexContainerHost, kardexContainerPort:kardexContainerPort, + kardexContainerAddr:kardexContainerAddr, receiptor: receiptor //自动签收发货单的签收人名字 }, success: function (response, options) { @@ -4247,6 +4286,11 @@ Ext.getCmp('kardexContainerHost').setValue(supplyRoomConfig.kardexContainerHost); Ext.getCmp('kardexContainerPort').setValue(supplyRoomConfig.kardexContainerPort); } + + if(sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer){ + Ext.getCmp('kardexContainerAddr').setValue(supplyRoomConfig.kardexContainerAddr); + Ext.getCmp('kardexContainerAddrName').setValue(supplyRoomConfig.kardexContainerAddr); + } Ext.getCmp('isCustomTousseCleanEntirely').setValue(supplyRoomConfig.isCustomTousseCleanEntirely); Ext.getCmp('foreignTousseCleanedEntirely').setValue(supplyRoomConfig.foreignTousseCleanedEntirely); Ext.getCmp('ftReleaseBasketAfterReturn').setValue(supplyRoomConfig.ftReleaseBasketAfterReturn || '否');