Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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/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/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;
+    }
+}