From f38084613fbfc97f4803387a4665e145ffaa01d8 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 31 Oct 2023 08:43:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../win/module/wms/until/job/JobUtils.java    | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java
index cc1528f0..5cdf4e4b 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java
@@ -256,7 +256,6 @@ public class JobUtils {
      * @param pitemCode 物品代码
      * @return 上架策略信息
      * @author chenfang
-     * @author chenfang
      */
     public RuleRespVO selectLocationAndModRelation(String pitemCode) {
         RuleRespVO grounding = ruleService.grounding(null, null, null, null, null, null, pitemCode, null, null, null, null, null, null);
@@ -267,8 +266,8 @@ public class JobUtils {
         }
     }
 
-    //DBT---DBT2---IT   物料类型检验是否一致
-    public boolean ifInType(String pitemCode, BusinesstypeDO businesstypeDO) {
+    //DBT---DBT2---IT   物料类型检验-----按物料代码
+    public boolean selectItembasicExist(String pitemCode, BusinesstypeDO businesstypeDO) {
         ItembasicDO itembasicDO = itembasicService.selectItembasic(pitemCode);
         boolean ifInType = false;
         if (itembasicDO != null) {
@@ -286,6 +285,21 @@ public class JobUtils {
         }
     }
 
+    //DBT---DBT2---IT1   物料类型检验-----按物料类型
+    public boolean ifInType(String pitemType, BusinesstypeDO businesstypeDO) {
+        boolean ifInType = false;
+        String[] itemType = businesstypeDO.getItemTypes().split(",");
+        for (int i = 0; i < itemType.length; i++) {
+            if (pitemType.equals(itemType[i])) {
+                ifInType = true;
+            }
+        }
+        if (ifInType == true) {
+            return true;
+        } else {
+            throw exception(ITEMBASIC_TYPE_AND_BUSINESSTYPE_NOT_EQUALS);
+        }
+    }
     //DBT---DBT2---IS   物料状态检验是否一致
     public boolean ifInStatus(String pitemCode, BusinesstypeDO businesstypeDO) {
         ItembasicDO itembasicDO = itembasicService.selectItembasic(pitemCode);