Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java =================================================================== diff -u -r35906 -r38235 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java (.../ContainerManagerImpl.java) (revision 35906) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java (.../ContainerManagerImpl.java) (revision 38235) @@ -3,6 +3,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -17,6 +18,7 @@ import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.BarcodeDevice; +import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.basedatamanager.container.ContainerWaitPackingTaskVo; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; @@ -320,6 +322,9 @@ objectDao.excuteSQL("update Container set isCurrent='" + Container.CONTAINER_CURRENT_VIRTUAL_NO + "' where purpose='" + Container.CONTAINER_PURPOSE_VIRTUAL + "'"); + LoginUserData loginUserData = AcegiHelper.getLoginUser(); + Long userId = loginUserData == null?null:loginUserData.getUserId(); + Date date = new Date(); for(int i = 0;i < list.size();i++){ Container container = list.get(i); container.setStatus(Container.CONTAINER_STATUS_PACKING); @@ -331,6 +336,8 @@ objectDao.saveOrUpdate(container); newReviewedBasket = new ReviewedBasket(); + newReviewedBasket.setUserId(userId); + newReviewedBasket.setCreateDate(date); newReviewedBasket.setContainer(container); //任务组属性未定义,暂不赋值 objectDao.saveOrUpdate(newReviewedBasket); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java =================================================================== diff -u -r38198 -r38235 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java (.../ReviewedBasketManagerImpl.java) (revision 38198) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java (.../ReviewedBasketManagerImpl.java) (revision 38235) @@ -22,6 +22,7 @@ import com.forgon.databaseadapter.service.DateQueryAdapter; import com.forgon.directory.acegi.tools.AcegiHelper; +import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; @@ -248,12 +249,16 @@ public synchronized ReviewedBasket getBasketByContainer(Container container) { ReviewedBasket resultReviewedBasket = getReviewedBasket(container); if(resultReviewedBasket == null){ + LoginUserData loginUserData = AcegiHelper.getLoginUser(); + Long userId = loginUserData == null?null:loginUserData.getUserId(); //单独提交事务 以免本次事务新建ReviewedBasket的未提交,此时别的事务又刚好进来查询不到数据,也创建了篮筐,导致存在一个条码同时存在多个在用篮筐实例 runWithTransNewManager.runWith_TRANS_NEW(new RunWithTransNewTask() { @Override public void runTask() { ReviewedBasket resultReviewedBasket = new ReviewedBasket(); resultReviewedBasket.setContainer(container); + resultReviewedBasket.setUserId(userId); + resultReviewedBasket.setCreateDate(new Date()); objectDao.save(resultReviewedBasket); } }); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/ReviewedBasket.java =================================================================== diff -u -r23492 -r38235 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/ReviewedBasket.java (.../ReviewedBasket.java) (revision 23492) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/ReviewedBasket.java (.../ReviewedBasket.java) (revision 38235) @@ -4,6 +4,7 @@ package com.forgon.disinfectsystem.entity.packing; +import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -52,7 +53,14 @@ * 灭菌时所在的位置 */ private String sterilizerPosition; - + /** + * 创建时的操作人id + */ + private Long userId; + /** + * 创建时间 + */ + private Date createDate; @JsonIgnore private List sterilizationRecords; @@ -135,4 +143,21 @@ } return null; } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + }