From ef811df34e156ea6d253fbfa12c76b4c0a593840 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 03 六月 2023 14:27:11 +0800
Subject: [PATCH] 基础数据err

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index af47237..f689107 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -143,9 +143,11 @@
         return R.ok().add(openService.queryStock());
     }
 
+    /**
+     * 鍟嗗搧淇℃伅鍚屾鎺ュ彛
+     */
     @PostMapping("/mat/v1")
-//    @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
-    public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
+    public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey,
                                       @RequestBody(required = false) MatSyncParam param,
                                       HttpServletRequest request){
         auth(appkey, param, request);
@@ -176,6 +178,46 @@
 
     }
 
+    /**
+     * 鍏ュ簱閫氱煡妗g敓鎴�
+     */
+    @PostMapping("/comb/v1")
+    public synchronized R combMES(@RequestHeader(required = false) String appkey,
+                                      @RequestBody(required = false) CombParam param,
+                                      HttpServletRequest request){
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        openService.combMes(param);
+        return R.ok("缁勬墭鎴愬姛");
+    }
+
+    /**
+     * 鍏ュ簱璁板綍鑾峰彇
+     */
+    @PostMapping("/inlog/v1")
+    public synchronized R inlogERP(@RequestHeader(required = false) String appkey,
+                                  HttpServletRequest request){
+        auth(appkey,null, request);
+        if (Cools.isEmpty()) {
+            return R.parse(BaseRes.PARAM);
+        }
+        return R.ok().add(openService.inlogERP());
+    }
+    /**
+     * 鍑哄簱璁板綍鑾峰彇
+     */
+    @PostMapping("/outlog/v1")
+    public synchronized R outlogERP(@RequestHeader(required = false) String appkey,
+                                   HttpServletRequest request){
+        auth(appkey,null, request);
+        if (Cools.isEmpty()) {
+            return R.parse(BaseRes.PARAM);
+        }
+        return R.ok().add(openService.outlogERP());
+    }
+
 
     private void auth(String appkey, Object obj, HttpServletRequest request) {
         log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));

--
Gitblit v1.9.1