Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
===================================================================
diff -u -r36696 -r36704
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js (.../operationReservationInvoiceView.js) (revision 36696)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js (.../operationReservationInvoiceView.js) (revision 36704)
@@ -1507,12 +1507,12 @@
xtype:'hidden',
id:'kardexContainerHost',
name:'kardexContainerHost',
- value:'194.1.2.135'
+ value:kardexContainerHost
},{
xtype:'hidden',
id:'kardexContainerPort',
name:'kardexContainerPort',
- value:'15008'
+ value:kardexContainerPort
},{
xtype : 'combo',
fieldLabel : '托盘选择',
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r36343 -r36704
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 36343)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 36704)
@@ -2424,6 +2424,32 @@
data: [{ name: '所有器械包', value: '' }, { name: '限制发货科室的器械包', value: 'limitInvoiceDepart' }]
})
}]
+ }, {
+ layout: 'form',
+ labelWidth: 180,
+ columnWidth: .25,
+ hidden:SSTS_ContainerConnect_manager,
+ items:[{
+ xtype: 'textfield',
+ fieldLabel: '连接卡迪斯货柜IP地址',
+ id: 'kardexContainerHost',
+ name: 'kardexContainerHost',
+ anchor: '100%',
+ allowBlank: true
+ }]
+ }, {
+ layout: 'form',
+ labelWidth: 180,
+ columnWidth: .25,
+ hidden:SSTS_ContainerConnect_manager,
+ items:[{
+ xtype: 'textfield',
+ fieldLabel: '连接卡迪斯货柜端口',
+ id: 'kardexContainerPort',
+ name: 'kardexContainerPort',
+ anchor: '100%',
+ allowBlank: true
+ }]
}
]
}, {
@@ -3638,6 +3664,13 @@
invoiceModeTousseRange = Ext.getCmp("invoiceModeTousseRange").getValue();
}
+ var kardexContainerHost = '';
+ var kardexContainerPort = '';
+ if(!SSTS_ContainerConnect_manager){
+ kardexContainerHost = Ext.getCmp("kardexContainerHost").getValue();
+ kardexContainerPort = Ext.getCmp("kardexContainerPort").getValue();
+ }
+
if (sstsConfig.enableExpensiveGoods) {
var supplierCertificationExpTime = Ext.getCmp("supplierCertificationExpTime").getValue();
if (supplierCertificationExpTime == "") {
@@ -3889,6 +3922,8 @@
tousseCamImgVidRetentionTime:tousseCamImgVidRetentionTime,
ftCamImgVidRetentionTime:ftCamImgVidRetentionTime,
invoiceModeTousseRange:invoiceModeTousseRange,
+ kardexContainerHost:kardexContainerHost,
+ kardexContainerPort:kardexContainerPort,
receiptor: receiptor //自动签收发货单的签收人名字
},
success: function (response, options) {
@@ -4180,6 +4215,11 @@
if(sstsConfig.onlyAvailableIsDisplayedOfInvoicePlanList){
Ext.getCmp('invoiceModeTousseRange').setValue(supplyRoomConfig.invoiceModeTousseRange || '');
}
+ console.log(supplyRoomConfig.kardexContainerHost)
+ if(!SSTS_ContainerConnect_manager){
+ Ext.getCmp('kardexContainerHost').setValue(supplyRoomConfig.kardexContainerHost);
+ Ext.getCmp('kardexContainerPort').setValue(supplyRoomConfig.kardexContainerPort);
+ }
Ext.getCmp('isCustomTousseCleanEntirely').setValue(supplyRoomConfig.isCustomTousseCleanEntirely);
Ext.getCmp('foreignTousseCleanedEntirely').setValue(supplyRoomConfig.foreignTousseCleanedEntirely);
Ext.getCmp('ftReleaseBasketAfterReturn').setValue(supplyRoomConfig.ftReleaseBasketAfterReturn || '否');
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
===================================================================
diff -u -r36697 -r36704
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js (.../operationReservationView.js) (revision 36697)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js (.../operationReservationView.js) (revision 36704)
@@ -832,12 +832,12 @@
xtype: 'hidden',
id: 'kardexContainerHost',
name: 'kardexContainerHost',
- value: '194.1.2.135'
+ value: kardexContainerHost
}, {
xtype: 'hidden',
id: 'kardexContainerPort',
name: 'kardexContainerPort',
- value: '15008'
+ value: kardexContainerPort
}, {
xtype: 'combo',
fieldLabel: '托盘选择',
Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/goodsAccess.jsp
===================================================================
diff -u -r34350 -r36704
--- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/goodsAccess.jsp (.../goodsAccess.jsp) (revision 34350)
+++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/goodsAccess.jsp (.../goodsAccess.jsp) (revision 36704)
@@ -1,6 +1,13 @@
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ include file="/common/taglibs.jsp"%>
<%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
+<%@ page import="com.forgon.tools.SpringBeanManger" %>
+<%
+ SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+ request.setAttribute("kardexContainerHost", supplyRoomConfigManager.getSystemParamsObj().getKardexContainerHost());
+ request.setAttribute("kardexContainerPort", supplyRoomConfigManager.getSystemParamsObj().getKardexContainerPort());
+%>
物品存取
@@ -12,10 +19,12 @@
-
+
Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/goodsAccess.js
===================================================================
diff -u -r36576 -r36704
--- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/goodsAccess.js (.../goodsAccess.js) (revision 36576)
+++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/goodsAccess.js (.../goodsAccess.js) (revision 36704)
@@ -390,8 +390,8 @@
storageLocationId:storageLocationId,
addr:addr,
status:status,
- host:'194.1.2.135',
- port:'15008'
+ host:kardexContainerHost,
+ port:kardexContainerPort
}
if(storageLocationId == ''){
showResult('抽屉不能为空');