Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java =================================================================== diff -u -r14698 -r15187 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 14698) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 15187) @@ -548,7 +548,7 @@ long foreignTousseApp_id, String supplierName, int toolAmount, int implantAmount, String department, boolean isPrintOrg, Long idCardDefinitionUseAmount, ObjectDao objectDao,String barcodePaperType,String washOperator, - String weight) { + String weight,int printAmount) { JSONObject obj = new JSONObject(); obj.put("tousseName", tousseName); // 名称 obj.put("tousseDefinition", tdJson); @@ -595,6 +595,7 @@ obj.put("markTousse", markTousse); obj.put("washOperator", washOperator); obj.put("weight", weight); + obj.put("printAmount", printAmount); String packTime = com.forgon.Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS.format(operationTime); Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r15168 -r15187 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 15168) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 15187) @@ -2067,7 +2067,7 @@ toolAndImplantAmount.optInt("toolAmount"), toolAndImplantAmount.optInt("implantAmount"),department , isPrintOrg, idCardDefinitionUseAmount,objectDao,td.getBarcodePaperType(),tousseInstance.getWashOperator(), - tousseInstance.getWeight()); + tousseInstance.getWeight(),1);// TODO 需要确认审核后打印,是否也支持打印多份 toussesArray.add(obj); tousseInstanceManager.saveOrUpdate(tousseInstance); @@ -2471,6 +2471,7 @@ tousse.put("supplierName", tousseInstance.getTousseDefinition().getSupplierName()); tousse.put("washOperator", tousseInstance.getWashOperator()); tousse.put("weight", tousseWeight); + tousse.put("printAmount", td.getPrintAmount()); } } @@ -3157,8 +3158,8 @@ TousseDefinition td = currentPackingTask.getTousseDefinition(); String tousseType = td.getTousseType(); String tousseName = tdName; + Integer printAmount = td.getPrintAmount(); - Map disposableGoodsIdToAmount = null; /* * 先判断装配任务对应的器械包定义是否需要扣一次性物品库存(目前只针对普通器械包和敷料包进行扣减,后期在器械包定义的页界加以限制,其它类型的器械包定义的装配扣一次性物品库存的属性只能为否) @@ -3390,7 +3391,7 @@ tousse.optInt("toolAmount"), tousse.optInt("implantAmount"),currentPackingTask.getDepartment(), isPrintOrg,0L,objectDao,td.getBarcodePaperType(),tousse.optString("washOperator"), - tousse.optString("weight")); + tousse.optString("weight"),tousse.optInt("printAmount")); toussesArray.add(obj); @@ -3450,7 +3451,7 @@ toolAndImplantAmount.optInt("toolAmount"), toolAndImplantAmount.optInt("implantAmount"),department, isPrintOrg,idCardDefinitionUseAmount,objectDao,td.getBarcodePaperType(),tousse.getWashOperator(), - tousse.getWeight()); + tousse.getWeight(),td.getPrintAmount()); toussesArray.add(obj); } @@ -3597,6 +3598,8 @@ newTousseDefinition.setIsReview(td.getIsReview()); newTousseDefinition.setHandlerDepartCode(td.getHandlerDepartCode()); newTousseDefinition.setHandlerDepartName(td.getHandlerDepartName()); + newTousseDefinition.setPrintAmount(td.getPrintAmount()); + newTousseDefinition.setParentID(td.getId()); tousseDefinitionManager.saveOrUpdate(newTousseDefinition); newTousseDefinition.setAncestorID(newTousseDefinition.getId()); return newTousseDefinition; Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r14910 -r15187 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 14910) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 15187) @@ -240,6 +240,10 @@ */ private String moreBoxPacked; private Boolean haveDisposableMaterial = false; + /** + * 打印份数,默认为1 + */ + private Integer printAmount = 1; @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -1120,4 +1124,17 @@ return false; } } + + public Integer getPrintAmount() { + return printAmount; + } + + public void setPrintAmount(Integer printAmount) { + if(printAmount == null){ + this.printAmount = 1; + }else{ + this.printAmount = printAmount; + } + } + }