From ac96c18a228c8d16e9f8f25c0866d1659c029407 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 01 十一月 2024 16:43:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/param/TagParam.java        |   11 +++++++++++
 src/main/java/com/zy/asrs/controller/OpenController.java    |   15 +++++++++++++++
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |    7 ++++++-
 src/main/java/com/zy/asrs/service/OpenService.java          |    2 ++
 4 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 0fdc587..232f521 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -39,6 +39,21 @@
     private WrkMastService wrkMastService;
 
 
+    @PostMapping("/tagSync/v1")
+    @AppAuth(memo = "鐗╂枡鍒嗙被鍚屾")
+    public synchronized R tagSync(@RequestHeader(required = false) String appkey,
+                                        @RequestBody(required = false) List<TagParam> param,
+                                        HttpServletRequest request) {
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        openService.syncTag(param);
+        return R.ok();
+
+    }
+
+
     @PostMapping("/wrkMast/finish/v1")
     @AppAuth(memo = "鍥涘悜杞︿换鍔″畬鎴�")
     public synchronized R wrkMastFinish(@RequestHeader(required = false) String appkey,
diff --git a/src/main/java/com/zy/asrs/entity/param/TagParam.java b/src/main/java/com/zy/asrs/entity/param/TagParam.java
new file mode 100644
index 0000000..ab87118
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TagParam.java
@@ -0,0 +1,11 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TagParam {
+    private String parentTagName;
+    private String tagName;
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 2b59fdf..3a53ab7 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -47,4 +47,6 @@
     boolean agvHaiKang(String wrkNo);
 
     List<LocDetlByTimeDTO> selectTimeLocDetl(TimeSelectParam param);
+
+    void syncTag(List<TagParam> param);
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index ddf7eb9..f042c12 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -585,7 +585,7 @@
                         if (!Cools.isEmpty(order)) {
                             locDetlByTimeDTO.setDate(order.getOrderTime());
                             locDetlByTimeDTO.setWarehouse(order.getItemName());
-                            locDetlByTimeDTO.setOrderType(order.getDocType().toString());
+                            locDetlByTimeDTO.setOrderType(order.getDocType$());
                         }
                         locDetlByTimeDTO.setMatnr(wrkDetlLog.getMatnr());
                         locDetlByTimeDTO.setLocNo(wrkMastLog.getIoType() <100? wrkMastLog.getLocNo(): wrkMastLog.getSourceLocNo());
@@ -633,4 +633,9 @@
         return true;
     }
 
+    @Override
+    @Transactional
+    public void syncTag(List<TagParam> param) {
+
+    }
 }

--
Gitblit v1.9.1