From 40ce17b0d663e58467c751e7848fb613b4149cb9 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Wed, 27 Nov 2024 16:17:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E8=AF=81=E5=85=A5=E5=BA=93=E7=BB=84=E7=9B=98=E5=AE=9E=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iostorage/server/dto/PdaFormInMst.java      | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/server/dto/PdaFormInMst.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/server/dto/PdaFormInMst.java
index e70bec11..edb68f62 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/server/dto/PdaFormInMst.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/server/dto/PdaFormInMst.java
@@ -36,12 +36,12 @@ public class PdaFormInMst implements Serializable {
     /**
      * 订单号
      */
-    private String MONumber;
+    private String moNumber;
 
     /**
-     * 订单号
+     * 订单明细号
      */
-    private String MOSeq;
+    private String moEntrySeq;
 
     /**
      * 物料id
@@ -78,12 +78,19 @@ public class PdaFormInMst implements Serializable {
     /**
      * 组织
      */
-    private String StockOrgId;
+    private String stockOrgId;
+
+
+
+    /**
+     * 生产组织
+     */
+    private String prdOrgId;
 
     /**
      * 货主
      */
-    private String OwnerId_Id;
+    private String ownerId_Id;
 
     /**
      * ERP仓库

From 19bd76cb2760492d76d0c85e8664b15caa447c5a Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Wed, 27 Nov 2024 18:50:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E8=AF=81=E5=85=A5=E5=BA=93=E7=BB=84=E7=9B=98=E5=AE=9E=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iostorage/server/dto/PdaFormInMst.java    | 80 +++++++++++++++----
 1 file changed, 64 insertions(+), 16 deletions(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/server/dto/PdaFormInMst.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/server/dto/PdaFormInMst.java
index edb68f62..88b2d3a7 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/server/dto/PdaFormInMst.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/server/dto/PdaFormInMst.java
@@ -1,12 +1,8 @@
 package org.nl.wms.pda_manage.iostorage.server.dto;
 
-import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
 
 /**
  * <p>
@@ -26,7 +22,7 @@ public class PdaFormInMst implements Serializable {
      */
     private String vehicle_code;
     /**
-     * 单据编码
+     * 单据编号
      */
     private String billNo;
     /**
@@ -34,12 +30,12 @@ public class PdaFormInMst implements Serializable {
      */
     private String bar_code;
     /**
-     * 订单号
+     * 关联生产订单号/收料清单号
      */
     private String moNumber;
 
     /**
-     * 订单明细号
+     * 关联生产订单号/收料清单号明细序号
      */
     private String moEntrySeq;
 
@@ -67,35 +63,44 @@ public class PdaFormInMst implements Serializable {
     private String unit_id;
 
     /**
-     * 单位name
+     * 基本单位/采购单位Id
+     */
+    private String remainInStockUnitId;
+
+
+    /**
+     * 单位名称
      */
     private String unit_name;
     /**
-     * 入库数量
+     * 入库数量/采购数量
      */
     private String qty;
 
+
     /**
-     * 组织
+     * 入库组织/收料组织FStockOrgId
      */
     private String stockOrgId;
 
 
-
     /**
-     * 生产组织
+     * 生产组织/采购组织FPurchase0rgId
      */
     private String prdOrgId;
 
-    /**
-     * 货主
-     */
-    private String ownerId_Id;
 
     /**
      * ERP仓库
      */
     private String stockId;
+
+
+    /**
+     * ERP仓库库存状态Id
+     */
+    private String stockStatusId;
+
     /**
      * 单重
      */
@@ -105,4 +110,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;
+
 }