From 59818217ce3a46a0c1ea47d85a3c5d6607758811 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Sat, 9 Nov 2024 18:30:25 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=202=E3=80=81=E6=A0=A1=E9=AA=8C=E7=A0=81?=
 =?UTF-8?q?=E6=98=AF=E5=92=8C=E4=B8=8B=E7=BA=A7=E6=89=80=E6=9C=89=E7=A0=81?=
 =?UTF-8?q?=E5=90=A6=E4=BC=A0=E8=BF=87=E4=BA=86=E9=80=BB=E8=BE=91=E8=BF=98?=
 =?UTF-8?q?=E6=B2=A1=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/http/ErpBasicClient.java   | 11 +++++++++--
 .../service/collect/IoCollectOrderBackupService.java  |  6 +++++-
 src/main/resources/schemas/schema_v2.4.sql            |  3 +++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java
index c50e046ac..06c830e00 100644
--- a/src/main/java/com/glxp/api/http/ErpBasicClient.java
+++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java
@@ -38,6 +38,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -276,7 +277,7 @@ public class ErpBasicClient {
      */
     public BaseResponse<BasicSkPrescribeResponse> postOrder(PostCollectOrderRequest postOrderRequest) {
         ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(postOrderRequest.getThirdSys());
-        String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/yb/postOrder";
+        String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/uploadCollectOrder";
         try {
             String response = httpOkClient.uCloudPost(url, postOrderRequest);
             if (StrUtil.isEmpty(response)) {
@@ -486,5 +487,11 @@ public class ErpBasicClient {
             return ResultVOUtils.error(500, "连接第三方系统接口服务出错");
         }
     }
-
+    //TODO 阿超改==校验码是和下级所有码否传过了逻辑还没写
+    /**
+     * 校验码是和下级所有码否传过了
+     */
+    public BaseResponse<List> collectOrderCheckCode(List<String> codeList) {
+        return ResultVOUtils.success(new ArrayList<>());
+    }
 }
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 614d47222..321c84045 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
@@ -24,6 +24,7 @@ import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
 import com.glxp.api.entity.collect.*;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.http.ErpBasicClient;
 import com.glxp.api.http.sync.SpGetHttpClient;
@@ -41,6 +42,7 @@ import com.glxp.api.service.basic.UdiRlSupService;
 import com.glxp.api.service.inout.IoAddInoutService;
 import com.glxp.api.service.inout.IoCheckInoutService;
 import com.glxp.api.service.inout.IoOrderService;
+import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.util.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -101,7 +103,8 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
 
     @Value("${WEB_TITLE}")
     private String WEB_TITLE;
-
+    @Resource
+    SystemParamConfigService systemParamConfigService;
     public List<IoCollectOrderResponse> filterList(CollectOrderRequest collectOrderRequest) {
         if (collectOrderRequest == null) {
             return Collections.emptyList();
@@ -163,6 +166,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
     public void generateOrder(String billNo,AuthAdmin authAdmin) {
 
         IoCollectOrderBackup collectOrder = getByBillNo(billNo);
+
         SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
         //1.内部系统，且单据为扫码生成业务单则创建系统单据
         if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1 && sysWorkplaceDocumentEntity.getScanType() == 1) {
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 200593676..2b393bd83 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4718,3 +4718,6 @@ CALL Pro_Temp_ColumnWork('rel_code_batch', 'erpId',
 CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'relId',
                          ' bigint DEFAULT NULL COMMENT ''产品属性id''',
                          1);
+CALL Pro_Temp_ColumnWork('thr_yb_setup', 'signData',
+                         'char(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''签到时间''',
+                         1);