开发导入模块功能

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -6192,4 +6192,64 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 数据格式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_FORMAT {
+        STRING_FORMAT(1, "String", "字符串格式"),
+        INTEGER_FORMAT(2, "Integer", "整数格式"),
+        DOUBLE_FORMAT(3, "Double", "高精度浮点格式"),
+        DATE_FORMAT(4, "Date", "日期格式"),
+        FLOAT_FORMAT(5, "Float", "浮点格式"),
+        BOOL_FORMAT(6, "Boolean", "布尔格式"),
+        LONG_FORMAT(7, "LONG", "长整数格式");
+
+        private int value;
+        private String code;
+        private String description;
+
+        DATA_FORMAT(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java

@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+
+import cn.estsh.i3plus.pojo.model.mes.ImportErrorModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @Author: siliter.yuan
+ * @CreateDate: 2020/4/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("导入结果model")
+public class ExcelImportModel implements Serializable {
+
+    @ApiParam("结果")
+    private boolean result;
+
+    @ApiParam("成功行数量")
+    private int successRowNum;
+
+    @ApiParam("工作薄名称")
+    private String sheetName;
+
+    @ApiParam("导入数据集合")
+    private List<ConcurrentHashMap<String, Object>> excelList;
+
+    @ApiParam("错误信息集合")
+    private List<ImportErrorModel> ImportErrorModels;
+}

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

@@ -3094,6 +3094,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result);
         DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result);
+        DdlPreparedPack.getStringEqualPack(template.getGroupName(), "groupName", result);
         getStringBuilderPack(template, result);
         return result;
     }