Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r29122 -r29128
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 29122)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 29128)
@@ -7952,7 +7952,7 @@
for (DisposableGoods disposableGoods : disposableGoodsList) {
disposableGoodsIds.add(disposableGoods.getId());
indexMap.put(disposableGoods.getName() + "[" + disposableGoods.getSpecification() + "]", index++);
- disposableGoodsNames.add(disposableGoods.getTtsNameOrName());
+ disposableGoodsNames.add(disposableGoods.getTtsNameOrName()+ "
-" + disposableGoods.getSpecification());
}
List parentOrgUnits = orgUnitManager.getByCodes(Arrays.asList(orgUnitCodings));
@@ -7987,7 +7987,9 @@
+ " join %s ou on ip.departCoding = ou.orgUnitCoding "
+ " join %s dg on ti.disposableGoodsId = dg.id where (1=1) "
+ " and ti.isPrinted = 0 "
- + " and ti.tousseType = '%s' ",
+ + " and ti.tousseType = '%s' "
+ + " and ip.committedstatus = 1 " // 未提交的单据不打印,处于暂存状态
+ + " and ip.deliverStatus <> '已终止' ", // 发货状态为已终止的单据不打印
TousseItem.class.getSimpleName(), InvoicePlan.class.getSimpleName(),
OrgUnit.class.getSimpleName(), DisposableGoods.class.getSimpleName(),
DisposableGoods.TYPE_NAME);
@@ -8062,10 +8064,16 @@
jsonArray.add(json);
}
+
+ // 不必更新物品的打印状态,所以注释掉下面的语句
+ /*
+ *
if(CollectionUtils.isNotEmpty(tousseItemIdList)){
List tousseItems = objectDao.findByIds(TousseItem.class.getSimpleName(), tousseItemIdList);
updateTousseItemPrintStatusByIds(tousseItems, true);
}
+ */
+
return jsonArray;
}