Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r36901 -r36908
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 36901)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 36908)
@@ -12795,7 +12795,7 @@
 		if(CollectionUtils.isEmpty(externalCodeSet)){
 			return;
 		}
-		String sql = String.format("select po from %s po where po.forDisplay = true and %s ",
+		String sql = String.format("select po from %s po where %s ",
 				TousseDefinition.class.getSimpleName(),
 				SqlUtils.getStringFieldInLargeCollectionsPredicate("po.externalCode", externalCodeSet));
 		List<TousseDefinition> tdList = objectDao.findByHql(sql);
@@ -12827,6 +12827,7 @@
 				throw new RuntimeException("器械包类型异常！");
 			}
 			tousseInstanceVo.setTousseDefinition(dbTousseDefinition);
+			tousseInstanceVo.setTousseName(dbTousseDefinition.getName());
 		}
 	}
 	
@@ -13064,14 +13065,15 @@
 				throw new RuntimeException("器械包编码为" + tousseInstance.getBarcode() + "状态为" + tousseInstance.getStatus() + "不允许修改！");
 			}
 		}
-		List<GoodsStock> outGoodsStockList = new ArrayList<GoodsStock>();
+		/*List<GoodsStock> outGoodsStockList = new ArrayList<GoodsStock>();
 		for (TousseInstance tousseInstance : dbTousseInstances) {
 			WareHouse defaultWareHouse = wareHouseManager.getDefaultWareHouseByUnitCode(tousseInstance.getDepartCoding());
 			this.delete(tousseInstance);
 			goodsStockManager.addToList(outGoodsStockList, tousseInstance, defaultWareHouse);
 		}
 		if(CollectionUtils.isNotEmpty(outGoodsStockList)){
 			goodsStockManager.saveOrUpdateGoodsStock(outGoodsStockList, GoodsStockManager.MODE_OUTSTOCK);
-		}
+		}*/
+		discardTousseInstance(dbTousseInstances, "聚力康消毒供应系统撤销发货信息时废弃包实例");
 	}
 }
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp
===================================================================
diff -u -r36281 -r36908
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp	(.../invoiceSign.jsp)	(revision 36281)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp	(.../invoiceSign.jsp)	(revision 36908)
@@ -154,6 +154,10 @@
         barcodeTemp += '8';
     }else if(event.keyCode == 57 || event.keyCode == 105){
         barcodeTemp += '9';
+    }else if(event.keyCode == 80){
+        barcodeTemp += 'P';
+    }else if(event.keyCode == 75){
+        barcodeTemp += 'K';
     }else if(event.keyCode == 13){
     	if(!alertDivIsShow){
             if(sstsConfig.mustViewPackingPhotoBeforeForeignTousseSignAndUse){