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

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