From f11087d6104c903010003fac5f941afa7e203567 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Sat, 6 Aug 2022 11:47:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/entity/sync/InvBusUserEntity.java   | 13 +++++++++
 .../admin/res/sync/SpsSyncDataResponse.java   | 27 ++++++++++---------
 2 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/entity/sync/InvBusUserEntity.java

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/InvBusUserEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/InvBusUserEntity.java
new file mode 100644
index 0000000..9d1fed0
--- /dev/null
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/InvBusUserEntity.java
@@ -0,0 +1,13 @@
+package com.glxp.sale.admin.entity.sync;
+
+import lombok.Data;
+
+@Data
+public class InvBusUserEntity {
+    private Integer id;
+    private String userId;
+    private String subInvCode;
+    private String scAction;
+    private String remark;
+
+}
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 977e3c4..71300c8 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
@@ -16,8 +16,6 @@ public class SpsSyncDataResponse {
 
     //同步任务ID
     private String taskId;
-    List<InvWarehouseEntity> invWarehouseEntities;
-    List<UdiInfoEntity> udiInfoEntities;
     List<BasicUnitMaintainEntity> basicUnitMaintainEntities;
     List<ThrInvWarehouseEntity> thrInvWarehouseEntities;
     List<ThrSubInvWarehouseEntity> thrSubInvWarehouseEntities;
@@ -25,14 +23,24 @@ public class SpsSyncDataResponse {
     List<ThrProductsEntity> thrProductsEntities;
     List<ThrOrderDetailEntity> thrOrderDetailEntities;
     List<ThrOrderEntity> thrOrderEntities;
+
+    //耗材字典相关
     List<CompanyProductRelevanceEntity> companyProductRelevanceEntities;
     List<UdiRelevanceEntity> udiRelevanceEntities;
-    List<InvSubWarehouseEntity> invSubWarehouseEntities;
-    List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities;
-    List<WarehouseUserEntity> warehouseUserEntities;
+    List<UdiInfoEntity> udiInfoEntities;
+
+    //用户信息
     List<AuthAdmin> authAdminList;
     List<DeptEntity> deptEntityList;
 
+
+    //仓库相关
+    List<InvWarehouseEntity> invWarehouseEntities;
+    List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities;
+    List<WarehouseUserEntity> warehouseUserEntities;
+    List<InvSubWarehouseEntity> invSubWarehouseEntities;
+    List<InvBusUserEntity> invBusUserEntities;
+
     @Override
     public String toString() {
         StringBuffer remark = new StringBuffer();
@@ -43,8 +51,8 @@ public class SpsSyncDataResponse {
         if (CollUtil.isNotEmpty(invSubWarehouseEntities)) {
             remark.append("分库信息：").append(invSubWarehouseEntities.size()).append(" 条\n");
         }
-        if (CollUtil.isNotEmpty(warehouseBussinessTypeEntities)) {
-            remark.append("仓库用户信息：").append(warehouseBussinessTypeEntities.size()).append(" 条\n");
+        if (CollUtil.isNotEmpty(warehouseUserEntities)) {
+            remark.append("仓库用户信息：").append(warehouseUserEntities.size()).append(" 条\n");
         }
         if (CollUtil.isNotEmpty(warehouseBussinessTypeEntities)) {
             remark.append("仓库单据类型：").append(warehouseBussinessTypeEntities.size()).append(" 条\n");
@@ -80,14 +88,9 @@ public class SpsSyncDataResponse {
         if (CollUtil.isNotEmpty(thrOrderEntities)) {
             remark.append("第三方业务单据：").append(thrOrderEntities.size()).append(" 条\n");
         }
-//        if (CollUtil.isNotEmpty(thrOrderDetailEntities)) {
-//            remark.append("第三方单据详情：").append(thrOrderDetailEntities.size()).append(" 条\n");
-//        }
-
         if (CollUtil.isNotEmpty(authAdminList)) {
             remark.append("用户信息：").append(authAdminList.size()).append(" 条\n");
         }
-
         if (CollUtil.isNotEmpty(deptEntityList)) {
             remark.append("部门信息：").append(deptEntityList.size()).append(" 条\n");
         }