Merge remote-tracking branch '惠信/develop' into develop

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);
     }
 }

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领料订单数据
@@ -573,13 +574,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())

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;
 }

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;
 
     /**
      * 操作人员

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<OptRecord> {
     List<OptRecordVO> search(OptRecordQO request);
 
-    void add(OptRecordDTO optRecordDTO);
+    void add(OptRecord optRecord);
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/OptRecordServiceImpl.java

@@ -30,10 +30,7 @@ public class OptRecordServiceImpl extends ServiceImpl<OptRecordMapper, OptRecord
     }
 
     @Override
-    public void add(OptRecordDTO optRecordDTO) {
-        OptRecord optRecord = new OptRecord();
-        BeanUtils.copyProperties(optRecordDTO, optRecord);
-//        baseMapper.insert(optRecord);
+    public void add(OptRecord optRecord) {
         boolean saveSuccess = this.save(optRecord);
         if (!saveSuccess) {
             throw new RuntimeException("新增操作记录失败，请稍后重试");