Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
===================================================================
diff -u -r36983 -r37038
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 36983)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 37038)
@@ -102,9 +102,9 @@
return addZero(parseInt(v.month, 10) + 1) + "-" + addZero(v.date) + " " + addZero(v.hours) + ":" + addZero(v.minutes);
}
}
-function recycleTheApplication(id, barcode) {
+function recycleTheApplication(id, barcode, cleanBasketBarcodes) {
var rememberRecycleUser = CookieManager.getCookie("rememberRecycleUser");
- location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&recyclingApplicationId=" + id + "&barcode=" + barcode + "&rememberRecycleUser=" + rememberRecycleUser + '&source=' + source;
+ location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&recyclingApplicationId=" + id + "&barcode=" + barcode + "&rememberRecycleUser=" + rememberRecycleUser + '&source=' + source + '&cleanBasketBarcodes=' + cleanBasketBarcodes;
}
function openHistoryRecyclingRecord(id) {
@@ -916,7 +916,11 @@
//没有错误消息
if (msg.message.length == 0) {
var id = msg.id;
- recycleTheApplication(id, barcode);
+ var cleanBasketBarcodes = '';
+ if(msg.cleanBasketBarcodes && msg.cleanBasketBarcodes.length > 0){
+ cleanBasketBarcodes = msg.cleanBasketBarcodes.join(';');
+ }
+ recycleTheApplication(id, barcode, cleanBasketBarcodes);
} else if (msg.departMent != "" && msg.orgUnitCoding != "") {
var id = $("#inputselect").val();
var appType = $("#appTypeSelect").val();
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r36993 -r37038
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 36993)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 37038)
@@ -3897,6 +3897,113 @@
}]
},{
layout : 'form',
+ labelWidth :70,
+ columnWidth :.33,
+ height:heightVal,
+ id : "operationPartWrapper",
+ hidden:true,
+ items : [{
+ xtype : 'textfield',
+ fieldLabel : operationPartName,
+ allowBlank : true,
+ hideTrigger:true,
+ name : 'operationPart',
+ id : 'operationPart',
+ flex : 1
+ }]
+ },{
+ layout : 'column',
+ labelWidth :70,
+ columnWidth :1,
+ height:30,
+ hidden:!sstsConfig.enablePreBoundBasketsOfForeignTousseApplicationFunction,
+ items : [{
+ layout : 'form',
+ labelWidth :70,
+ columnWidth :.33,
+ height:30,
+ items : [{
+ xtype : 'textfield',
+ fieldLabel : '扫描清洗篮筐',
+ allowBlank : true,
+ hideTrigger:true,
+ name : 'scanBasketBarcode',
+ id : 'scanBasketBarcode',
+ flex : 1,
+ listeners : {
+ specialkey : function(field, e) {
+ if (e.getKey() == Ext.EventObject.ENTER) {
+ if(!isAmount(top.Ext4.getCmp('scanBasketBarcode').getValue())){
+ showResult('条码必须为数字，不能包含字母或其他符号。');
+ top.Ext4.getCmp("scanBasketBarcode").setValue('');
+ return false;
+ }
+ var barcode = top.Ext4.getCmp('scanBasketBarcode').getValue();
+ BarcodeTableManager.getBarcodeTypeByBarcode(barcode,function(jsonStr){
+ if(jsonStr !=null && jsonStr !=""){
+ var result= Ext4.JSON.decode(jsonStr);
+ if(result.message == '未能查询到该条码相关信息'){
+ if(result.returnType == 'container'){
+ if(result.containerType == '清洗筐'){
+ if(result.status == '空闲' || result.status == '装配完成'){
+ var preBindCleanBasketBarcodes = top.Ext4.getCmp('preBindCleanBasketBarcodes').getValue();
+ if(preBindCleanBasketBarcodes == ''){
+ top.Ext4.getCmp('preBindCleanBasketBarcodes').setValue(barcode);
+ }else {
+ var arr = preBindCleanBasketBarcodes.split(';');
+ if(arr.indexOf(barcode) >= 0){
+ top.Ext.MessageBox.confirm("请确认","篮筐"+barcode+"已经添加，是否进行移除操作？",function(button, text) {
+ if ("yes" == button){
+ var index = arr.indexOf(barcode);
+ arr.splice(index,1)
+ top.Ext4.getCmp('preBindCleanBasketBarcodes').setValue(arr.join(';'));
+ }
+ });
+ }else {
+ preBindCleanBasketBarcodes += ';' + barcode;
+ top.Ext4.getCmp('preBindCleanBasketBarcodes').setValue(preBindCleanBasketBarcodes);
+ }
+ }
+ }else {
+ showResult('篮筐'+barcode+'的状态不为“空闲”或“装配完成”，不能进行预绑定。');
+ }
+ }else {
+ showResult('篮筐'+barcode+'不是清洗篮筐，不能进行预绑定。');
+ }
+ }else {
+ showResult('篮筐'+barcode+'不是清洗篮筐，不能进行预绑定。');
+ }
+ }else {
+ showResult('未能查询到该条码相关信息。');
+ }
+ }else{
+ showResult(result.message);
+ }
+ top.Ext4.getCmp("scanBasketBarcode").setValue('');
+ });
+ }
+ }
+ }
+ }]
+ },{
+ layout : 'form',
+ labelWidth :70,
+ columnWidth :.66,
+ height:30,
+ items : [{
+ xtype : 'textfield',
+ fieldLabel : '预绑定篮筐',
+ allowBlank : true,
+ hideTrigger:true,
+ name : 'preBindCleanBasketBarcodes',
+ id : 'preBindCleanBasketBarcodes',
+ flex : 1,
+ readOnly : true,
+ fieldCls : 'fieldReadOnlyNoRemoveAndTop'
+ }]
+ }]
+ },{
+ layout : 'form',
columnWidth : 1,
labelWidth :70,
hidden : !sstsConfig.enableReviewOfForeignTousseApplicationFunction,
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
===================================================================
diff -u -r36992 -r37038
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 36992)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 37038)
@@ -179,6 +179,7 @@
+
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r36591 -r37038
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 36591)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 37038)
@@ -236,6 +236,7 @@
var secondOrgUnitCoding = '<%=request.getAttribute("orgUnitCoding")%>';
var secondOrgUnitName = '<%=request.getAttribute("orgUnitName")%>';
var fromLogin = '${fromLogin}';
+var cleanBasketBarcodes = '${param.cleanBasketBarcodes}';
if(fromLogin == 'true'){
welcome(departName,userName);
<%session.removeAttribute("fromLogin");%>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r36844 -r37038
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 36844)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 37038)
@@ -7565,6 +7565,18 @@
mouseDown(dataset.row,1)
}
});
+
+ //DGZYY-215:加载预绑定篮筐
+ if(sstsConfig.enablePreBoundBasketsOfForeignTousseApplicationFunction){
+ setTimeout(function(){
+ if(cleanBasketBarcodes !== ''){
+ var basketsArray = cleanBasketBarcodes.split(';');
+ basketsArray.forEach(function (e) {
+ loadBarcodeDevice(e, false);
+ });
+ }
+ }, 1000);
+ }
})
function getDataset(ele){