Merge remote-tracking branch 'origin/master'

# Conflicts:
#	wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/server/dto/PdaFormInMst.java

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/server/dto/PdaFormInMst.java

@@ -1,13 +1,8 @@
 package org.nl.wms.pda_manage.iostorage.server.dto;
 
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
 
 /**
  * <p>
@@ -27,7 +22,7 @@ public class PdaFormInMst implements Serializable {
      */
     private String vehicle_code;
     /**
-     * 单据编码
+     * 单据编号
      */
     private String billNo;
     /**
@@ -35,16 +30,14 @@ public class PdaFormInMst implements Serializable {
      */
     private String bar_code;
     /**
-     * 订单号
+     * 关联生产订单号/收料清单号
      */
-    @JsonProperty("MONumber")
+    private String moNumber;
-    private String MONumber;
 
     /**
-     * 订单号
+     * 关联生产订单号/收料清单号明细序号
      */
-    @JsonProperty("MOSeq")
+    private String moEntrySeq;
-    private String MOSeq;
 
     /**
      * 物料id
@@ -70,31 +63,45 @@ public class PdaFormInMst implements Serializable {
     private String unit_id;
 
     /**
-     * 单位name
+     * 基本单位/采购单位Id
+     */
+    private String remainInStockUnitId;
+
+
+    /**
+     * 单位名称
      */
     private String unit_name;
     /**
-     * 入库数量
+     * 入库数量/采购数量
      */
     private Integer qty;
 
-    /**
-     * 组织
-     */
-    @JsonProperty("StockOrgId")
-    private String StockOrgId;
 
     /**
-     * 货主
+     * 入库组织/收料组织FStockOrgId
      */
-    @JsonProperty("OwnerId_Id")
+    private String stockOrgId;
-    private String OwnerId_Id;
+
+
+    /**
+     * 生产组织/采购组织FPurchase0rgId
+     */
+    private String prdOrgId;
+
 
     /**
      * ERP仓库
      */
     private String stockId;
 
+
+    /**
+     * ERP仓库库存状态Id
+     */
+    private String stockStatusId;
+
+
     /**
      * 入库仓库
      */
@@ -108,4 +115,47 @@ public class PdaFormInMst implements Serializable {
      */
     private String pcsn;
 
+    /**
+     * 单据类型
+     */
+    private String billTypeId;
+    /**
+     * 单据类型
+     */
+    private String BillType;
+    /**
+     * 供应商Id
+     */
+    private String supplierId;
+
+    /**
+     * 货主
+     */
+    private String ownerId_Id;
+
+
+    /**
+     * 货主类型id
+     */
+    private String ownerTypeId;
+
+
+    /**
+     * 保管者类型Id
+     */
+    private String KeeperTypeId;
+    /**
+     * 保管者Id
+     */
+    private String keeperId;
+
+    /**
+     * 业务类型
+     */
+    private String businessType;
+    /**
+     * 入库时间
+     */
+    private String Date;
+
 }