Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentinstance/InstrumentCycleInstance.java
===================================================================
diff -u -r34580 -r34591
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentinstance/InstrumentCycleInstance.java (.../InstrumentCycleInstance.java) (revision 34580)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentinstance/InstrumentCycleInstance.java (.../InstrumentCycleInstance.java) (revision 34591)
@@ -32,13 +32,16 @@
*/
private Long instrumentInstanceId;
-
/**
* 产生此器械循环实例时其器械实例当时所绑定的标识牌实例id的值(非冗余字段,防止器械实例后期所绑定标识牌实例发生变化时,记录变化前的值)
*/
private Long idCardInstanceId;
+
+ /**
+ * 产生此器械循环实例时其器械实例当时所绑定的标识牌实例所对应的器械包实例id(装配环节之前该值为空,装配时赋值)
+ */
+ private Long tousseInstanceId;
-
/**
* 上一循环周期的器械循环实例id
*/
@@ -105,6 +108,14 @@
this.idCardInstanceId = idCardInstanceId;
}
+ public Long getTousseInstanceId() {
+ return tousseInstanceId;
+ }
+
+ public void setTousseInstanceId(Long tousseInstanceId) {
+ this.tousseInstanceId = tousseInstanceId;
+ }
+
public Long getLastCycleInstanceId() {
return lastCycleInstanceId;
}
Index: ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml
===================================================================
diff -u -r34039 -r34591
--- ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 34039)
+++ ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 34591)
@@ -2816,4 +2816,15 @@
class="com.forgon.disinfectsystem.maintain.device.consumptivematerial.service.ConsumptiveMaterialContainerManagerImpl">
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file