diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java index 4e4a77ff..4366e0f8 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java @@ -9,6 +9,7 @@ import com.nflg.wms.admin.pojo.dto.ZWM3A27ItemDTO; import com.nflg.wms.common.pojo.dto.OptRecordDTO; import com.nflg.wms.common.pojo.vo.QCTaskItemScanCodesVO; import com.nflg.wms.common.pojo.vo.QCTaskItemVO; +import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.repository.entity.WmsQcReceive; import com.nflg.wms.repository.entity.WmsQcReceiveItem; import com.nflg.wms.repository.entity.WmsSrmQualityInspection; @@ -120,11 +121,17 @@ public class NormalQMControllerService { iWmsQcReceiveService.lambdaUpdate() .eq(WmsQcReceive::getId, receiveId) .set(WmsQcReceive::getIsCompleted, 2) + .set(WmsQcReceive::getUpdateTime, LocalDateTime.now()) + .set(WmsQcReceive::getUpdateUserId, UserUtil.getUserId()) + .set(WmsQcReceive::getUpdateUserName, UserUtil.getUserName()) .update(); } else { iWmsQcReceiveService.lambdaUpdate() .eq(WmsQcReceive::getId, receiveId) .set(WmsQcReceive::getIsCompleted, 1) + .set(WmsQcReceive::getUpdateTime, LocalDateTime.now()) + .set(WmsQcReceive::getUpdateUserId, UserUtil.getUserId()) + .set(WmsQcReceive::getUpdateUserName, UserUtil.getUserName()) .update(); } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiptVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiptVO.java index d22e0f46..4c525c4b 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiptVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiptVO.java @@ -82,4 +82,14 @@ public class QCReceiptVO { * 1 无码收货 */ private Integer sourceType; + + /** + * 入库时间 + */ + private LocalDateTime inTime; + + /** + * 入库人 + */ + private String inUserName; }