From b64f451f37fafdaac2262972d3711d2370b72480 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 19 七月 2023 16:20:23 +0800
Subject: [PATCH] #接口对接工具类实装

---
 src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java      |   21 +++++++
 src/main/java/com/zy/asrs/controller/OpenController.java                       |   20 +++---
 src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java |   19 ++++++
 src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java           |   29 +++++++++
 src/main/java/com/zy/asrs/entity/param/LabellerCompleteParam.java              |   13 ++++
 src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java                   |   35 +++++++++++
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java                    |   27 +++++++++
 src/main/java/com/zy/asrs/service/OpenService.java                             |   11 +++
 8 files changed, 165 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index a8b9c0a..690fb42 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -199,10 +199,10 @@
     @PostMapping("/labeller/complete/auth/v1")
     @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�")
     public synchronized R labellerComplete(@RequestHeader(required = false) String appkey,
-                                           @RequestBody OpenOrderPakinParam param,
+                                           @RequestBody LabellerCompleteParam param,
                                            HttpServletRequest request) {
         auth(appkey, param, request);
-
+        openService.labellerComplete(param);
         return R.ok();
     }
 
@@ -212,10 +212,10 @@
     @PostMapping("/labeller/mat/auth/v1")
     @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�")
     public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
-                                           @RequestBody OpenOrderPakinParam param,
+                                           @RequestBody LabellerMatParam param,
                                            HttpServletRequest request) {
         auth(appkey, param, request);
-
+        openService.labellerMat(param);
         return R.ok();
     }
 
@@ -225,10 +225,10 @@
     @PostMapping("/palletizing/complete/auth/v1")
     @AppAuth(memo = "涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
     public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey,
-                                           @RequestBody OpenOrderPakinParam param,
+                                           @RequestBody PalletizingCompleteParam param,
                                            HttpServletRequest request) {
         auth(appkey, param, request);
-
+        openService.palletizingComplete(param);
         return R.ok();
     }
 
@@ -239,10 +239,10 @@
     @PostMapping("/single/unstacking/complete/auth/v1")
     @AppAuth(memo = "妗佹灦涓婁綅杞欢锛氬崟娆℃媶鍨涘畬鎴愰�氱煡")
     public synchronized R singleUnstackingComplete(@RequestHeader(required = false) String appkey,
-                                            @RequestBody OpenOrderPakoutParam param,
+                                            @RequestBody SingleUnstackingCompleteParam param,
                                             HttpServletRequest request) {
         auth(appkey, param, request);
-
+        openService.singleUnstackingComplete(param);
         return R.ok();
     }
 
@@ -252,10 +252,10 @@
     @PostMapping("/single/mount/unstacking/complete/auth/v1")
     @AppAuth(memo = "妗佹灦涓婁綅杞欢锛氬崟鎵樻媶鍨涘畬鎴愰�氱煡")
     public synchronized R singleMountUnstackingComplete(@RequestHeader(required = false) String appkey,
-                                            @RequestBody OpenOrderPakoutParam param,
+                                            @RequestBody SingleMountUnstackingCompleteParam param,
                                             HttpServletRequest request) {
         auth(appkey, param, request);
-
+        openService.singleMountUnstackingComplete(param);
         return R.ok();
     }
 
