From c3a1ed3a1182b8828736fb42bc4165d15a3595cb Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Thu, 23 Jun 2022 23:21:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E7=BB=A7=E6=9C=8D=E5=8A=A1=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=A1=A5=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/entity/sync/BussinessTypeEntity.java   |  1 +
 .../admin/entity/sync/InvSubWarehouseEntity.java | 16 ++++++++++++++++
 .../glxp/sale/admin/entity/sync/OrderEntity.java |  2 +-
 .../sale/admin/res/sync/SpsSyncDataResponse.java |  8 ++++++--
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/entity/sync/InvSubWarehouseEntity.java

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/BussinessTypeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/BussinessTypeEntity.java
index 862dc8a..62e68a5 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/BussinessTypeEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/BussinessTypeEntity.java
@@ -60,4 +60,5 @@ public class BussinessTypeEntity {
     private boolean scanPreIn;
     private boolean vailInv;
     private boolean codeFillCheck;
+    private String defaultSubInv;
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/InvSubWarehouseEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/InvSubWarehouseEntity.java
new file mode 100644
index 0000000..6b692a5
--- /dev/null
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/InvSubWarehouseEntity.java
@@ -0,0 +1,16 @@
+package com.glxp.sale.admin.entity.sync;
+
+import lombok.Data;
+
+@Data
+public class InvSubWarehouseEntity {
+
+    private String id;
+    private String code;
+    private String name;
+    private String parentId;
+    private String remark;
+    private boolean defaultInv;
+
+
+}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/OrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/OrderEntity.java
index ef33952..dd1e27d 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/OrderEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/OrderEntity.java
@@ -50,5 +50,5 @@ public class OrderEntity {
     //审核时间
     private Date auditTime;
     private boolean syncOutChange;
-
+    private String fromSubInvCode;
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java
index 568c9a1..27f9a28 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java
@@ -25,8 +25,7 @@ public class SpsSyncDataResponse {
     List<ThrOrderEntity> thrOrderEntities;
     List<CompanyProductRelevanceEntity> companyProductRelevanceEntities;
     List<UdiRelevanceEntity> udiRelevanceEntities;
-
-
+    List<InvSubWarehouseEntity> invSubWarehouseEntities;
     List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities;
     List<WarehouseUserEntity> warehouseUserEntities;
     List<AuthAdmin> authAdminList;
@@ -37,6 +36,11 @@ public class SpsSyncDataResponse {
         if (CollUtil.isNotEmpty(invWarehouseEntities)) {
             remark.append("仓库信息：").append(invWarehouseEntities.size()).append(" 条\n");
         }
+
+        if (CollUtil.isNotEmpty(invSubWarehouseEntities)) {
+            remark.append("分库信息：").append(invSubWarehouseEntities.size()).append(" 条\n");
+        }
+
         if (CollUtil.isNotEmpty(warehouseBussinessTypeEntities)) {
             remark.append("仓库用户信息：").append(warehouseBussinessTypeEntities.size()).append(" 条\n");
         }