Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/WashTransitionItem.java =================================================================== diff -u -r15859 -r15882 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/WashTransitionItem.java (.../WashTransitionItem.java) (revision 15859) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/WashTransitionItem.java (.../WashTransitionItem.java) (revision 15882) @@ -51,6 +51,10 @@ * 包名称 */ private String tousseName; + /** + * 数量。对于有标识牌条码的,此值为1,对应没有标识牌的,此值为手动输入的数量,可能会大于1 + */ + private Integer amount; private List washTransitionMaterials; @@ -94,6 +98,12 @@ public void setTousseName(String tousseName) { this.tousseName = tousseName; } + public Integer getAmount() { + return amount; + } + public void setAmount(Integer amount) { + this.amount = amount; + } @OneToMany(fetch = FetchType.LAZY) @Cascade(value = { org.hibernate.annotations.CascadeType.ALL }) @JoinColumn(name = "washTransitionItemId") Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java =================================================================== diff -u -r15859 -r15882 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java (.../WashTransitionItemManagerImpl.java) (revision 15859) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java (.../WashTransitionItemManagerImpl.java) (revision 15882) @@ -142,6 +142,7 @@ item.setTousseInstanceId(tousseInstanceId); item.setTousseDefinitionId(td.getId()); item.setTousseName(td.getName()); + item.setAmount(1); List materials = new LinkedList(); for(MaterialInstance mi : td.getMaterialInstances()){ @@ -176,6 +177,7 @@ json.put("tousseInstanceId", washTransitionItem.getTousseInstanceId()); json.put("tousseDefinitionId", washTransitionItem.getTousseDefinitionId()); json.put("tousseName", washTransitionItem.getTousseName()); + json.put("amount", washTransitionItem.getAmount()); return json; } return null; @@ -205,6 +207,7 @@ } item.setIdCardBarcode(json.optString("idCardBarcode")); item.setTousseName(json.optString("tousseName")); + item.setAmount(json.optInt("amount")); return item; } return null; @@ -214,6 +217,9 @@ public boolean save(WashTransitionRecord record, JSONObject itemInfo) { if(itemInfo != null){ WashTransitionItem item = build(itemInfo); + if(item.getAmount() <= 0){ + return false; + } item.setWashTransitionRecord(record); save(item); JSONArray materials = itemInfo.optJSONArray("washTransitionMaterials");