Merge branch 'test'

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

@@ -296,6 +296,7 @@ public class WmsEnumUtil {
 
     /**
      * 产品入库，发运状态
+     * WMS_产品报工明细信息 ：单据状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRODUCT_INSTOCK_STATUS {
@@ -601,7 +602,10 @@ public class WmsEnumUtil {
         IN_STOCK("IN_STOCK", "入库单"),
         SHIPPING("SHIPPING", "发运单"),
         QC("QC", "质检"),
-        CS("CS", "盘点");
+        CS("CS", "盘点"),
+        DR("DR", "直送收货"),
+        AMPR("AMPR", "AMP拉动收货");
+
         private String value;
         private String description;
 
@@ -2673,4 +2677,29 @@ public class WmsEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 外部接口单据来源枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SRC_STATUS {
+        ZMMES("ZMMES", "知明MES"),
+        TBMES("TBMES", "MES接口");
+
+        private String value;
+        private String description;
+
+        SRC_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java

@@ -78,6 +78,11 @@ public class BfDataObject extends BaseBean {
     private List<BfDataObjectProperty> propertyList;
 
     @Transient
+    @ApiParam(value = "数据对象主键")
+    @AnnoOutputColumn(hidden = true)
+    private BfDataObjectProperty primaryKey;
+
+    @Transient
     @ApiParam(value = "数据对象主键属性")
     @AnnoOutputColumn(hidden = true)
     private List<BfDataObjectProperty> primaryPropertyList;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java

@@ -17,6 +17,6 @@ public class ExportDataModel {
 
     private String exportData;
 
-    private LinkedHashMap<String, String> exportCol;
+    private String exportCol;
 
 }

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

@@ -116,4 +116,11 @@ public class WmsDocFgDetail extends BaseBean {
     @Column(name="SRC")
     @ApiParam("单据来源")
     public String src;
+
+    /**
+     * 是否锁定：1=锁定 2=未锁定
+     */
+    @Column(name="IS_LOCK")
+    @ApiParam(value = "是否锁定", example = "2")
+    public Integer isLock;
 }

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

@@ -63,4 +63,8 @@ public class WmsMoveMaster extends BaseBean {
     @Column(name = "CAR_NO")
     @ApiParam(value = "车牌号")
     private String carNo;
+
+    @Column(name = "BUSI_TYPE_CODE")
+    @ApiParam(value = "业务类型编码")
+    private Integer busiTypeCode;
 }

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

@@ -150,6 +150,21 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("特殊批次")
     public String fixLotNo;
 
+
+
+    @Transient
+    @ApiParam("业务类型编码")
+    private String busiTypeCode;
+
+
+    @Transient
+    @ApiParam(value = "交易类型代码")
+    private String transTypeCode;
+
+    @Transient
+    @ApiParam("关联单号")
+    public String refSrc;
+
     public WmsMoveSn(){}
 
     public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){
@@ -165,4 +180,20 @@ public class WmsMoveSn extends BaseBean {
     public Long getFinishedCounts() {
         return finishedCounts == null ? 0L : this.finishedCounts;
     }
+
+    public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String busiTypeCode,  String transTypeCode, String refSrc) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.destQty = destQty;
+        this.busiTypeCode = busiTypeCode;
+        this.transTypeCode = transTypeCode;
+        this.refSrc = refSrc;
+    }
+    public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String transTypeCode, String refSrc) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.destQty = destQty;
+        this.transTypeCode = transTypeCode;
+        this.refSrc = refSrc;
+    }
 }

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

@@ -136,6 +136,22 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("关联单号")
     public String refSrc;
 
+    @Column(name = "SRC_AREA_NO")
+    @ApiParam("来源库存地")
+    public String srcAreaNo;
+
+    @Column(name = "DEST_AREA_NO")
+    @ApiParam("目标库存地")
+    public String destAreaNo;
+
+    @Column(name = "BUSI_TYPE_CODE")
+    @ApiParam("交易类型")
+    public Integer busiTypeCode;
+
+    @Column(name = "IS_SYNC")
+    @ApiParam("是否同步")
+    public Integer isSync;
+
     @ApiParam(value = "待出库数量", example = "0")
     @Transient
     private Long waitingCounts;

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @author Yerik Stone
+ * @description WmsMoveUnfinishedOrderModel
+ * @date 2019/6/26
+ */
+@Data
+@Api("未完成订单模型")
+public class WmsMoveUnfinishedOrderModel extends  BaseBean{
+
+
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("未完成数量")
+    private Double destQty;
+
+    @ApiParam("业务类型")
+    private Integer busiTypeCode;
+
+    @ApiParam("交易类型")
+    private String transTypeCode;
+
+    @ApiParam("关联单号")
+    private String refSrc;
+
+    public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) {
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.destQty = destQty;
+        this.busiTypeCode = busiTypeCode;
+        this.transTypeCode = transTypeCode;
+        this.refSrc = refSrc;
+    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java

@@ -11,4 +11,12 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsConfig;
  * @Modify:
  **/
 public interface WmsConfigRepository extends BaseRepository<WmsConfig, Long> {
+
+    /**
+     * 按照工厂代码和配置代码查询配置信息
+     * @param organizeCode 工厂代码
+     * @param configCode 配置代码
+     * @return 配置信息
+     */
+    WmsConfig getFirstByOrganizeCodeAndConfigCode(String organizeCode, String configCode);
 }