Merge remote-tracking branch 'origin/hella_online_20241011' into hella_online_20241011

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerRequest/vo/ContainerMainRequestBaseVO.java

@@ -3,8 +3,6 @@ package com.win.module.wms.controller.containerRequest.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * 器具管理申请主 Base VO，提供给添加、修改、详细的子 VO 使用
  * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
@@ -53,4 +51,7 @@ public class ContainerMainRequestBaseVO {
 
     @Schema(description = "业务类型")
     private String businessType;
+
+    @Schema(description = "备注", example = "测试让加的")
+    private String mainRemark;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerRequest/ContainerMainRequestServiceImpl.java

@@ -515,6 +515,7 @@ public class ContainerMainRequestServiceImpl implements ContainerMainRequestServ
     private ContainerMainRequestDO validatorToCreate(ContainerMainRequestCreateReqVO createReqVO, RequestsettingDO requestsettingDO) {
         ContainerMainRequestDO containerMainRequestDO = validateMainMethod(createReqVO, requestsettingDO);
         containerMainRequestDO.setAvailable("TRUE");
+        containerMainRequestDO.setRemark(createReqVO.getMainRemark());
         List<ContainerDetailRequestCreateReqVO> subList = createReqVO.getSubList();
         List<ContainerDetailRequestDO> subDOList = ContainerDetailConvert.INSTANCE.convertList03(subList);
         for (ContainerDetailRequestDO detailRequestDO : subDOList) {