Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r17130 -r17160 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 17130) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 17160) @@ -340,32 +340,32 @@ var sendAmount = Number(record.data['tempAmount']);// 已扫描数量 var notSendAmount = Number(waitDeliveryCount) - Number(sendAmount);// 待发货数量 // var sendAmount = 0 ; - if(notSendAmount <= 0){ - return; - } + if(goods.tousseFixedBarcode){ + if(notSendAmount <= 0){ + return; + } if(sendAmount >= storageAmount){ return; } + if(notSendAmount < storageAmount){// 待发货数量小于库存 + count = notSendAmount; + }else{ + count = storageAmount; + } } - if(notSendAmount < storageAmount){// 待发货数量小于库存 - count = notSendAmount; - }else{ - count = storageAmount; - } - // 固定条码每次增加的数量不能超过包定义的扫描数量 if(goods.tousseFixedBarcode){ var remnantStorage = storageAmount - sendAmount; count = Math.min(count,goods.scanAmount);// 单次增加数量不能超过每次扫描数量 count = Math.min(count,remnantStorage);// 增加数量不能超过剩余库存 + + if(count == 0){ + return; + } } - if(count == 0){ - return; - } - var price = goods.price; var add = true; if(goods.tousseFixedBarcode){