Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java =================================================================== diff -u -r38248 -r38272 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java (.../TousseItem.java) (revision 38248) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java (.../TousseItem.java) (revision 38272) @@ -124,6 +124,11 @@ */ private Integer recyclingAmount = null; /** + * 终止装配任务数量(待发货物品数量需减去此数量) 目前只有装配时终止装配数量联动修改待发货数量的场景用到 + */ + private Integer terminatePackingTaskAmount = 0; + + /** * 临时的回收数量。回收的时候,可以添加器械包,但是添加的器械包不一定入筐。这时候,需要添加一个申请项,但是又不能回收,单是部分回收状态。 * 下次再打开的时候,进行回收 */ @@ -1174,7 +1179,14 @@ public String getPackageStatus() { return packageStatus; } - + public Integer getTerminatePackingTaskAmount() { + return terminatePackingTaskAmount; + } + + public void setTerminatePackingTaskAmount(Integer terminatePackingTaskAmount) { + this.terminatePackingTaskAmount = terminatePackingTaskAmount; + } + public void setPackageStatus(String packageStatus) { this.packageStatus = packageStatus; } Index: forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java =================================================================== diff -u -r35291 -r38272 --- forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java (.../HttpOption.java) (revision 35291) +++ forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java (.../HttpOption.java) (revision 38272) @@ -144,6 +144,10 @@ */ public final static String SYSTEMSETTING_PACKAGING_TYPE ="packType"; /** + * 装配删除原因 + */ + public final static String SYSTEMSETTING_CAUSEOFDELETEPACKINGTASK = "causeOfdeletePackingTask"; + /** * 设备 */ public final static String SYSTEMSETTING_EQUIPMENT = "equipment";