Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java =================================================================== diff -u -r23136 -r23392 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 23136) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 23392) @@ -797,6 +797,11 @@ JSONObject jsonObject = new JSONObject(); List tousseInstanceList = tousseInstanceManager.addTousseInstanceToBasket( basketBarcode, Arrays.asList(tousseBarcodeArray), Arrays.asList(excludeBarcodes)); + if(null==tousseInstanceList){ + jsonObject.put("success", true); + jsonObject.put("msg", "只有已审核的包才能载入到篮筐,请刷新列表后重试"); + StrutsResponseUtils.output(jsonObject); + } jsonObject.put("success", true); jsonObject.put("msg", "成功放入篮筐"); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r23375 -r23392 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 23375) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 23392) @@ -1589,6 +1589,12 @@ public List addTousseInstanceToBasket(String basketBarcode, Collection tousseInstanceBarcodes, Collection excludeBarcodes) { + String checkTousseInstanceStatusSql = "select count(*) from TousseInstance ti join barcodeDevice " + + "bd on bd.id = ti.id where "+SqlUtils.getStringFieldInCollectionsPredicate("bd.barcode", tousseInstanceBarcodes)+" and status <> '已审核'"; + if(objectDao.countBySql(checkTousseInstanceStatusSql)>0){ + return null; + } + //1.根据传入的条码查询vo String querySql = "select ti.tousseName,ti.departCoding,ti.depart,b.barcode,td.isTraceable "+ "from TousseInstance ti join barcodeDevice b on ti.id=b.id "+