diff --git a/src/main/java/com/zy/asrs/entity/param/LabellerCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/LabellerCompleteParam.java
new file mode 100644
index 0000000..2d19119
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/LabellerCompleteParam.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class LabellerCompleteParam {
+    private Integer devNo;	//	鏄�	int	绔欑偣鍙�
+    private String labNo;	//	鏄�	瀛楃涓�	璐存爣鏈哄彿
+    private String WrkNo;	//	鏄�	瀛楃涓�	宸ヤ綔鍙凤紙鐢ㄤ簬淇℃伅纭锛�
+    private String labResult;	//	鏄�	瀛楃涓�	璐存爣缁撴灉锛歄K/NG
+    private String requestTime;	//	鏄�	瀛楃涓�	璇锋眰鏃堕棿, yyyy-MM-dd HH:mm:ss
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java b/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
new file mode 100644
index 0000000..4d48a87
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
@@ -0,0 +1,35 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class LabellerMatParam {
+
+    /*
+     *绔欑偣鍙�
+     */
+    private Integer devNo;
+    /*
+     *璐存爣鏈哄彿
+     */
+    private String labNo;
+    /*
+     *璇锋眰鏃堕棿, yyyy-MM-dd HH:mm:ss
+     */
+    private String requestTime;
+
+    private String labTemplate;	//	璐存爣妯℃澘鍙凤紙璐存爣鏈虹郴缁熷畾锛�
+    private String WrkNo;	//	瀛楃涓�	宸ヤ綔鍙� 锛堣创鏍囨満淇濆瓨锛岃创鏍囧畬鎴愯姹傞檮甯︼級
+    private String orderNo;	//	瀛楃涓�	璁㈠崟鍙�
+    private String labellingTime;	//	瀛楃涓�	璐存爣鏃ユ湡  yyyy-MM-dd HH:mm:ss
+    private String matnr;	//	瀛楃涓�	鍟嗗搧缂栧彿
+    private String maktx;	//	瀛楃涓�	鍟嗗搧鍚嶇О
+    private String specs;	//	瀛楃涓�	瑙勬牸
+    private String batch;	//	瀛楃涓�	鎵规
+    private String unit	;	//瀛楃涓�	鍗曚綅
+    private String anfme;	//	瀛楃涓�	鏁伴噺
+    private String temp1;	//	瀛楃涓�	澶囩敤
+    private String temp2;	//	瀛楃涓�	澶囩敤
+    private String temp3;	//	瀛楃涓�	澶囩敤
+    private String temp4;	//	瀛楃涓�	澶囩敤
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java
new file mode 100644
index 0000000..4f2aa7b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java
@@ -0,0 +1,29 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PalletizingCompleteParam {
+
+    private String barcode;//	鏄�	瀛楃涓�	鎵樼洏鐮�
+    private String palletizingNo;//	鏄�	瀛楃涓�	鐮佸灈浣嶇紪鍙�
+    private String createTime;//	鏄�	瀛楃涓�	鍒涘缓鏃堕棿
+
+    private List<PalletizingCompleteParam.MatList> matLists;//		鏄�	鍒楄〃	鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級
+
+    @Data
+    public class MatList{
+        private String matnr;//	鏄�	瀛楃涓�	鐗╂枡缂栫爜
+        private String maktx;//	鏄�	瀛楃涓�	鐗╂枡鍚嶇О
+        private String boxNo;//	鏄�	瀛楃涓�	鏈ㄧ缂栧彿锛堝敮涓�瀛楁锛屽嚭搴撲緷鎹紝鍑哄簱鏃舵寜鐓ф湪绠辩紪鍙峰嚭搴擄級
+        private String position;//	鏄�	瀛楃涓�	鏈ㄧ鐮佸灈浣嶇疆锛堟媶鍨涙椂闇�瑕侊級
+        private Double weight;//	鏄�	灏忔暟鍨�	閲嶉噺
+        private Integer anfme;//	鏄�	鏁板瓧鍨�	鏈ㄧ涓摐绠旀暟閲�
+        private String batch;//	(鏄惁鍒嗘壒)	瀛楃涓�	鎵规鍙�
+        private String specs;//	(鏄惁闇�瑕侊級	瀛楃涓�	瑙勬牸
+    }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
new file mode 100644
index 0000000..965333a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
@@ -0,0 +1,19 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+public class SingleMountUnstackingCompleteParam {
+    private String barcode;//	鏄�	瀛楃涓�	鎵樼洏鐮�
+    private String palletizingNo;//	鏄�	瀛楃涓�	鎷嗗灈浣嶇紪鍙�
+    private String createTime;//		鏄�	瀛楃涓�	鍒涘缓鏃堕棿
+    private String uuid;//		鏄�	瀛楃涓�	鏃堕棿鎴�
+    private List<SingleMountUnstackingCompleteParam.MatList> matLists;//		鏄�	鍒楄〃	鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級
+
+    @Data
+    public class MatList{
+        private String position;//		鏄�	瀛楃涓�	鏈ㄧ鐮佸灈浣嶇疆
+        private String boxNo;//		鏄�	瀛楃涓�	鏈ㄧ缂栧彿锛堝敮涓�瀛楁锛屽嚭搴撲緷鎹紝鍑哄簱鏃舵寜鐓ф湪绠辩紪鍙峰嚭搴擄級
+    }
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java
new file mode 100644
index 0000000..ca3723f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java
@@ -0,0 +1,21 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SingleUnstackingCompleteParam {
+    private String barcode;//	鏄�	瀛楃涓�	鎵樼洏鐮�
+    private String palletizingNo;//	鏄�	瀛楃涓�	鎷嗗灈浣嶇紪鍙�
+    private String createTime;//		鏄�	瀛楃涓�	鍒涘缓鏃堕棿
+    private String uuid;//		鏄�	瀛楃涓�	鏃堕棿鎴�
+    private List<SingleUnstackingCompleteParam.MatList> matLists;//		鏄�	鍒楄〃	鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級
+
+    @Data
+    public class MatList{
+        private String position;//		鏄�	瀛楃涓�	鏈ㄧ鐮佸灈浣嶇疆
+        private String boxNo;//		鏄�	瀛楃涓�	鏈ㄧ缂栧彿锛堝敮涓�瀛楁锛屽嚭搴撲緷鎹紝鍑哄簱鏃舵寜鐓ф湪绠辩紪鍙峰嚭搴擄級
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index afd90b1..7eb3b75 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -43,4 +43,15 @@
      * @param param
      */
     void syncMat(MatSyncParam param);
+
+    void labellerComplete(LabellerCompleteParam param);
+
+    void labellerMat(LabellerMatParam param);
+
+    void palletizingComplete(PalletizingCompleteParam param);
+
+    void singleUnstackingComplete(SingleUnstackingCompleteParam param);
+
+    void singleMountUnstackingComplete(SingleMountUnstackingCompleteParam 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 5d8970a..65145a6 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -543,5 +543,32 @@
         }
 
     }
+    @Override
+    @Transactional
+    public void labellerComplete(LabellerCompleteParam param) {
+
+
+    }
+    @Override
+    @Transactional
+    public void labellerMat(LabellerMatParam param){
+
+    }
+    @Override
+    @Transactional
+    public void palletizingComplete(PalletizingCompleteParam param) {
+
+    }
+    @Override
+    @Transactional
+    public void singleUnstackingComplete(SingleUnstackingCompleteParam param) {
+
+    }
+    @Override
+    @Transactional
+    public void singleMountUnstackingComplete(SingleMountUnstackingCompleteParam param) {
+
+    }
+
 
 }

--
Gitblit v1.9.1