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

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

@@ -1888,7 +1888,8 @@ public class WmsEnumUtil {
         ZONE(20, "ZONE", "存储区对象"),
         LOCATE(30, "LOCATE", "库位对象"),
         MATERIAL(40, "MATERIAL", "物料对象"),
-        TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象");
+        TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"),
+        BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象");
 
         private String code;
         private String description;

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

@@ -1,11 +1,14 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.wms.bean.WmsASNMaster;
 import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementMaster;
 import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -37,6 +40,35 @@ public class PrintOrderDataModel implements Serializable {
     @ApiParam(value = "移库单主表")
     public WmsDocMovementMaster movementMaster;
 
+    @ApiParam(value = "状态")
+    @Transient
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer orderStatus;
+
+    @ApiParam(value = "供应商名称")
+    @Transient
+    public String vendorName;
+
+    @ApiParam(value = "供应商编码")
+    @Transient
+    public String vendorNo;
+
+    @ApiParam(value = "客户编码")
+    @Transient
+    public String custNo;
+
+    @ApiParam(value = "ERP编号")
+    @Transient
+    public String erpSrcNo;
+
+    @ApiParam(value = "联系人")
+    @Transient
+    public String vendorOwner;
+
+    @ApiParam(value = "供应商邮箱")
+    @Transient
+    public String vendorEmail;
+
     public int getBusiDataType() {
         if (busiDataType != null) {
             return busiDataType.intValue();

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java

@@ -106,6 +106,10 @@ public class WmsLocate extends BaseBean {
     @ApiParam(value = "入库箱数", example = "-1")
     private Integer destBoxQty;
 
+    @Transient
+    @ApiParam(value = "错误信息", example = "-1")
+    private String errorMsg;
+
     @Column(name = "ENCRYPTION_NO")
     @ApiParam(value = "加密编码")
     private String encryptionNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -49,6 +51,7 @@ public class WmsPOMaster extends BaseBean {
      */
     @Column(name = "PO_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     public Integer poStatus;
 
     @Column(name = "VENDOR_NO")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java

@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+* @Description : 生产退料导入模板
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/17 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="生产退料导入模板",description = "生产退料导入模板")
+public class WmsProductReturnMovement implements Serializable{
+
+    @ApiParam(value = "单号")
+    @AnnoOutputColumn
+    private String orderNo;
+
+    @ApiParam(value = "物料编码")
+    @AnnoOutputColumn
+    private String partNo;
+
+    @ApiParam(value = "数量")
+    @AnnoOutputColumn
+    private Double qty;
+
+    @ApiParam(value = "源存储区")
+    @AnnoOutputColumn
+    private String srcZoneNo;
+
+    @ApiParam(value = "目标存储区")
+    @AnnoOutputColumn
+    private String destZoneNo;
+
+    @ApiParam(value = "业务类型")
+    @AnnoOutputColumn
+    private String busiType;
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String factory;
+
+    @ApiParam(value = "计划日期")
+    @AnnoOutputColumn
+    private String planDate;
+
+    @ApiParam(value = "计划时间")
+    @AnnoOutputColumn
+    private String planTime;
+
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java

@@ -22,31 +22,30 @@ public class GenerateLocateRule {
     /**
      * 存储区
      */
-    List<String> zonesList;
+    private List<String> zonesList;
 
     /**
      * 库位类型
      */
-    Integer locateType;
+    private Integer locateType;
 
     /**
      * 工厂代码
      */
-    String organizeCode;
+    private String organizeCode;
 
     /**
      * 库位代码
      */
-    String locateNo;
+    private String locateNo;
 
     /**
      * 入库箱数
      */
-    Integer destQty;
+    private Integer destQty;
 
     /**
      * 物料名称
      */
-    String partNo;
+    private String partNo;
-
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java

@@ -42,6 +42,9 @@ public class WmsDataAuthModel extends BaseBean {
     @ApiParam("交易代码列表")
     private List<String> transTypeList;
 
+    @ApiParam("业务类型列表")
+    private List<String> busiTypeList;
+
     @ApiParam(
             value = "新增操作",
             example = "0"