From 1e62a6d467407addae8745d8c69454318af56a09 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 18 五月 2024 08:04:09 +0800
Subject: [PATCH] ERP接口
---
src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java | 14 ++++---
src/main/java/com/zy/asrs/controller/OpenController.java | 18 ++++++---
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 4 ++
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 13 ++++--
src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java | 6 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2
src/main/resources/application.yml | 8 ++--
7 files changed, 40 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index 89fb7e1..538b55c 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -84,6 +84,10 @@
}
}
+ if(agvWrkMast.getWrkSts() >= 205){
+ return R.error("褰撳墠浠诲姟宸插畬鎴�");
+ }
+
AgvTask agvTask = AgvTask.valueOf(param.getMethod());
Class<AgvTask> clz = AgvTask.class;
try {
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index f92440c..be9083f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -149,6 +149,7 @@
* 鍟嗗搧淇℃伅鍚屾鎺ュ彛
*/
@PostMapping("/mat/v1")
+ @AppAuth(memo = "鐗╂枡鍚屾鎺ュ彛")
public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
HttpServletRequest request){
@@ -300,6 +301,7 @@
@PostMapping("/order/pakout/default/v1")
@AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁")
public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
+ //@RequestBody(required = false) HashMap<String,Object> param,
@RequestBody(required = false) OrderProdSyncParam param,
HttpServletRequest request){
@@ -312,11 +314,13 @@
boolean pakin = param.getIQuantity() > 0 ? true : false;
mappingPakInOrderParam(param,pakin,docName);
- String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇濮斿鏉愭枡鍑哄簱鍗�" : "閾跺骇濮斿鏉愭枡閫�鏂欏崟";
- boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
- mappingPakOutOrderParam(param,pakin1,docName1);
+ if(!Cools.isEmpty(param.getChildren())){
+ String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇濮斿鏉愭枡鍑哄簱鍗�" : "閾跺骇濮斿鏉愭枡閫�鏂欏崟";
+ boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
+ mappingPakOutOrderParam(param,pakin1,docName1);
+ }
- }else {
+ }else if(!Cools.isEmpty(param.getChildren())) {
String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�" : "閾跺骇鐢熶骇鏉愭枡閫�鏂欏崟";
boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
mappingPakOutOrderParam(param,pakin1,docName1);
@@ -358,8 +362,10 @@
OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
orderDetl.setcInvCode(param.getCInvCode());
orderDetl.setiQuantity(param.getIQuantity());
- orderDetl.setCsocode(param.getCsocode());
+ orderDetl.setcDefine22(param.getDefine24());
orderDetl.setbFree1(param.getBFree1());
+ orderDetl.setId(param.getId());
+ orderDetl.setIvouchrowno(param.getIvouchrowno());
//娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣�
List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
@@ -395,7 +401,7 @@
orderDetl.setiQuantity(childInfo.getIQuantity());
orderDetl.setCsocode(param.getCsocode());
orderDetl.setbFree1(childInfo.getBFree1());
- orderDetl.setID(childInfo.getIDs() + "");
+ orderDetl.setId(childInfo.getIds());
orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
orderDetls.add(orderDetl);
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java b/src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java
index de1319e..4dedc6b 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java
@@ -37,6 +37,8 @@
private String sourceIndefine;
//浜у搧鐢熶骇鏍囪瘑
private String prodIndefine;
+ //
+ private String id;
//瀛愪欢淇℃伅
private List<ChildInfo> children;
@@ -118,9 +120,9 @@
@Data
public static class ChildInfo{
//ID
- private Integer ID;
+ private String id;
//IDs
- private Integer IDs;
+ private String ids;
//宸ュ崟鍙稵
private String orderNoT;
//宸ュ崟鍙�
@@ -137,12 +139,12 @@
private String childNo;
- public void setID(Integer ID) {
- this.ID = ID;
+ public void setId(String id) {
+ this.id = id;
}
- public void setIDs(Integer IDs) {
- this.IDs = IDs;
+ public void setIds(String ids) {
+ this.ids = ids;
}
public void setOrderNoT(String orderNoT) {
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
index 0670929..d495e78 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
@@ -111,7 +111,7 @@
//瑙勬牸锛堣嚜鐢遍」1锛�
private String bFree1;
//閲囪喘璁㈠崟瀛愯〃鏍囪瘑
- private String ID;
+ private String id;
//閿�鍞鍗曞瓙琛ㄦ爣璇�
private String iorderdid;
@@ -168,8 +168,8 @@
this.bFree1 = bFree1;
}
- public void setID(String ID) {
- this.ID = ID;
+ public void setId(String id) {
+ this.id = id;
}
public void setIorderdid(String iorderdid) {
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 58d4ffb..1d7833c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -975,7 +975,7 @@
//鑷敱椤�
od.setDeadTime(odParam.getBFree1());
//IDs
- od.setSku(odParam.getID());
+ od.setSku(odParam.getId());
od.setLength(odParam.getINum());
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 4807c23..04d1f5d 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -107,9 +107,10 @@
childInfo.setINum(orderDetl.getLength() + "");
childInfo.setIinvexchrate("");
childInfo.setBFree1(orderDetl.getDeadTime());
- childInfo.setIPOsID(orderDetl.getId() + "");
+ childInfo.setIPOsID(orderDetl.getSku());
childInfo.setCOrderCode(orderDetl.getOrderNo());
childInfo.setIvouchrowno(orderDetl.getItemNum());
+ childInfo.setCBatch("");
childInfo.setDefine22(orderDetl.getThreeCode());
paramChild.add(childInfo);
@@ -130,13 +131,15 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if(Cools.isEmpty(jsonObject.get("errCode"))){
- throw new CoolException(jsonObject.get("Message").toString());
+ if(Cools.isEmpty(jsonObject.get("succeed"))){
+ throw new CoolException(jsonObject.get("dsc").toString());
}
- int code = (int) jsonObject.get("errCode");
+ String succeed = jsonObject.get("succeed").toString();
+
+ int code = Cools.eq("0",succeed) ? 0 : 1;
if(code != 0){
- throw new CoolException(jsonObject.get("errMsg").toString());
+ throw new CoolException(jsonObject.get("dsc").toString());
}
success = true;
return code;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2fb9d31..10598da 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -86,11 +86,11 @@
containerArrivedPath: /conveyor/containerArrived
u8:
- url: http://192.168.1.55:8010
- orderReportPath: /api/RdAudit
+ url: http://192.168.9.3:8877
+ orderReportPath: /DBMS/U8/CM/add
ERP:
- url: http://192.168.1.55:8010
- orderReportPath: /api/RdAudit
+ url: http://39.184.149.30:8877
+ orderReportPath: /DBMS/U8/CM/add
MES:
url: http://192.168.1.55:8010
orderReportPath: /api/RdAudit
--
Gitblit v1.9.1