From 6da7af6218ce2828c0b72f21f034b8a58a716ffd Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Mon, 23 Mar 2026 20:50:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/OptRecordController.java | 11 ++++++++++- .../admin/controller/OutProduceController.java | 13 ++++++------- .../nflg/wms/common/pojo/dto/OptRecordDTO.java | 16 ---------------- .../nflg/wms/repository/entity/OptRecord.java | 2 +- .../repository/service/IOptRecordService.java | 2 +- .../service/impl/OptRecordServiceImpl.java | 5 +---- 6 files changed, 19 insertions(+), 30 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OptRecordController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OptRecordController.java index 26d73f4e..6134fa90 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OptRecordController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OptRecordController.java @@ -5,15 +5,19 @@ import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.dto.OptRecordDTO; import com.nflg.wms.common.pojo.qo.OptRecordQO; import com.nflg.wms.common.pojo.vo.OptRecordVO; +import com.nflg.wms.common.util.UserUtil; +import com.nflg.wms.repository.entity.OptRecord; import com.nflg.wms.repository.service.IOptRecordService; import jakarta.annotation.Resource; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.time.LocalDateTime; import java.util.List; /** @@ -41,6 +45,11 @@ public class OptRecordController { */ @PostMapping("add") public void add(@Valid @RequestBody OptRecordDTO optRecordDTO){ - optRecordService.add(optRecordDTO); + OptRecord optRecord = new OptRecord(); + BeanUtils.copyProperties(optRecordDTO, optRecord); + optRecord.setOperationTime(LocalDateTime.now()); + optRecord.setOperatorId(UserUtil.getUserId()); + optRecord.setOperator(UserUtil.getUserName()); + optRecordService.add(optRecord); } } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java index 3c625444..ca67deef 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java @@ -44,6 +44,7 @@ import java.io.IOException; import java.math.BigDecimal; import java.time.Instant; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -96,7 +97,7 @@ public class OutProduceController extends BaseController { private IWmsQrCodeMasterService qrCodeMasterService; @Resource - private IOptRecordService optRecordService; + private OptRecordController optRecordController; /** * 查询SAP领料订单数据 @@ -569,13 +570,11 @@ public class OutProduceController extends BaseController { }).toList() ) ); - OptRecordDTO optRecordDTO = new OptRecordDTO(); -// optRecordDTO.setOrderId(); -// optRecordDTO.setOperator(); -// optRecordDTO.setOperationTime(); -// optRecordDTO.setOperationType(); - optRecordService.add(optRecordDTO); + OptRecordDTO optRecordDTO = new OptRecordDTO(); + optRecordDTO.setOperationType((short)1); + optRecordDTO.setOrderId(order.getAufnr()); + optRecordController.add(optRecordDTO); outProduceTicketService.lambdaUpdate() .set(WmsOutProduceTicket::getMatDoc, vo.getMat_doc()) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/OptRecordDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/OptRecordDTO.java index 961911f8..66d0af30 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/OptRecordDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/OptRecordDTO.java @@ -16,27 +16,11 @@ public class OptRecordDTO { @NotBlank(message = "单号不能为空") private String orderId; - /** - * 操作时间（必传） - */ - @NotNull(message = "操作时间不能为空") - private LocalDateTime operationTime; - /** * 操作类型（必传） */ @NotNull(message = "操作类型不能为空") private Short operationType; - /** - * 操作人员id（必传） - */ - @NotBlank(message = "操作人员id不能为空") - private String operatorId; - /** - * 操作人员（必传） - */ - @NotBlank(message = "操作人员不能为空") - private String operator; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/OptRecord.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/OptRecord.java index 5c30ccfa..2fb324da 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/OptRecord.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/OptRecord.java @@ -52,7 +52,7 @@ public class OptRecord implements Serializable { /** * 操作人员id */ - private String operatorId; + private Long operatorId; /** * 操作人员 diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IOptRecordService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IOptRecordService.java index 67064063..639aef7e 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IOptRecordService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IOptRecordService.java @@ -20,5 +20,5 @@ import java.util.List; public interface IOptRecordService extends IService { List search(OptRecordQO request); - void add(OptRecordDTO optRecordDTO); + void add(OptRecord optRecord); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/OptRecordServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/OptRecordServiceImpl.java index a5db959e..5477ae7f 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/OptRecordServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/OptRecordServiceImpl.java @@ -30,10 +30,7 @@ public class OptRecordServiceImpl extends ServiceImpl