From e5e41f09e7eec67a2be528e46cfa97431f962fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= <adair.song@estsh.com>
Date: Wed, 29 Apr 2020 16:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=A3=E4=BB=B6=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 0e1510d..f429143 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -2495,6 +2495,30 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 散件产品组配置
+     *
+     * @param mesProdScatterDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesScatterDetail(MesProdScatterDetail mesProdScatterDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdScatterDetail, organizeCode);
+        if (!StringUtils.isEmpty(mesProdScatterDetail.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdScatterDetail.getPartName())) {
+            DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartName(), "partName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdScatterDetail.getProduceCtgyCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getProduceCtgyCode(), "produceCtgyCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdScatterDetail.getSpCfgCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getSpCfgCode(), "spCfgCode", packBean);
+        }
+        return packBean;
+    }
+
     public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) {
         DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean);