From 84d2f939aea807d2a18f0d03bc25c9ec02d55e0f Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Fri, 11 Oct 2024 09:24:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/TestController.java  | 16 ++++++++++++++++
 .../api/entity/thrsys/ThrSystemDetailEntity.java |  2 ++
 .../service/collect/RelCodeDetailService.java    |  3 +++
 .../thrsys/impl/ThrProductsServiceImpl.java      |  1 +
 .../java/com/glxp/api/task/SyncHeartTask.java    |  4 ++--
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/TestController.java b/src/main/java/com/glxp/api/controller/TestController.java
index 815d4c6aa..6c54073de 100644
--- a/src/main/java/com/glxp/api/controller/TestController.java
+++ b/src/main/java/com/glxp/api/controller/TestController.java
@@ -11,6 +11,7 @@ import com.glxp.api.req.sync.BasicExportStatusRequest;
 import com.glxp.api.res.chs.YbHcflEntityResponse;
 import com.glxp.api.service.thrsys.ThrConsumeMaterialCategoryService;
 import com.glxp.api.service.thrsys.ThrInvOrderService;
+import com.glxp.api.service.thrsys.ThrProductsService;
 import com.glxp.api.task.TestStatOrderService;
 import com.glxp.api.util.MsDateUtil;
 import com.glxp.api.util.RedisUtil;
@@ -123,4 +124,19 @@ public class TestController {
         return ResultVOUtils.success("");
     }
 
+
+    /**
+     * 拉取视图测试
+     */
+    @Resource
+    private ThrProductsService thrProductsService;
+    @GetMapping("/test/downloadThrPi")
+    public BaseResponse downloadThrPi() {
+        ThrSystemDetailEntity thrSystemDetailEntity = new ThrSystemDetailEntity();
+        thrSystemDetailEntity.setThirdSysFk("thirdId");
+        thrSystemDetailEntity.setProductType(2);
+        thrProductsService.downloadThrPi(thrSystemDetailEntity);
+        return ResultVOUtils.success("");
+    }
+
 }
diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java
index 42d382f46..2af8eb417 100644
--- a/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java
+++ b/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java
@@ -27,6 +27,8 @@ public class ThrSystemDetailEntity {
     private Integer time;
     private Integer dlLastTime;
 
+    private Integer productType;
+
     public String getValue() {
         if (value == null)
             return null;
diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java b/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java
index 8772e6156..a5cf1cc97 100644
--- a/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java
+++ b/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java
@@ -54,6 +54,9 @@ public class RelCodeDetailService extends ServiceImpl<RelCodeDetailMapper, RelCo
             if (parentCode.endsWith("\u001D")) {
                 parentCode = parentCode.replace("\u001D", "");
             }
+            if(StrUtil.equals(curCode,parentCode)){
+                throw new JsonException("录入条码重复！");
+            }
             UdiEntity parentCodeUdi = FilterUdiUtils.getUdi(parentCode);
             if (parentCodeUdi == null){
                 throw new JsonException("无效父级条码！");
diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
index 6e6feeed2..a57890c02 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
@@ -192,6 +192,7 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
         int limit = 100;
         FilterThrProductsRequest request = new FilterThrProductsRequest();
         request.setThirdSysFk(thrSystemDetailEntity.getThirdSysFk());
+        request.setProductType(thrSystemDetailEntity.getProductType());
         request.setLimit(limit);
         while (true) {
             request.setPage(page);
diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java
index 736423d74..f9854bbab 100644
--- a/src/main/java/com/glxp/api/task/SyncHeartTask.java
+++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java
@@ -42,8 +42,8 @@ public class SyncHeartTask implements SchedulingConfigurer {
                 triggerContext -> {
                     ScheduledRequest scheduledRequest = new ScheduledRequest();
                     scheduledRequest.setCronName("heartTask");
-                    ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
-                    String cron = scheduledEntity.getCron();
+//                    ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
+                    String cron = "0 0 0 1 * ?";
                     if (cron.isEmpty()) {
                         log.error("cron is null");
                     }