From 3f40aab61852560baff89aee1b618a2aab8585e3 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 09 一月 2026 14:12:09 +0800
Subject: [PATCH] 1.新增erp对接接口
---
src/main/java/com/zy/asrs/controller/OpenController.java | 310 +++++++++++++++------------------------------------
src/main/webapp/static/js/common.js | 2
pom.xml | 2
src/main/java/com/zy/asrs/entity/param/MatSyncParam.java | 11 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 7 +
src/main/resources/application.yml | 4
6 files changed, 115 insertions(+), 221 deletions(-)
diff --git a/pom.xml b/pom.xml
index ca051d4..992785a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
</dependencies>
<build>
- <finalName>jshdasrs</finalName>
+ <finalName>lggslasrs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index a650919..e2b47a7 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,6 +1,8 @@
package com.zy.asrs.controller;
+import com.alibaba.excel.event.Handler;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
@@ -10,16 +12,16 @@
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.*;
+import javax.naming.ldap.HasControls;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2022/4/8
@@ -39,36 +41,18 @@
@Autowired
private OpenService openService;
- @PostMapping("/order/matSync/default/v2")
-// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
- public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) MatSyncParam.MatParam param,
- HttpServletRequest request){
-
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- MatSyncParam matSyncParam = new MatSyncParam();
- List<MatSyncParam.MatParam> objects = new ArrayList<>();
- objects.add(param);
- matSyncParam.matDetails = objects;
- openService.syncMat(matSyncParam);
- return R.ok();
- }
-
- @PostMapping("/order/matSync/default/v1")
-// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
- public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- openService.syncMat(param);
- return R.ok();
- }
+// @PostMapping("/order/matSync/default/v1")
+//// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+// public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
+// @RequestBody(required = false) MatSyncParam param,
+// HttpServletRequest request){
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// openService.syncMat(param);
+// return R.ok();
+// }
/****************************************************************************/
/********************************* 鎵撳寘涓婄嚎 **********************************/
@@ -412,207 +396,99 @@
return R.ok();
}
+ /**********************************************************鍝ユ柉鎷夐」鐩鎺ユ帴鍙�*******************************************************************/
+ @PostMapping("/order/matSync/default/v2")
+// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ public synchronized R syncMatInfoV2(@RequestBody(required = false) List<MatSyncParam.MatParam> param){
- /**
- * 鏄惁瀛樺湪鍚庣画鎵樼洏
- */
- @PostMapping("/arm/task/order_sign")
- @AppAuth(memo = "鏄惁瀛樺湪鍚庣画鎵樼洏")
- public synchronized R TaskArmWorkOrderSign(@RequestHeader(required = false) String appkey,
- @RequestBody OrderArmEndParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getArm_no())) {
- return R.error("鏈烘鑷傜紪鍙穂Arm_no]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrder_id())) {
- return R.error("鍗曟嵁缂栧彿[order_id]涓嶈兘涓虹┖");
- }
- try{
- param.OrderIdTwo(sign_arm_order,sign_arm_sku);
- } catch (Exception e){
- return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
- }
- if (param.getArm_no()>4){
- return R.ok().add(true);
- }
-
- boolean taskArmWorkOrderSign = openService.TaskArmWorkOrderSign(param);
- return R.ok().add(taskArmWorkOrderSign);
- }
-
-
- /**
- * AGV涓婃姤鎺ユ敹
- */
- @PostMapping("/agv/task/v1/agvCallback")
-// @AppAuth(memo = "AGV涓婃姤鎺ユ敹")
- public synchronized R TaskAgvReport(@RequestHeader(required = false) String appkey,
- @RequestBody TaskAgvReportParam param,
- HttpServletRequest request) {
-// auth(appkey, param, request);
- // 鏃ュ織璁板綍
- ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
- apiLogService.save(
- "AGV涓婃姤鎺ユ敹",
- "/open/asrs/agv/task/v1/agvCallback",
- null,
- request.getRemoteAddr(),
- JSON.toJSONString(param),
- null,
- true
- );
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getReqCode())) {
- return R.error("WMS浠诲姟鍙穂reqCode]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getTaskCode())) {
- return R.error("WMS浠诲姟鍙穂reqCode]涓嶈兘涓虹┖");
- }
- String taskCode = param.getTaskCode();
- if (taskCode == null || !taskCode.matches("^\\d+-.*$")) {
- throw new CoolException("taskCode 鏍煎紡閿欒锛岄渶涓� 鏁板瓧-xxx锛屼緥濡� 123-ABC");
- }
-
- param.setTaskNo(Integer.parseInt(taskCode.substring(0, taskCode.indexOf("-"))));
- boolean taskAgvReport = openService.TaskAgvReport(param);
- if (taskAgvReport){
-// agvBindAndBin(String.valueOf(param.getTaskNo()));
- return new R(0,"鎴愬姛");
- }
- return R.error("浠诲姟鍙蜂笉瀛樺湪");
+ System.out.println(param);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// MatSyncParam matSyncParam = new MatSyncParam();
+// List<MatSyncParam.MatParam> objects = new ArrayList<>();
+// objects.add(param);
+// matSyncParam.matDetails = objects;
+// openService.syncMat(matSyncParam);
+ return R.ok();
}
/**
- * PDA鍒涘缓AGV浠诲姟
+ * 绔欑偣鍚屾鎺ュ彛
+ * 鍚屾绔欑偣缂栧彿
+ * 鍚屾绔欑偣杩涘嚭绫诲瀷
+ * 鍚屾绔欑偣鍚嶇О
+ * 鍚屾鎿嶄綔绫诲瀷
+ * @return
*/
- @PostMapping("/agv/task/v1/createTask")
- @AppAuth(memo = "PDA鍒涘缓AGV浠诲姟")
- public synchronized R TaskAgvCreate(@RequestHeader(required = false) String appkey,
- @RequestBody TaskAgvCreateParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- boolean taskAgvCreate = openService.taskAgvCreate(param);
- if (taskAgvCreate){
- return R.ok();
- }
- return R.error("浠诲姟鍙蜂笉瀛樺湪");
+ @PostMapping("/station/all")
+ public synchronized R stationAll(){
+ List<LinkedHashMap<String,Object>> list =new ArrayList<>();
+ LinkedHashMap<String,Object> map = new LinkedHashMap<>();
+ map.put("stationId","101");
+ map.put("stationType","3");
+ map.put("stationName","101");
+ list.add(map);
+ System.out.println();
+// try {
+// //鑾峰彇Cookie鍊�
+// HashMap<String, Object> headers = new HashMap<>();
+// headers.put("accesstoken", erpSecret.getAccessToken());
+// headers.put("x-acgw-identity", xAcfwIdentity); // 鑷畾涔夎姹傚ご
+// response = new HttpHandler.Builder()
+// .setHeaders(headers)
+// .setUri(URL)
+// .setPath(path)
+// .setJson(add)
+// .build()
+// .doPost();
+// JSONObject jsonResponse = JSON.parseObject(response);
+// if (jsonResponse.getString("errorCode").equals("401")) {
+//
+// }
+// }catch (Exception e){
+// e.printStackTrace();
+// }
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// MatSyncParam matSyncParam = new MatSyncParam();
+// List<MatSyncParam.MatParam> objects = new ArrayList<>();
+// objects.add(param);
+// matSyncParam.matDetails = objects;
+// openService.syncMat(matSyncParam);
+ return R.ok().add(list);
}
/**
- * PDA鑾峰彇AGV搴撲綅
+ * 缁勬墭淇℃伅涓嬪彂
+ * @return
*/
- @PostMapping("/agv/loc/v1/getLocList")
- @AppAuth(memo = "PDA妫�绱GV搴撲綅")
- public synchronized R GetAgvLocList(@RequestHeader(required = false) String appkey,
- @RequestBody AgvLocListParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
-
-
- List<AgvLocListDetlParam> list = openService.getAgvLocList(param);
- if (!list.isEmpty()) {
- return R.ok(list);
- }
- return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
+ @PostMapping("/comb/auth")
+ public synchronized R comb(@RequestBody ArrayList<HashMap<String,Object>> param){
+ System.out.println(param);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// MatSyncParam matSyncParam = new MatSyncParam();
+// List<MatSyncParam.MatParam> objects = new ArrayList<>();
+// objects.add(param);
+// matSyncParam.matDetails = objects;
+// openService.syncMat(matSyncParam);
+ return R.ok();
}
/**
- * PDA妫�绱㈢洏鐐规暟閲�
+ * 鍑哄簱閫氱煡鍗�
*/
- @PostMapping("/pick/v1/getPickList")
- @AppAuth(memo = "PDA妫�绱㈢洏鐐规暟閲�")
- public synchronized R getPickList(@RequestHeader(required = false) String appkey,
- @RequestBody PdaPickListParam param,
- HttpServletRequest request) {
-// auth(appkey, param, request);
- List<PickWrkDetlListParam> list = openService.getPickList(param);
- if (!list.isEmpty()) {
- return R.ok(list);
- }
- return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
+ @PostMapping("/outOrder")
+ public synchronized R outOrder (@RequestBody ArrayList<HashMap<String,Object>> param){
+ System.out.println(param);
+ return R.ok();
}
- /**
- * PDA缁戝畾瑙ｇ粦
- */
- @PostMapping("/agv/bindCtnrAndBin/v1")
- @AppAuth(memo = "PDA缁戝畾涓庤В缁�")
- public synchronized R bindCtnrAndBin(@RequestHeader(required = false) String appkey,
- @RequestBody bindCtnrAndBinParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- boolean bindCtnrAndBin = openService.bindCtnrAndBin(param);
- if (bindCtnrAndBin) {
- return R.ok();
- }
- return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
- }
- /**
- * AGV鐢宠杩囧厜鏍�
- */
- @PostMapping("/agv/arm/grating/v1/agvCallback")
- @AppAuth(memo = "AGV鐢宠杩囧厜鏍�")
- public synchronized R agvGrating(@RequestHeader(required = false) String appkey,
- @RequestBody AgvGoTheArnParam param,
- HttpServletRequest request) {
-// auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getCurrentPositionCode())) {
- return R.error("浣嶇疆[currentPositionCode]涓嶈兘涓虹┖");
- }
- boolean bindCtnrAndBin = true;
- List<ArmAgvGratingParam> armList = param.getArmNo();
- if (armList.isEmpty()){
- return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
- }
- for (ArmAgvGratingParam arm : armList){
- if (bindCtnrAndBin){
- bindCtnrAndBin = openService.agvApplicationPassedTheGrating(arm);
-// System.out.println("璇锋眰閫氳繃鍏夋爡"+armNo);
- }
- }
- if (bindCtnrAndBin) {
- asyncProcessAfterValidation(param);
- return new R(0,"鎴愬姛");
- }
- return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
- }
-
- @Async
- public void agvBindAndBin(String taskNo) {
- try {
- Thread.sleep(1000);
- openService.agvBindAndBin(taskNo);
- } catch (Exception e) {
- log.error("寮傛澶勭悊AGV鎼繍鍚庣画閫昏緫澶辫触", e);
- }
- }
-
- @Async
- public void asyncProcessAfterValidation(AgvGoTheArnParam param) {
- try {
- Thread.sleep(500);
- openService.agvApplicationPassedTheGrating(param);
- } catch (Exception e) {
- log.error("寮傛澶勭悊AGV鍏夋爡鍚庣画閫昏緫澶辫触", e);
- }
- }
}
diff --git a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
index 298a252..22ed0e1 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
@@ -194,6 +194,17 @@
* 澶囨敞
*/
private String memo;
+
+ /**
+ * 鎻忚堪
+ */
+ private String describle;
+
+ /**
+ * 鎿嶄綔绫诲瀷锛�1 鏂板锛�2 淇敼锛�3 绂佺敤锛�4 鍙嶇鐢紱
+ */
+
+ private Integer operateType;
}
}
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 abe1f5b..e97f2f5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -530,6 +530,13 @@
@Override
@Transactional
public void syncMat(MatSyncParam param) {
+ if(param.getMatDetails().get(0).getOperateType()==3){
+ Mat mat1 = matService.selectByMatnr(param.getMatDetails().get(0).getMatnr());
+ if(Cools.isEmpty(mat1)){
+ throw new CoolException("鍟嗗搧涓嶅瓨鍦ㄦ棤娉曠鐢�");
+ }
+ }
+
if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c680cc4..e675f77 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=lggslasrs
# url: jdbc:sqlserver://10.10.10.235;databasename=jshdasrs
# url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
username: sa
@@ -42,7 +42,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: jshdasrs
+ subject: lggslasrs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index e9a4aba..cb1259a 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/jshdasrs";
+var baseUrl = "/lggslasrs";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
--
Gitblit v1.9.1