From 3583d1705730709ac3e9fc3ecdafb83eab8b179a Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 18 Jul 2023 09:27:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=BA=93=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/UdiContrastController.java          |  2 +-
 .../sync/SpsSyncDownloadController.java       |  1 -
 .../basic/BasicBussinessTypeEntity.java       | 24 ++++++++++---------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
index bf27ad05..62a87bcf 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
@@ -179,7 +179,7 @@ public class UdiContrastController {
     public BaseResponse syncOnline(@RequestBody UdiCombineRequest udiCombineRequest) {
         List<UdiProductEntity> udiInfoEntities = udiDlHttpClient.getUdiByUuid(udiCombineRequest.getOriginUuid());
         if (CollUtil.isNotEmpty(udiInfoEntities)) {
-            BaseResponse<List<ProductInfoEntity>> listBaseResponse = asyncDiDlHelper.dlByDiRes(udiInfoEntities.get(0).getNameCode());
+            BaseResponse<List<ProductInfoEntity>> listBaseResponse = asyncDiDlHelper.dlLastVersionByDi(udiInfoEntities.get(0).getNameCode());
             if (listBaseResponse.getCode() == 20000) {
                 List<ProductInfoEntity> productInfoEntityList = listBaseResponse.getData();
                 if (CollUtil.isNotEmpty(productInfoEntityList)) {
diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
index c042867d..b438c808 100644
--- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
+++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
@@ -678,7 +678,6 @@ public class SpsSyncDownloadController {
                         orderEntity.setInvCode(parentInv.getCode());
                         orderEntity.setDeptCode(parentInv.getParentId());
                         orderEntity.setFromCorp("科室使用出库");
-
                     }
 
 
diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
index 5a595853..351bbc66 100644
--- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
@@ -86,6 +86,12 @@ public class BasicBussinessTypeEntity {
      */
     @TableField(value = "checkUdims")
     private int checkUdims;
+    /**
+     * web前端页面新增单据
+     */
+    @TableField(value = "checkWebNew")
+    private int checkWebNew;
+
 
     /**
      * pda已校验单据
@@ -106,10 +112,10 @@ public class BasicBussinessTypeEntity {
     private int checkPc;
 
     /**
-     * web前端页面新增单据
+     * 流转生成单据
      */
-    @TableField(value = "checkWebNew")
-    private int checkWebNew;
+    @TableField(value = "checkChange")
+    private int checkChange;
 
     /**
      * 供应商平台导出单据
@@ -118,10 +124,10 @@ public class BasicBussinessTypeEntity {
     private int checkSp;
 
     /**
-     * 流转生成单据
+     * 平衡补单是否校验
      */
-    @TableField(value = "checkChange")
-    private int checkChange;
+    @TableField(value = "checkBalance")
+    private int checkBalance;
 
     /**
      * UDIMS平台单据 二次校验
@@ -177,11 +183,7 @@ public class BasicBussinessTypeEntity {
     @TableField(value = "supplementOrderType")
     private String supplementOrderType;
 
-    /**
-     * 平衡补单是否校验
-     */
-    @TableField(value = "checkBalance")
-    private int checkBalance;
+
 
     /**
      * 平衡补单是否二次验收