From 087db8aee2e9cbfb44b8e61531c1cace5e36a6e2 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 28 四月 2024 14:53:52 +0800
Subject: [PATCH] ERP接口同步
---
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 59 ++++++++
src/main/java/com/zy/asrs/entity/param/OrderPakinParam.java | 26 +++
src/main/java/com/zy/asrs/controller/MobileController.java | 8 +
src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java | 134 +++++++++++-------
src/main/java/com/zy/asrs/entity/param/MatSyncParam.java | 28 ++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 150 ++++++++++++++++++++
src/main/java/com/zy/asrs/task/OrderSendScheduler.java | 5
src/main/java/com/zy/asrs/service/OpenService.java | 3
src/main/resources/application.yml | 6
9 files changed, 357 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index b2f5567..7101b78 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -22,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
+import java.text.ParseException;
import java.util.*;
/**
@@ -58,6 +59,8 @@
private PlaService plaService;
@Autowired
private NodeService nodeService;
+ @Autowired
+ private OpenService openService;
// 鍟嗗搧涓婃灦
@@ -424,7 +427,8 @@
@RequestMapping("/plaDetl/packin/v1")
//@ManagerAuth(memo="pla鍏ュ簱")
- public R plaPackIn(@RequestBody JSONObject json){
+ @Transactional
+ public R plaPackIn(@RequestBody JSONObject json) throws ParseException {
String locNo = json.get("locNo").toString();
JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
for (Object o : jsonArray){
@@ -442,6 +446,8 @@
mobileService.plaPakin(brand,locNo,batch,packageNo,user);
}
}
+ //鍏ュ簱鎴愬姛鍚庝笂鎶RP
+ openService.pakinReportErp(json);
return R.ok("鍏ュ簱鎴愬姛");
}
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..f39d0f1 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
@@ -23,6 +23,16 @@
/**
* 鍟嗗搧缂栧彿
*/
+ private String cInvCode;
+
+ /**
+ * 鍟嗗搧鍚嶇О
+ */
+ private String cInvName;
+
+ /**
+ * 鍟嗗搧缂栧彿
+ */
private String matnr;
/**
@@ -194,6 +204,24 @@
* 澶囨敞
*/
private String memo;
+
+ public void setcInvCode(String cInvCode) {
+ this.cInvCode = cInvCode;
+ this.matnr = cInvCode;
+ }
+
+ public void setcInvName(String cInvName) {
+ this.cInvName = cInvName;
+ this.maktx = cInvName;
+ }
+
+ public void setMatnr(String matnr) {
+
+ }
+
+ public void setMaktx(String maktx) {
+
+ }
}
}
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
index 19021f5..6e28c92 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -2,6 +2,8 @@
import lombok.Data;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -26,12 +28,51 @@
//鍏徃
private String cAccount;
+ //璋冩嫧
+ private String allocation;
+
//澶囨敞
private String cMemo;
- private List<Body> ADDBody;
+ private List<Body> aDDBody;
//private List<DetlDto> orderDetails;
+ public void setcCode(String cCode) {
+ this.cCode = cCode;
+ }
+
+ public void setdDate(String dDate) throws ParseException {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-DD hh:mm:ss");
+ this.dDate = sdf.parse(dDate);
+ }
+
+ public void setdDate$(Date dDate) {
+ this.dDate = dDate;
+ }
+
+ public void setcMaker(String cMaker) {
+ this.cMaker = cMaker;
+ }
+
+ public void setcAccount(String cAccount) {
+ this.cAccount = cAccount;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public void setcMemo(String cMemo) {
+ this.cMemo = cMemo;
+ }
+
+ public void setaDDBody(List<Body> aDDBody) {
+ this.aDDBody = aDDBody;
+ }
+
+ public void setAllocation(String allocation) {
+ this.allocation = allocation;
+ }
@Data
public static class Body{
@@ -43,6 +84,22 @@
private String cBatch;
//琛屽娉�
private String cbMemo;
+
+ public void setcInvCode(String cInvCode) {
+ this.cInvCode = cInvCode;
+ }
+
+ public void setiQuantity(Double iQuantity) {
+ this.iQuantity = iQuantity;
+ }
+
+ public void setcBatch(String cBatch) {
+ this.cBatch = cBatch;
+ }
+
+ public void setCbMemo(String cbMemo) {
+ this.cbMemo = cbMemo;
+ }
}
}
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderPakinParam.java b/src/main/java/com/zy/asrs/entity/param/OrderPakinParam.java
new file mode 100644
index 0000000..de7d5c0
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/OrderPakinParam.java
@@ -0,0 +1,26 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class OrderPakinParam {
+ //鐢熶骇璁㈠崟鍙�
+ private String orderNo;
+ //鍏ュ簱鏃堕棿
+ private String pakinTime;
+ //瀛樿揣缂栫爜
+ private String cInvCode;
+ //鐗屽彿
+ private String brand;
+ //鎵瑰彿
+ private String batch;
+ //鍖呭彿
+ private Integer packageNo;
+ //鍏ュ簱閲嶉噺
+ private Double iQuantity;
+ //涓讳綋
+ private String account;
+ //澶囨敞
+ private String memo;
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index dba0277..a6c4229 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -5,6 +5,7 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.StockVo;
+import java.text.ParseException;
import java.util.List;
public interface OpenService {
@@ -47,4 +48,6 @@
R getInOutDetl();
DigitalTwin inventoryQuantity();
+
+ int pakinReportErp(JSONObject jsonObject) throws ParseException;
}
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 a262d23..a460f79 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,5 +1,8 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -14,15 +17,19 @@
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.DetlDto;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.NodeUtils;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -31,8 +38,15 @@
* Created by vincent on 2022/4/9
*/
@Slf4j
-@Service
+@Service("OpenService")
public class OpenServiceImpl implements OpenService {
+
+ @Value("${u8.url}")
+ private String url;
+
+ @Value("${u8.path}")
+ private String orderReportPath;
+
@Autowired
private OrderService orderService;
@@ -66,6 +80,10 @@
private ReportQueryMapper reportQueryMapper;
@Autowired
private UserService userService;
+ @Autowired
+ private PlaService plaService;
+ @Autowired
+ private ApiLogService apiLogService;
@Override
@Transactional
@@ -207,7 +225,7 @@
param.getCCode(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
+ 1L, // 椤圭洰缂栧彿
null, //
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
@@ -486,14 +504,15 @@
}
if (!matService.insert(mat)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- } else {
- log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
+ log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
} else {
- mat.sync(param);
+ //mat.sync(param);
+ mat.setMaktx(matParam.getMaktx());
if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
+ log.info("鍚屾鏇存柊鐗╂枡[鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
}
@@ -538,4 +557,125 @@
return digitalTwin;
}
+ @Override
+ public int pakinReportErp(JSONObject json) throws ParseException {
+ JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
+
+ List<OpenOrderPakoutParam> list = new ArrayList<>();
+
+
+ for (Object o : jsonArray){
+ JSONObject jsonObject = (JSONObject)o;
+ String brand = jsonObject.get("brand").toString();
+ String batch = jsonObject.get("batch").toString();
+ Integer packageNo = Integer.parseInt(jsonObject.get("packageNo").toString());
+
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo, brand);
+ Mat mat = matService.selectByMaktx(pla.getBrand());
+ //褰撶敓浜у崟鍙蜂笉涓�鑷存椂锛岄渶瑕佹柊寤轰竴涓猵aram
+ if(list.size() == 0 || checkOrder(list,pla.getProOrderNo()) == null){
+ OpenOrderPakoutParam param = new OpenOrderPakoutParam();
+ String type = Cools.isEmpty(pla.getProOrderNo()) ? "璋冩嫧鍏ュ簱鍗�" : "鐢熶骇鍏ュ簱鍗�";
+ param.setcCode(pla.getProOrderNo());
+ param.setcAccount(pla.getOwner());
+ param.setdDate(Utils.getDateStr(new Date()));
+ param.setType(type);
+
+ List<OpenOrderPakoutParam.Body> bodyList = new ArrayList<>();
+ OpenOrderPakoutParam.Body body = new OpenOrderPakoutParam.Body();
+ body.setcInvCode(mat.getMatnr());
+ body.setiQuantity(pla.getWeightAnfme());
+ body.setCbMemo(pla.getMemo());
+ bodyList.add(body);
+
+ param.setaDDBody(bodyList);
+
+ list.add(param);
+ }else {
+ OpenOrderPakoutParam param = checkOrder(list, pla.getProOrderNo());
+ List<OpenOrderPakoutParam.Body> bodyList = param.getADDBody();
+ OpenOrderPakoutParam.Body body = checkOrderDetl(bodyList, mat.getMatnr());
+ //鏈夋柊鐨勭墝鍙峰垯娣诲姞鏂扮殑orderDetl锛屽惁鍒欑疮鍔�
+ if(body == null){
+ body = new OpenOrderPakoutParam.Body();
+ body.setcInvCode(mat.getMatnr());
+ body.setiQuantity(pla.getWeightAnfme());
+ body.setCbMemo(pla.getMemo());
+ bodyList.add(body);
+ }else {
+ body.setiQuantity(body.getIQuantity() + pla.getWeightAnfme());
+ }
+ }
+ }
+
+ return doHttpRequest(list, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
+
+ }
+
+ private OpenOrderPakoutParam checkOrder(List<OpenOrderPakoutParam> list, String orderNo){
+
+ for (OpenOrderPakoutParam param : list){
+ //鍒ゆ柇鏄惁鍖呭惈閲嶅鐨勮鍗曞彿
+ if(Cools.eq(param.getCCode(),orderNo)){
+ return param;
+ }
+ }
+
+ return null;
+
+ }
+
+ private OpenOrderPakoutParam.Body checkOrderDetl(List<OpenOrderPakoutParam.Body> bodyList, String matnr){
+
+ for (OpenOrderPakoutParam.Body param : bodyList){
+ //鍒ゆ柇鏄惁鍖呭惈閲嶅鐨勮鍗曞彿
+ if(Cools.eq(param.getCInvCode(),matnr)){
+ return param;
+ }
+ }
+
+ return null;
+
+ }
+
+ private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
+ String response = "";
+ boolean success = false;
+
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(url)
+ .setPath(path)
+ .setJson(JSONObject.toJSONString(requestParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ if(Cools.isEmpty(jsonObject.get("errCode"))){
+ throw new CoolException(jsonObject.get("Message").toString());
+ }
+
+ int code = (int) jsonObject.get("errCode");
+ if(code != 0){
+ throw new CoolException(jsonObject.get("errMsg").toString());
+ }
+ success = true;
+ return code;
+ }catch (Exception e){
+ log.error(e.getMessage());
+ throw new CoolException("璋冪敤鎺ュ彛鍝嶅簲閿欒");
+ }finally {
+ apiLogService.save(
+ namespace,
+ url + path,
+ appkey,
+ ip,
+ JSON.toJSONString(JSONObject.toJSONString(requestParam)),
+ response,
+ success
+ );
+ }
+
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/OrderSendScheduler.java b/src/main/java/com/zy/asrs/task/OrderSendScheduler.java
index 673f885..22740da 100644
--- a/src/main/java/com/zy/asrs/task/OrderSendScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSendScheduler.java
@@ -5,7 +5,6 @@
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.handler.OrderSendHandler;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -21,11 +20,11 @@
- @Scheduled(cron = "0/3 * * * * ? ")
+ //@Scheduled(cron = "0/10 * * * * ? ")
private void looping(){
List<Order> orders = orderService.selectList(new EntityWrapper<Order>()
.eq("settle", "4")
- .le("item_id", 3));
+ .eq("item_id",1L));
for (Order order : orders) {
orderSendHandler.start(order);
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
index 3c86c42..de32211 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
@@ -2,87 +2,119 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.DocType;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.ErpAccessTokenScheduler;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
@Slf4j
@Service
@Transactional
public class OrderSendHandler extends AbstractHandler<String> {
- private static final String erpIp = "10.100.221.19:81";
- private static final String inPath = "/ierp/kapi/app/im/PurinbillApiPlugin";
- private static final String outPath = "/ierp/kapi/app/im/SaloutbillApiPlugin";
+ @Value("${u8.url}")
+ private String url;
-
+ @Value("${u8.path}")
+ private String orderReportPath;
@Autowired
private OrderService orderService;
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private OrderDetlService orderDetlService;
public void start(Order order) {
- String accessToken = ErpAccessTokenScheduler.accessToken;
- if (accessToken.equals("")) {
- return;
+
+ List<OpenOrderPakoutParam> paramList = new ArrayList<>();
+ OpenOrderPakoutParam param = new OpenOrderPakoutParam();
+ paramList.add(param);
+
+ List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
+
+ param.setcCode(order.getOrderNo());
+ param.setcMaker(order.getOperMemb());
+ param.setcAccount(order.getCstmrName());
+ param.setcMemo(order.getMemo());
+ param.setType(order.getDocType$());
+ param.setdDate$(order.getCreateTime());
+ param.setAllocation(order.getItemName());
+
+
+ List<OpenOrderPakoutParam.Body> bodyList = new ArrayList<>();
+ param.setaDDBody(bodyList);
+
+ for(OrderDetl orderDetl : orderDetlList){
+ OpenOrderPakoutParam.Body body = new OpenOrderPakoutParam.Body();
+ body.setiQuantity(orderDetl.getQty());
+ body.setcInvCode(orderDetl.getMatnr());
+ body.setCbMemo(orderDetl.getMemo());
+ bodyList.add(body);
}
- HashMap<String, Object> header = new HashMap<>();
- header.put("accessToken",accessToken);
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("orderNo",order.getOrderNo());
- HttpHandler.Builder prepBuilder = new HttpHandler.Builder()
- .setUri(erpIp)
- .setHeaders(header)
- .setJson(jsonObject.toJSONString());
- JSONObject respJson;
+ doHttpRequest(paramList, "涓婃姤ERP鍑哄簱鍗曟嵁", url, orderReportPath, null, "127.0.0.1");
+
+ orderService.updateSettle(order.getId(),6L,0L);
- //鍏ュ簱鍗曟嵁
- if (docTypeService.selectOne(new EntityWrapper<DocType>()
- .eq("doc_id",order.getDocType())).getPakin() == 1) {
- try {
- respJson = JSON.parseObject(
- prepBuilder.setPath(inPath)
- .build()
- .doPost());
- } catch (IOException e) {
- throw new RuntimeException(e);
+
+ }
+
+ private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
+ String response = "";
+ boolean success = false;
+
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(url)
+ .setPath(path)
+ .setJson(JSONObject.toJSONString(requestParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ if(Cools.isEmpty(jsonObject.get("errCode"))){
+ throw new CoolException(jsonObject.get("Message").toString());
}
- }else {
- //鍑哄簱鍗曟嵁
- try {
- respJson = JSON.parseObject(
- prepBuilder.setPath(outPath)
- .build()
- .doPost());
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- if ((boolean)respJson.get("success")) {
- orderService.updateSettle(order.getId(),6L,1L);
- log.info("鍗曟嵁:" + order.getOrderNo() + "鍥炰紶鎴愬姛锛屽凡鏇存柊鍗曟嵁鐘舵��");
- }else {
- order.setItemId(order.getItemId() + 1);
- orderService.updateById(order);
- log.info("鍗曟嵁:"+ order.getOrderNo()+" 鍥炰紶澶辫触锛岃繖鏄" + order.getItemId() + "娆″洖浼�");
- log.info(respJson.toJSONString());
+ int code = (int) jsonObject.get("errCode");
+ if(code != 0){
+ throw new CoolException(jsonObject.get("errMsg").toString());
+ }
+ success = true;
+ return code;
+ }catch (Exception e){
+ log.error(e.getMessage());
+ throw new CoolException("璋冪敤鎺ュ彛鍝嶅簲閿欒");
+ }finally {
+ apiLogService.save(
+ namespace,
+ url + path,
+ appkey,
+ ip,
+ JSON.toJSONString(JSONObject.toJSONString(requestParam)),
+ response,
+ success
+ );
}
+
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6c8b1f9..a660664 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -57,4 +57,8 @@
#erp
erp:
- enable: false
\ No newline at end of file
+ enable: false
+
+u8:
+ url: localhost:8080
+ path: /test/report
--
Gitblit v1.9.1