Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r20150 -r20389 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 20150) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 20389) @@ -307,14 +307,14 @@ var record = recyclingapplicationStore.getAt(i); var count =record.get('count'); if(/[^0-9]/g.test(count)){ - showResult('['+record.get('name')+'] 申请数量必须是数字,保存失败!'); + showResult('['+getTtsNameByAppRecord(record)+'] 申请数量必须是数字,保存失败!'); top.Ext.getCmp('sendOutGoodsDetail').getView().getRow(i).style.backgroundColor = '#FFB5B5'; b = false; break; } var errorAmount = record.get('errorAmount'); if(parseInt(errorAmount) < 0){ - showResult('['+record.get('name')+'] 误差数量不能小于0,保存失败!'); + showResult('['+getTtsNameByAppRecord(record)+'] 误差数量不能小于0,保存失败!'); b = false; break; } @@ -323,7 +323,7 @@ var record = sendOutGoodsStore.getAt(i); var count =record.get('count'); if(/[^0-9]/g.test(count)){ - showResult('['+record.get('name')+'] 申请数量必须是数字,保存失败!'); + showResult('['+getTtsNameByAppRecord(record)+'] 申请数量必须是数字,保存失败!'); top.Ext.getCmp('sendOutGoods').getView().getRow(i).style.backgroundColor = '#FFB5B5'; b = false; break; @@ -471,7 +471,7 @@ if(project == 'gdsy'){ if(goods.diposable == '是'){ if(storageAmount < notSendAmount){// 库存小于待发货数量 - var msg = goods.showTousseName + goods.barcode + ',该批次只满足部分发货!' + var msg = getTtsNameByGoods(goods) + goods.barcode + ',该批次只满足部分发货!' showResult(msg); } } @@ -504,6 +504,7 @@ id : 0, barcode : goods.barcode, name : goods.name, + ttsName : goods.ttsName, // appRecord: record, tousseFixedBarcode : goods.tousseFixedBarcode, showTousseName : goods.showTousseName, @@ -528,7 +529,7 @@ } barcodeToAppRecordMap[goods.barcode] = record; barcodeToScanGoodsMap[goods.barcode] = goods; - speakBasket.addGoods('',goods.showTousseName,count); + speakBasket.addGoods('',getTtsNameByGoods(goods),count); // clearScanText(); updateAmountByRecord(record,count); resortRecyclingapplication(record) @@ -744,6 +745,20 @@ addGoods(goods,speakBasket); } } +function getTtsNameByGoods(goods){ + if(!isUndefinedOrNullOrEmpty(goods.ttsName)){ + return goods.ttsName; + } + return goods.name; +} +function getTtsNameByAppRecord(record){ + var ttsName = record.get('ttsName'); + var name = record.get('name'); + if(!isUndefinedOrNullOrEmpty(ttsName)){ + return ttsName; + } + return name; +} //扫描发货物品 function loadGoodsByBarcode(orgUnitCoding) { var barcode = top.Ext.getCmp("scanText").getValue().Trim(); @@ -843,17 +858,17 @@ // 如果未找到,继续找下一个 if (record == undefined){ - var msg = '['+goods.name+']不在发货计划中!'; + var msg = '['+getTtsNameByGoods(goods)+']不在发货计划中!'; if(!isUndefinedOrNullOrEmpty(goods.tousseType)){ - msg = '['+goods.tousseType+']'+'['+goods.name+']不在发货计划中!'; + msg = '['+goods.tousseType+']'+'['+getTtsNameByGoods(goods)+']不在发货计划中!'; } showResult(msg); continue; } // 唯一条码消毒物品的校验 if(goods.tousseType == '消毒物品' && !goods.tousseFixedBarcode){ if(!validateDisinfection(record,goods)){ - showResult(goods.name+'的材料与申请单中的材料不一致'); + showResult(getTtsNameByGoods(goods)+'的材料与申请单中的材料不一致'); continue; } } @@ -888,7 +903,7 @@ var sendAmount1 = record.data['tempAmount']; //验证发货数量是否大于申请数量 if(sendAmount1 == appAmount1 && goods.tousseType != '器械包'){ - showResult(goods.name+',已满足发货计划!'); + showResult(getTtsNameByGoods(goods)+',已满足发货计划!'); continue; } var validatePass = goods.validatePass;// 没见其他地方有这个属性,暂时保留? @@ -903,7 +918,7 @@ var b = isInvoiceGoods(goodsName); if(!b){ if(result.data.length == 1){// 扫单个包才提示 - showResult('['+goods.name+']不在发货计划中!'); + showResult('['+getTtsNameByGoods(goods)+']不在发货计划中!'); } continue; } @@ -1158,6 +1173,7 @@ {name : 'id'}, {name : 'barcode'}, {name : 'name'}, + {name : 'ttsName'}, {name : 'appRecord'}, {name : 'showTousseName'}, {name : 'count'}, @@ -1182,6 +1198,7 @@ {name : 'id'}, {name : 'barcode'}, {name : 'name'}, + {name : 'ttsName'}, {name : 'tousseItems'}, {name : 'scannedMaterialAmount'}, {name : 'showTousseName'}, Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js =================================================================== diff -u -r20183 -r20389 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 20183) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 20389) @@ -135,6 +135,25 @@ labelWidth : 110, items : [{ xtype : 'textfield', + fieldLabel : '语音提示名称', + maxLength : '41', + id : 'ttsName', + name : 'ttsName', + allowBlank : true, + anchor : '95%', + listeners:{ + change:function(field,nV,oV){ + var value = nV.trim(); + field.setValue(value); + } + } + }] + },{ + columnWidth : 1, + layout : 'form', + labelWidth : 110, + items : [{ + xtype : 'textfield', fieldLabel : '规格', maxLength : '41', id : 'specification',