From 4785b2a44ebee7806ee7cf27edf4509467033835 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 9 Nov 2023 17:41:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=20=20=E5=AF=BC=E5=85=A5/=E6=96=B0=E5=A2=9E/=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=20=E6=A0=A1=E9=AA=8C=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/dataobject/issueRequest/IssueRequestDetailDO.java  | 7 +++++++
 .../dal/dataobject/issueRequest/IssueRequestMainDO.java    | 7 +++++++
 .../service/issueRequest/IssueRequestMainServiceImpl.java  | 1 -
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestDetailDO.java
index 52faaf72..4567b0ca 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestDetailDO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestDetailDO.java
@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.dataobject.issueRequest;
 
+import com.sun.xml.bind.v2.TODO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -8,6 +9,8 @@ import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.win.framework.mybatis.core.dataobject.BaseDO;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 发料申请子 DO
  *
@@ -40,10 +43,12 @@ public class IssueRequestDetailDO extends BaseDO {
      *
      * 枚举 {@link TODO inventory_status 对应的类}
      */
+    @NotBlank
     private String inventoryStatus;
     /**
      * 包装号
      */
+    @NotBlank
     private String packingNumber;
     /**
      * 器具号
@@ -52,10 +57,12 @@ public class IssueRequestDetailDO extends BaseDO {
     /**
      * 批次
      */
+    @NotBlank
     private String batch;
     /**
      * 到库位代码
      */
+    @NotBlank
     private String toLocationCode;
     /**
      * 主表ID
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestMainDO.java
index 427f6b8a..c03bb3bb 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestMainDO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestMainDO.java
@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.dataobject.issueRequest;
 
+import com.sun.xml.bind.v2.TODO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -9,6 +10,8 @@ import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.win.framework.mybatis.core.dataobject.BaseDO;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 发料申请主 DO
  *
@@ -35,22 +38,26 @@ public class IssueRequestMainDO extends BaseDO {
     /**
      * 从仓库代码
      */
+    @NotBlank
     private String fromWarehouseCode;
     /**
      * 到仓库代码
      */
+    @NotBlank
     private String toWarehouseCode;
     /**
      * 从库位类型范围
      *
      * 枚举 {@link TODO location_type 对应的类}
      */
+    @NotBlank
     private String fromLocationTypes;
     /**
      * 到库位类型范围
      *
      * 枚举 {@link TODO location_type 对应的类}
      */
+    @NotBlank
     private String toLocationTypes;
     /**
      * 从库区代码范围
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java
index 731f83f4..18df32bf 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java
@@ -295,7 +295,6 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService {
     }
     //校验子表公共方法(适用于新增/修改)
     private void validateDetailMethod(IssueRequestDetailDO issueRequestDetailDO,BusinesstypeDO businesstypeDO,IssueRequestMainDO issueRequestMainDO) {
-        validateIssueRequestDetailExists(issueRequestDetailDO.getId());
         ItembasicDO itembasicDO = validatorItembasic(issueRequestDetailDO.getItemCode());
         this.validatorIfInType(itembasicDO.getType(), businesstypeDO);
         this.ifUomSuccess(itembasicDO.getUom(), issueRequestDetailDO.getUom());