diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 9df3d38..babbc80 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -2377,4 +2377,69 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 外部单据：关联单据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IMPORT_ORDER_TYPE {
+        PO("PO", "要货计划"),
+        ASN("ASN", "ASN"),
+        SCATTERED_OUT("C00", "零星出库指令"),
+        SCATTERED_INT("C01", "零星入指令"),
+        NC_DISMANTLING_PICKING("C02", "NC拆解领料"),
+        NC_DISMANTLING_RETURN("C03", "NC拆解退料"),
+        NC_SCRAPPED("C04", "NC报废指令"),
+        NOT_JIS("NOTJIS", "非JIS指令"),
+        STOCK_DUMP("D00", "库存转储指令"),
+        NC_INSTOCK("D01", "NC入库指令"),
+        SMRR("B00", "SMRR退货"),
+        DMR("B01", "DMR退货"),
+        OUT_SOURCING("A00", "委外发料指令"),
+        OUT_REBACK("A01", "委外退料指令"),
+        OUT_RETURN_SOURCING("A02", "委外返工发料指令"),
+        OUT_RETURN_("A03", "委外返工退料指令"),
+        SALES_RETURN_REBACK("SALES_RETURN", "销售退货指令"),
+        CS("CS", "盘点指令"),
+        CS_ADUJUST("CS_ADUJUST", "盘点调差指令");
+        private String value;
+        private String description;
+
+        IMPORT_ORDER_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public static IMPORT_ORDER_TYPE codeOf(String value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String getDes(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java
index d213172..3e2c13f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java
@@ -22,7 +22,7 @@ import java.util.UUID;
  **/
 @Data
 @Api(value="要货计划",description = "要货计划")
-public class SapDspo {
+public class SapDspo extends SapBase{
 
     @ApiParam(value = "SA编号（或PO号）",example = "1")
     @AnnoOutputColumn
@@ -92,58 +92,58 @@ public class SapDspo {
     @AnnoOutputColumn
     private Double prnnum;
 
-    //公共字段 ++++++++++++++++++++++++++++++++++++++++++
-    @ApiParam(value = "处理人",example = "-1")
-    @AnnoOutputColumn
-    private String actusr = "导入";
-
-    @ApiParam(value = "SID",example = "-1")
-    @AnnoOutputColumn
-    private String sid = UUID.randomUUID().toString()+UUID.randomUUID().toString();
-
-    /*@ApiParam(value = "接收数据日期",example = "-1")
-    @AnnoOutputColumn
-    private String recymd;
-
-    @ApiParam(value = "接收数据时间",example = "-1")
-    @AnnoOutputColumn
-    private String rechms;
-
-    @ApiParam(value = "同步标志",example = "-1")
-    @AnnoOutputColumn
-    private String synflg;*/
-
-    @ApiParam(value = "同步日期",example = "-1")
-    @AnnoOutputColumn
-    private String synymd;
-
-    @ApiParam(value = "同步时间",example = "-1")
-    @AnnoOutputColumn
-    private String synhms;
-
-    /*@ApiParam(value = "处理标志",example = "-1")
-    @AnnoOutputColumn
-    private String actflg;*/
-
-    @ApiParam(value = "处理日期",example = "-1")
-    @AnnoOutputColumn
-    private String actymd;
-
-    @ApiParam(value = "处理时间",example = "-1")
-    @AnnoOutputColumn
-    private String acthms;
-
-    @ApiParam(value = "状态标志",example = "-1")
-    @AnnoOutputColumn
-    private  String staflg;
-
-    @ApiParam(value = "顺序号",example = "-1")
-    @AnnoOutputColumn
-    private Integer seq;
-
-    @ApiParam(value = "GUID",example = "-1")
-    @AnnoOutputColumn
-    private String guid;
+//    //公共字段 ++++++++++++++++++++++++++++++++++++++++++
+//    @ApiParam(value = "处理人",example = "-1")
+//    @AnnoOutputColumn
+//    private String actusr = "导入";
+//
+//    @ApiParam(value = "SID",example = "-1")
+//    @AnnoOutputColumn
+//    private String sid = UUID.randomUUID().toString()+UUID.randomUUID().toString();
+//
+//    /*@ApiParam(value = "接收数据日期",example = "-1")
+//    @AnnoOutputColumn
+//    private String recymd;
+//
+//    @ApiParam(value = "接收数据时间",example = "-1")
+//    @AnnoOutputColumn
+//    private String rechms;
+//
+//    @ApiParam(value = "同步标志",example = "-1")
+//    @AnnoOutputColumn
+//    private String synflg;*/
+//
+//    @ApiParam(value = "同步日期",example = "-1")
+//    @AnnoOutputColumn
+//    private String synymd;
+//
+//    @ApiParam(value = "同步时间",example = "-1")
+//    @AnnoOutputColumn
+//    private String synhms;
+//
+//    /*@ApiParam(value = "处理标志",example = "-1")
+//    @AnnoOutputColumn
+//    private String actflg;*/
+//
+//    @ApiParam(value = "处理日期",example = "-1")
+//    @AnnoOutputColumn
+//    private String actymd;
+//
+//    @ApiParam(value = "处理时间",example = "-1")
+//    @AnnoOutputColumn
+//    private String acthms;
+//
+//    @ApiParam(value = "状态标志",example = "-1")
+//    @AnnoOutputColumn
+//    private  String staflg;
+//
+//    @ApiParam(value = "顺序号",example = "-1")
+//    @AnnoOutputColumn
+//    private Integer seq;
+//
+//    @ApiParam(value = "GUID",example = "-1")
+//    @AnnoOutputColumn
+//    private String guid;
 
 
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMiscr.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMiscr.java
new file mode 100644
index 0000000..d466dd1
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMiscr.java
@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-19 13:21
+ * @Modify:
+ **/
+@Data
+@Api(value="零星领料(退)料结果",description = "零星领料(退)料结果")
+public class WmsMiscr extends SapBase{
+
+    @ApiParam(value = "编号",example = "1")
+    @AnnoOutputColumn
+    private String refid;
+
+    @ApiParam(value = "行号",example = "1")
+    @AnnoOutputColumn
+    private Double zeile;
+
+    @ApiParam(value = "工厂",example = "1")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "发出库存地点（退回库存地点）",example = "1")
+    @AnnoOutputColumn
+    private String lgort;
+
+    @ApiParam(value = "物料编码",example = "1")
+    @AnnoOutputColumn
+    private String matnr;
+
+    @ApiParam(value = "数量",example = "1")
+    @AnnoOutputColumn
+    private Double erfmg;
+
+    @ApiParam(value = "计量单位",example = "1")
+    @AnnoOutputColumn
+    private String erfme;
+
+    @ApiParam(value = "业务类型",example = "1")
+    @AnnoOutputColumn
+    private String zaction;
+
+    @ApiParam(value = "交易日期",example = "1")
+    @AnnoOutputColumn
+    private String zpost;
+
+    @ApiParam(value = "交易时间",example = "1")
+    @AnnoOutputColumn
+    private String ztime;
+
+    public Double getZeileVal() {
+        return zeile== null ? 0D : this.zeile.doubleValue();
+    }
+
+    public Double getErfmgVal() {
+        return  erfmg== null ? 0D : this.erfmg.doubleValue();
+    }
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 9617727..2567491 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -1851,7 +1851,22 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsVendorPart, result);
         return result;
     }
-
+    /**
+     * 主数据信息 分页查询
+     *
+     * @param wmsProdCfgType
+     * @return
+     */
+    public static DdlPackBean packHqlWmsProdCfgType(WmsProdCfgType wmsProdCfgType) {
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result);
+        DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result);
+        DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(),"isValid",result);
+        DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsDeleted(),"isDeleted",result);
+//        getStringBuilderPack(wmsProdCfgType, result);
+        return result;
+    }
 
     /**
      * 盘点范围 条件封装
@@ -1871,5 +1886,4 @@ public class WmsHqlPack {
 
         return result;
     }
-
 }