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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -395,7 +395,16 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringRightLikerPack(wmsPart.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
+        if (!StringUtil.isEmpty(wmsPart.getPartType()) && wmsPart.getPartType().contains(",")) {
+            String types[] = wmsPart.getPartType().split(",");
+            List<String> partTypes = new ArrayList<>();
+            for (String type : types) {
+                partTypes.add(type);
+            }
+            DdlPreparedPack.getInPackList(partTypes, "partType", result);
+        } else {
             DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result);
+        }
         DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
         DdlPreparedPack.getNumEqualPack(wmsPart.getIsValuable(), "isValuable",result);
         getStringBuilderPack(wmsPart, result);