Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js =================================================================== diff -u -r37412 -r37413 --- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js (.../storageLocationLookView.js) (revision 37412) +++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js (.../storageLocationLookView.js) (revision 37413) @@ -244,22 +244,30 @@ } //BJDXZLYY-44:物品存入 -function storageLocationItemStorage() { +function storageLocationItemStorage(isTrue) { var tousseInstanceIds = Ext.getCmp("goodIdsList").getValue() || ''; var storageLocationId = $Id("parm_s_id").value; var storageLocationAddr = Ext.getCmp("addr").getValue() || ''; if (storageLocationId == '' || storageLocationId == 0 || storageLocationId == '0') { showResult('请先选择了托盘后再操作。'); return; } + if (tousseInstanceIds == '' && !isTrue) { + top.Ext.Msg.confirm('请确认', '不添加物品时仅将托盘送回仓库,是否继续?', function (btn) { + if (btn == 'yes') { + storageLocationItemRetrieval(true) + } + }) + return + } var storageLocationId = $Id("parm_s_id").value; Ext.Ajax.request({ url: WWWROOT + '/disinfectSystem/storageLocationGoodsAccessAction!storageLocationItemStorage.do', params: { tousseInstanceIds: tousseInstanceIds, storageLocationId: storageLocationId, - containerOpeningCode:storageLocationAddr + containerOpeningCode: storageLocationAddr }, success: function (response, options) { var result = Ext.decode(response.responseText); @@ -278,23 +286,30 @@ } //BJDXZLYY-44:物品取出 -function storageLocationItemRetrieval() { +function storageLocationItemRetrieval(isTrue) { var tousseInstanceIds = Ext.getCmp("goodIdsList").getValue() || ''; var storageLocationId = $Id("parm_s_id").value; var storageLocationAddr = Ext.getCmp("addr").getValue() || ''; if (storageLocationId == '' || storageLocationId == 0 || storageLocationId == '0') { showResult('请先选择了托盘后再操作。'); return; } - + if (tousseInstanceIds == '' && !isTrue) { + top.Ext.Msg.confirm('请确认', '不添加物品时仅将托盘送回仓库,是否继续?', function (btn) { + if (btn == 'yes') { + storageLocationItemRetrieval(true) + } + }) + return + } var storageLocationId = $Id("parm_s_id").value; Ext.Ajax.request({ url: WWWROOT + '/disinfectSystem/storageLocationGoodsAccessAction!storageLocationItemRetrieval.do', params: { tousseInstanceIds: tousseInstanceIds, storageLocationId: storageLocationId, - containerOpeningCode:storageLocationAddr + containerOpeningCode: storageLocationAddr }, success: function (response, options) { var result = Ext.decode(response.responseText); @@ -889,7 +904,7 @@ items: [{ xtype: 'hidden' }] - },{ + }, { columnWidth: .33, layout: 'form', labelWidth: 170,