From 068337b76e3f5fc0d7724dafd85bc46f717e1f1b Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Wed, 12 Mar 2025 14:37:18 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=20=E5=8C=BB=E4=BF=9D=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/res/collect/CollectOrderBizResponse.java     |  2 +-
 .../service/collect/IoCollectOrderBackupService.java | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
index bdd0670d7..656b33f0a 100644
--- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
@@ -201,7 +201,7 @@ public class CollectOrderBizResponse {
     private String measname;
 
 
-    private String invDataType;
+    private String trdnFlag;
 
 
 
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
index ca29bcdaf..f6dc454e3 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
@@ -177,8 +177,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
 
     @Transactional(rollbackFor = Exception.class)
     public void generateOrder(String billNo, AuthAdmin authAdmin) {
-        log.error("单据返回=========1111" );
-
         IoCollectOrderBackup collectOrder = getByBillNo(billNo);
 
         SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
@@ -187,8 +185,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
              sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.filterListExhibitGoods(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
 
         }
-        log.error("单据返回=========2222-1"+sysWorkplaceDocumentEntity +collectOrder.getWorkPlaceCode()+ collectOrder.getBusType());
-        log.error("单据返回=========2222-2"+collectOrder.getWorkPlaceCode()+ "==="+collectOrder.getBusType());
 
         //1.内部系统，且单据为扫码生成业务单则创建系统单据
         if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1 && sysWorkplaceDocumentEntity.getScanType() == 1) {
@@ -217,12 +213,10 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
                 updateReview(authAdmin, orderEntity);
             }
         }
-        log.error("单据返回=========2222"+collectOrder );
 
         if (sysWorkplaceDocumentEntity != null) {
             Integer uploadYb = sysWorkplaceDocumentEntity.getUploadYb();
             if (uploadYb == 1) {
-                log.error("单据返回=========3333" );
 
                 uploadThrid(collectOrder);
             }
@@ -438,9 +432,9 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
                             .last("limit 1")
             );
             if(count >0){
-                collectOrderBizResponse.setInvDataType("1");
+                collectOrderBizResponse.setTrdnFlag("1");
             }else {
-                collectOrderBizResponse.setInvDataType("0");
+                collectOrderBizResponse.setTrdnFlag("0");
 
             }
         }
@@ -474,7 +468,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
         }
         // 医保上传
         BaseResponse baseResponse = erpBasicClient.postOrder(orderRequest);
-        log.error("单据返回=========" + baseResponse);
         if (baseResponse.getCode() == 20000) {
             // 触发上传 转发至中继服务 到外网 再到国家同步库
             ThreadUtil.execAsync(() -> {
@@ -551,7 +544,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
         IoCollectOrderBackup updateOrder = new IoCollectOrderBackup();
         updateOrder.setBillNo(billNo);
         try {
-            log.error("单据返回=========0000"+billNo );
 
             this.generateOrder(billNo, authAdmin);
             updateOrder.setUploadStatus(2);