From 9e53b59e30bba2149900aa2cc9f22ad0ab445edd Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 22 九月 2025 13:47:27 +0800
Subject: [PATCH] u8单据对接开发完成
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 6
src/main/java/com/zy/asrs/controller/OpenController.java | 31 +
src/main/java/com/zy/asrs/task/handler/AutoReportingHandler.java | 147 +++++++++
src/main/java/com/zy/asrs/entity/result/OrderRsult.java | 52 +++
src/main/java/com/zy/asrs/entity/param/MatSyncParam.java | 9
src/main/java/com/zy/asrs/service/OpenService.java | 2
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 3
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 11
src/main/java/com/zy/asrs/task/AutoReportingScheduler.java | 46 ++
src/main/java/com/zy/asrs/entity/U8Properties.java | 23 +
src/main/java/com/zy/common/model/DetlDto.java | 5
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 566 +++++++++++++++++++---------------
src/main/resources/application.yml | 9
src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java | 3
14 files changed, 645 insertions(+), 268 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cb34a46..e4019ca 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -34,7 +34,7 @@
private OpenService openService;
@PostMapping("/order/matSync/default/v1")
- @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
HttpServletRequest request){
@@ -67,6 +67,7 @@
* 娣诲姞鍏ュ簱鍗�
*/
@PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "鍏ュ簱鍗曚笅鍙�")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakinParam param,
HttpServletRequest request) {
@@ -77,10 +78,13 @@
if (Cools.isEmpty(param.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
+ if (Cools.isEmpty(param.getOptType())) {
+ return R.error("鎿嶄綔绫诲瀷[optType]涓嶈兘涓虹┖");
+ }
if (Cools.isEmpty(param.getOrderType())) {
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderDetails())) {
+ if (!param.getOptType().equals("delete") && Cools.isEmpty(param.getOrderDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
openService.pakinOrderCreate(param);
@@ -102,7 +106,7 @@
* 娣诲姞鍑哄簱鍗�
*/
@PostMapping("/order/pakout/default/v1")
- @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
+ @AppAuth(memo = "鍑哄簱鍗曚笅鍙�")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakoutParam param,
HttpServletRequest request) {
@@ -110,19 +114,16 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getLgort())) {
- return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
- }
- if (!param.getLgort().equals("5006")) {
- return R.ok();
- }
if (Cools.isEmpty(param.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getOrderType())) {
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderDetails())) {
+ if (Cools.isEmpty(param.getOptType())) {
+ return R.error("鎿嶄綔绫诲瀷[optType]涓嶈兘涓虹┖");
+ }
+ if (!param.getOptType().equals("delete") && Cools.isEmpty(param.getOrderDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
openService.pakoutOrderCreate(param);
@@ -140,6 +141,14 @@
return R.ok().add(openService.pakoutOrderComplete(param));
}
+ /**
+ * 缁撴灉涓婃姤鎺ュ彛-娴嬭瘯
+ */
+ @PostMapping("/order/resultExport/default/v1")
+ public synchronized R orderPakoutComplete(String param) {
+ return new R(200,"鎿嶄綔鎴愬姛");
+ }
+
/**
* 搴撳瓨缁熻
@@ -152,7 +161,7 @@
}
private void auth(String appkey, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
if (!auth) {
return;
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index f08621d..e612599 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -132,7 +132,7 @@
private String sku;
/**
- * 鍗曚綅閲�
+ * 涓婃姤鏁伴噺
*/
@ApiModelProperty(value= "鍗曚綅閲�")
private Double units;
@@ -242,9 +242,9 @@
private Integer source;
/**
- * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ * 鏄惁涓婃姤 1: 鏄� 0: 鍚� 2: 绛夊緟涓婃姤
*/
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value= "鏄惁涓婃姤 1: 鏄� 0: 鍚� 2: 绛夊緟涓婃姤")
private Integer inspect;
/**
diff --git a/src/main/java/com/zy/asrs/entity/U8Properties.java b/src/main/java/com/zy/asrs/entity/U8Properties.java
new file mode 100644
index 0000000..9d9bb96
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/U8Properties.java
@@ -0,0 +1,23 @@
+package com.zy.asrs.entity;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author pang.jiabao
+ * @description 璇诲彇u8鐩稿叧閰嶇疆鏂囦欢
+ * @createDate 2025/9/19 10:26
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "u8")
+public class U8Properties {
+
+ private String URL;
+ private String sServer;
+ private String sAccID;
+ private String sUserID;
+ private String sPassword;
+ private String resultReportPath;
+}
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 ff2f451..5d204fc 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
@@ -19,7 +19,14 @@
public List<MatParam> matDetails;
@Data
- public class MatParam{
+ public static class MatParam{
+
+ /**
+ * 鎿嶄綔绫诲瀷
+ * add.鏂板锛宒elete.鍒犻櫎,update.淇敼
+ */
+ private String optType;
+
/**
* 鍟嗗搧缂栧彿
*/
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
index 965a9d1..de3b8e0 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
@@ -17,6 +17,9 @@
private String orderTime;
+ // 鎿嶄綔绫诲瀷 add.鏂板锛宒elete.鍒犻櫎
+ private String optType;
+
private List<DetlDto> orderDetails;
}
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 96cad9c..9485d83 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -21,6 +21,9 @@
private String orderTime;
+ // 鎿嶄綔绫诲瀷 add.鏂板锛宒elete.鍒犻櫎
+ private String optType;
+
private List<DetlDto> orderDetails;
private String lgort;
diff --git a/src/main/java/com/zy/asrs/entity/result/OrderRsult.java b/src/main/java/com/zy/asrs/entity/result/OrderRsult.java
new file mode 100644
index 0000000..7f2031b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/result/OrderRsult.java
@@ -0,0 +1,52 @@
+package com.zy.asrs.entity.result;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OrderRsult {
+ public Login login;
+ public String vouchName;
+ public String commandType;
+ public String verifier;
+ public List<HeadTable> headTable;
+ public List<BodyTable> bodyTable;
+
+ @Data
+ public static class Login {
+ public String sAccID;
+ public String sUserID;
+ public String sPassword;
+ public String sServer;
+ }
+
+ @Data
+ public static class HeadTable {
+ public String ctvcode;
+ public String dtvdate;
+ public String cmaker;
+ public String vt_id;
+ public String ciwhcode;
+ public String cowhcode;
+ public String cordcode;
+ public String cirdcode;
+ public String codepcode;
+ public String cidepcode;
+ public String wms_operator;
+ }
+
+ @Data
+ public static class BodyTable {
+ public String irowno;
+ public String cinvcode;
+ public String ctvbatch;
+ public String itvquantity;
+ public String cinposcode;
+ public String coutposcode;
+ public String itrsid;
+ public String editprop;
+ // 鍗曟嵁鍙�
+ public String orderNo;
+ }
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index afd90b1..18f37f4 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -19,7 +19,7 @@
List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param);
/**
- * 娣诲姞鍏ュ簱鍗�
+ * 娣诲姞鍑哄簱鍗�
*/
void pakoutOrderCreate(OpenOrderPakoutParam 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..8a0ad47 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -52,85 +52,115 @@
@Override
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
- Order order = orderService.selectByNo(param.getOrderNo());
- if (!Cools.isEmpty(order)) {
- throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
- }
- DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
- Date now = new Date();
- // 鍗曟嵁涓绘。
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- param.getOrderNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
- docType.getDocId(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
- null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
- null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
- null, // 鍚堣閲戦
- null, // 浼樻儬鐜�
- null, // 浼樻儬閲戦
- null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
- null, // 瀹炰粯閲戦
- null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
- null, // 閭垂鏀粯绫诲瀷
- null, // 閭垂
- null, // 浠樻鏃堕棿
- null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
- null, // 鐗╂祦鍗曞彿
- 1L, // 璁㈠崟鐘舵��
- 1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
- now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null // 澶囨敞
- );
- if (!orderService.insert(order)) {
- throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- // 鍗曟嵁鏄庣粏妗�
- List<DetlDto> list = new ArrayList<>();
- List<DetlDto> orderDetails = param.getOrderDetails();
- for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
- if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+ String orderNo = param.getOrderNo();
+ String orderType = param.getOrderType();
+ String optType = param.getOptType();
+
+ Order order = orderService.selectByNo(orderNo);
+ if (optType.equals("add")) {
+ if (!Cools.isEmpty(order)) {
+ throw new CoolException(orderNo + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ }
+
+ DocType docType = docTypeService.selectOrAdd(orderType, Boolean.TRUE);
+ Date now = new Date();
+ // 鍗曟嵁涓绘。
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ orderNo, // 璁㈠崟缂栧彿
+ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ docType.getDocId(), // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ 9527L, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ 9527L, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+
+ if (!orderService.insert(order)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触,orderNo锛�" + orderNo);
+ }
+
+ // 鍚堝苟鍗曟嵁鏄庣粏妗�
+ List<DetlDto> list = new ArrayList<>();
+ List<DetlDto> orderDetails = param.getOrderDetails();
+ for (DetlDto detail : orderDetails) {
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ if (DetlDto.has(list, dto)) {
+ DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
+ assert detlDto != null;
+ detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+ } else {
+ list.add(dto);
+ }
+ }
+
+ // 鎻掑叆鏄庣粏
+ for (DetlDto detlDto : list) {
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setBatch(detlDto.getBatch());
+ orderDetl.setAnfme(detlDto.getAnfme());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setSku(detlDto.getSku()); // 鍗曡鍙凤紝u8鏄庣粏id,涓婃姤闇�瑕�
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException(orderNo+":鐢熸垚鍗曟嵁鏄庣粏澶辫触:" + detlDto.getMatnr());
+ }
+ }
+ } else if (optType.equals("delete")) {
+ if (Cools.isEmpty(order)) {
+ throw new CoolException(orderNo + "鍗曟嵁涓嶅瓨鍦紒");
+ }
+
+ // 璁㈠崟鐘舵��
+ Long settle = order.getSettle();
+ if (settle == 1) {
+ // 鍒犻櫎璁㈠崟鏄庣粏
+ orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
+ // 鍒犻櫎璁㈠崟涓昏〃
+ orderService.delete(new EntityWrapper<Order>().eq("id", order.getId()));
+
} else {
- list.add(dto);
+ throw new CoolException(orderNo + ":璁㈠崟宸插鐞嗭紝鏃犳硶鍙栨秷");
}
- }
- for (DetlDto detlDto : list) {
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(detlDto.getBatch());
- orderDetl.setAnfme(detlDto.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
+ } else {
+ throw new CoolException(orderNo + "锛屾搷浣滅被鍨嬩笉瀛樺湪锛�" + optType);
}
}
@@ -183,89 +213,105 @@
@Override
@Transactional
public void pakoutOrderCreate(OpenOrderPakoutParam param) {
- Order order = orderService.selectByNo(param.getOrderNo());
- // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
- if (!Cools.isEmpty(order)) {
- if (order.getSettle() > 1L) {
- throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ String orderNo = param.getOrderNo();
+ String optType = param.getOptType();
+ String orderType = param.getOrderType();
+ Order order = orderService.selectByNo(orderNo);
+
+ if (optType.equals("add")) {
+ DocType docType = docTypeService.selectOrAdd(orderType, Boolean.FALSE);
+ Date now = new Date();
+ // 鍗曟嵁涓绘。
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ orderNo, // 璁㈠崟缂栧彿
+ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ docType.getDocId(), // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ 9527L, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ 9527L, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderService.insert(order)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触,orderNo锛�" + orderNo);
}
- orderService.remove(order.getId());
- }
- DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
- Date now = new Date();
- // 鍗曟嵁涓绘。
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- param.getOrderNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
- docType.getDocId(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
- null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
- null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
- null, // 鍚堣閲戦
- null, // 浼樻儬鐜�
- null, // 浼樻儬閲戦
- null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
- null, // 瀹炰粯閲戦
- null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
- null, // 閭垂鏀粯绫诲瀷
- null, // 閭垂
- null, // 浠樻鏃堕棿
- null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
- null, // 鐗╂祦鍗曞彿
- 1L, // 璁㈠崟鐘舵��
- 1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
- now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null // 澶囨敞
- );
- if (!orderService.insert(order)) {
- throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- // 鍗曟嵁鏄庣粏妗�
- List<DetlDto> list = new ArrayList<>();
- List<DetlDto> orderDetails = param.getOrderDetails();
- for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
- if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+ // 鍗曟嵁鏄庣粏妗�
+ List<DetlDto> list = new ArrayList<>();
+ List<DetlDto> orderDetails = param.getOrderDetails();
+ for (DetlDto detail : orderDetails) {
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ if (DetlDto.has(list, dto)) {
+ DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
+ assert detlDto != null;
+ detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+ } else {
+ list.add(dto);
+ }
+ }
+ for (DetlDto detlDto : list) {
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setBatch(detlDto.getBatch());
+ orderDetl.setAnfme(detlDto.getAnfme());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setSku(detlDto.getSku()); // 鍗曡鍙凤紝u8鏄庣粏id,涓婃姤闇�瑕�
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException(orderNo + ":鐢熸垚鍗曟嵁鏄庣粏澶辫触:" + detlDto.getMatnr());
+ }
+ }
+ } else if (optType.equals("delete")) {
+ if (Cools.isEmpty(order)) {
+ throw new CoolException(orderNo + "鍗曟嵁涓嶅瓨鍦紒");
+ }
+ // 璁㈠崟鐘舵��
+ Long settle = order.getSettle();
+ if (settle == 1) {
+ // 鍒犻櫎璁㈠崟鏄庣粏
+ orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
+ // 鍒犻櫎璁㈠崟涓昏〃
+ orderService.delete(new EntityWrapper<Order>().eq("id", order.getId()));
} else {
- list.add(dto);
+ throw new CoolException(orderNo + ":璁㈠崟宸插鐞嗭紝鏃犳硶鍙栨秷");
}
- }
- for (DetlDto detlDto : list) {
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(detlDto.getBatch());
- orderDetl.setAnfme(detlDto.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
+ } else {
+ throw new CoolException(orderNo + "锛屾搷浣滅被鍨嬩笉瀛樺湪锛�" + optType);
}
}
@@ -438,110 +484,126 @@
@Override
@Transactional
public void syncMat(MatSyncParam param) {
- if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
+ if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
}
-
- for(MatSyncParam.MatParam matParam : param.getMatDetails()){
- if(Cools.isEmpty(matParam.getMatnr())){
- throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
+ Date now = new Date();
+ for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
+ String logInfo = "optType:" + matParam.getOptType() + ",matnr:" + matParam.getMatnr() + ",maktx:" + matParam.getMaktx() + ",specs:" + matParam.getSpecs();
+ if (Cools.isEmpty(matParam.getOptType(), matParam.getMatnr(), matParam.getMaktx())) {
+ throw new CoolException("鍟嗗搧淇℃伅涓嶈兘涓虹┖[" + logInfo + "]");
}
-
- Date now = new Date();
Mat mat = matService.selectByMatnr(matParam.getMatnr());
- if (mat == null) {
- mat = new Mat();
- // 鍒嗙被
- Long tagId;
- // 涓�绾у垎绫�
- if (!Cools.isEmpty(matParam.getGroupCode()) && !Cools.isEmpty(matParam.getGroupName())) {
- Tag priTag = tagService.selectByName(matParam.getGroupCode(), 2);
- if (priTag == null) {
- Tag top = tagService.getTop();
- NodeUtils nodeUtils = new NodeUtils();
- nodeUtils.executePath(top.getId());
- priTag = new Tag(
- null, // 缂栧彿
- matParam.getGroupCode(), // 鍚嶇О
- top.getId(), // 鐖剁骇
- top.getName(), // 鐖剁骇鍚嶇О
- nodeUtils.path.toString(), // 鍏宠仈璺緞
- nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
- 0, // 绫诲瀷
- null, // 璐熻矗浜�
- null, // 鍥剧墖
- null, // 绠�瑕佹弿杩�
- null, // 鏁伴噺
- 2, // 绛夌骇
- null, // 鎺掑簭
- 1, // 鐘舵��
- now, // 娣诲姞鏃堕棿
- null, // 娣诲姞浜哄憳
- now, // 淇敼鏃堕棿
- null, // 淇敼浜哄憳
- null // 澶囨敞
- );
- if (tagMapper.insert(priTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
+ switch (matParam.getOptType()) {
+ case "add":
+ if (mat != null) {
+ throw new CoolException("鍟嗗搧淇℃伅宸茬粡瀛樺湪[" + logInfo + "]");
}
- // 浜岀骇鍒嗙被
- Tag secTag = tagService.selectByName(matParam.getGroupName(), 3);
- if (secTag == null) {
- NodeUtils nodeUtils = new NodeUtils();
- nodeUtils.executePath(priTag.getId());
- secTag = new Tag(
- null, // 缂栧彿
- matParam.getGroupName(), // 鍚嶇О
- priTag.getId(), // 鐖剁骇
- priTag.getName(), // 鐖剁骇鍚嶇О
- nodeUtils.path.toString(), // 鍏宠仈璺緞
- nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
- 0, // 绫诲瀷
- null, // 璐熻矗浜�
- null, // 鍥剧墖
- null, // 绠�瑕佹弿杩�
- null, // 鏁伴噺
- 3, // 绛夌骇
- null, // 鎺掑簭
- 1, // 鐘舵��
- now, // 娣诲姞鏃堕棿
- null, // 娣诲姞浜哄憳
- now, // 淇敼鏃堕棿
- null, // 淇敼浜哄憳
- null // 澶囨敞
- );
- if (tagMapper.insert(secTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ mat = new Mat();
+ // 鍒嗙被
+ Long tagId;
+ // 涓�绾у垎绫�
+ if (!Cools.isEmpty(matParam.getGroupCode()) && !Cools.isEmpty(matParam.getGroupName())) {
+ Tag priTag = tagService.selectByName(matParam.getGroupCode(), 2);
+ if (priTag == null) {
+ Tag top = tagService.getTop();
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(top.getId());
+ priTag = new Tag(
+ null, // 缂栧彿
+ matParam.getGroupCode(), // 鍚嶇О
+ top.getId(), // 鐖剁骇
+ top.getName(), // 鐖剁骇鍚嶇О
+ nodeUtils.path.toString(), // 鍏宠仈璺緞
+ nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 2, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (tagMapper.insert(priTag) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
}
+ // 浜岀骇鍒嗙被
+ Tag secTag = tagService.selectByName(matParam.getGroupName(), 3);
+ if (secTag == null) {
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(priTag.getId());
+ secTag = new Tag(
+ null, // 缂栧彿
+ matParam.getGroupName(), // 鍚嶇О
+ priTag.getId(), // 鐖剁骇
+ priTag.getName(), // 鐖剁骇鍚嶇О
+ nodeUtils.path.toString(), // 鍏宠仈璺緞
+ nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 3, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (tagMapper.insert(secTag) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ tagId = secTag.getId();
+ } else {
+ tagId = tagService.getTop().getId();
}
- tagId = secTag.getId();
- } else {
- tagId = tagService.getTop().getId();
- }
- mat.sync(param);
-// mat.setMatnr(param.getMatnr());
-// mat.setMaktx(param.getMaktx());
-// mat.setSpecs(param.getSpecs());
-// mat.setModel(param.getModel());
-
- mat.setTagId(tagId);
- mat.setStatus(1);
- mat.setCreateTime(now);
- mat.setUpdateTime(now);
- if (!matService.insert(mat)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- } else {
- log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
- }
- } else {
- mat.sync(param);
- if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
- throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
+ mat.sync(matParam);
+ mat.setTagId(tagId);
+ mat.setStatus(1);
+ mat.setCreateTime(now);
+ mat.setUpdateTime(now);
+ if (!matService.insert(mat)) {
+ throw new CoolException("鍚屾鏂扮墿鏂欓敊璇痆" + logInfo + "]");
+ } else {
+ log.info("鍚屾鏂扮墿鏂橻{}]", logInfo);
+ }
+ break;
+ case "delete":
+ if (mat == null) {
+ throw new CoolException("鍟嗗搧淇℃伅涓嶅瓨鍦╗" + logInfo + "]");
+ }
+ if (matService.delete(new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
+ log.info("鍒犻櫎鐗╂枡[{}]", logInfo);
+ } else {
+ throw new CoolException("鍒犻櫎宸插瓨鍦ㄥ晢鍝佷俊鎭け璐" + logInfo + "]");
+ }
+ break;
+ case "update":
+ if (mat == null) {
+ throw new CoolException("鍟嗗搧淇℃伅涓嶅瓨鍦╗" + logInfo + "]");
+ }
+ mat.sync(matParam);
+ if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
+ throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐" + logInfo + "]");
+ } else {
+ log.info("鏇存柊鐗╂枡[锛歿}]", logInfo);
+ }
+ break;
+ default:
+ throw new CoolException("鍟嗗搧淇℃伅鎿嶄綔绫诲瀷涓嶅瓨鍦╗" + logInfo + "]");
}
}
-
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 5ef460b..e5ac684 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
@Slf4j
@Service("orderService")
@@ -70,6 +71,16 @@
break;
}
}
+ //褰撹璁㈠崟鏄庣粏鏁伴噺==瀹屾垚鏁伴噺涓�>涓婃姤鏁伴噺锛屼笂鎶ョ姸鎬佷负 鍚� 鎴栬�� 鏄� 鏃堕兘鏀规垚绛夊緟涓婃姤锛屽畾鏃跺櫒杞绛夊緟涓婃姤杩涜涓婃姤
+ for (OrderDetl orderDetl : orderDetls) {
+ if (Objects.equals(orderDetl.getAnfme(), orderDetl.getQty())&&
+ orderDetl.getQty()>orderDetl.getUnits()
+ &&orderDetl.getInspect()<2) {
+
+ orderDetl.setInspect(2);//绛夊緟涓婃姤
+ orderDetlService.updateById(orderDetl);
+ }
+ }
if (complete) {
if (!this.updateSettle(order.getId(), 4L, null)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
diff --git a/src/main/java/com/zy/asrs/task/AutoReportingScheduler.java b/src/main/java/com/zy/asrs/task/AutoReportingScheduler.java
new file mode 100644
index 0000000..a456eac
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/AutoReportingScheduler.java
@@ -0,0 +1,46 @@
+package com.zy.asrs.task;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.task.handler.AutoReportingHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author pang.jiabao
+ * @description 璁㈠崟鏄庣粏瀹屾垚锛屽畾鏃朵笂鎶8
+ * @createDate 2025/9/19 9:50
+ */
+@Component
+@Slf4j
+public class AutoReportingScheduler {
+
+ @Resource
+ private OrderDetlService orderDetlService;
+
+ @Resource
+ private AutoReportingHandler autoReportingHandler;
+
+ @Scheduled(cron = "0 0/10 * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
+ void execute() {
+ List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("inspect", 2));
+ if (Cools.isEmpty(orderDetls)) {
+ return;
+ }
+ for (OrderDetl orderDetl : orderDetls) {
+ try {
+ autoReportingHandler.U8Reporting(orderDetl);
+ } catch (Exception e) {
+ log.error("璁㈠崟鏄庣粏涓婃姤寮傚父,璁㈠崟鍙凤細{}锛岀墿鏂欙細{},寮傚父鎻忚堪", orderDetl.getOrderNo(), orderDetl.getMatnr());
+ e.printStackTrace();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoReportingHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoReportingHandler.java
new file mode 100644
index 0000000..b4f80d8
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/AutoReportingHandler.java
@@ -0,0 +1,147 @@
+package com.zy.asrs.task.handler;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.U8Properties;
+import com.zy.asrs.entity.result.OrderRsult;
+import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderService;
+import com.zy.common.utils.HttpHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.text.Format;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * @author pang.jiabao
+ * @description 璁㈠崟鏄庣粏瀹屾垚锛屽畾鏃朵笂鎶8
+ * @createDate 2025/9/19 9:50
+ */
+@Slf4j
+@Component
+public class AutoReportingHandler {
+
+ @Resource
+ private U8Properties u8Properties;
+
+ @Resource
+ private OrderDetlService orderDetlService;
+
+ @Resource
+ private OrderService orderService;
+
+ public void U8Reporting(OrderDetl orderDetl) {
+
+ String orderNo = orderDetl.getOrderNo();
+ Order order = orderService.selectByNo(orderNo);
+
+ if (order == null) {
+ throw new CoolException("娌℃湁鎵惧埌璇ヨ鍗曞彿:" + orderNo);
+ }
+
+ OrderRsult orderRsult = new OrderRsult();
+ OrderRsult.Login login = new OrderRsult.Login();
+ OrderRsult.HeadTable headTable = new OrderRsult.HeadTable();
+ OrderRsult.BodyTable bodyTable = new OrderRsult.BodyTable();
+
+ login.setSAccID(u8Properties.getSAccID()); //璐﹀鍙� 鍥哄畾
+ login.setSUserID(u8Properties.getSUserID());//U8鐧婚檰璐﹀彿 鍥哄畾
+ login.setSPassword(u8Properties.getSPassword());//U8鐧婚檰瀵嗙爜 鍥哄畾
+ login.setSServer(u8Properties.getSServer());//U8鏈嶅姟鍣ㄥ湴鍧�銆�鍥哄畾
+ orderRsult.setLogin(login);
+
+ orderRsult.setVerifier("sys");//鍗曟嵁绫诲瀷銆� 鍥哄畾
+ orderRsult.setCommandType("鍏抽棴");//鎿嶄綔绫诲瀷 銆�鍥哄畾
+ orderRsult.setVouchName("");//瀹℃牳浜� 濉啓鍒欒嚜鍔ㄥ鏍�
+
+ headTable.setCtvcode(orderNo);//璋冩嫧鍗曞彿銆� 榛樿
+ //鏃堕棿
+ Date date = new Date();
+ Format formatter = new SimpleDateFormat("yyyy-MM-dd");
+ String format = formatter.format(date);
+ headTable.setDtvdate(format);//鍗曟嵁鏃ユ湡
+ headTable.setCmaker("sys");//鍒跺崟浜哄悕绉�
+ headTable.setVt_id("89");//妯℃澘鍙� 榛樿
+ headTable.setCiwhcode("1");//杞叆浠撳簱缂栫爜
+ headTable.setCowhcode("1");//杞嚭浠撳簱缂栫爜
+ headTable.setCordcode("");//鍑哄簱绫诲埆缂栫爜 榛樿
+ headTable.setCirdcode("");//鍏ュ簱绫诲埆缂栫爜 榛樿
+ headTable.setCodepcode("");//杞嚭閮ㄩ棬缂栫爜
+ headTable.setCidepcode("");//杞叆閮ㄩ棬缂栫爜
+
+ bodyTable.setOrderNo(orderDetl.getOrderNo()); // 鍗曟嵁鍙�
+ bodyTable.setIrowno(orderDetl.getSku());//琛屽彿
+ bodyTable.setCinvcode(orderDetl.getMatnr());//瀛樿揣缂栫爜
+ bodyTable.setCtvbatch(Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch());//鎵瑰彿锛堢壒娈婅鏄庯級
+ Double qty = orderDetl.getQty() - (Cools.isEmpty(orderDetl.getUnits()) ? 0 : orderDetl.getUnits());
+ bodyTable.setItvquantity(String.valueOf(qty));//瀹屾垚浠舵暟
+ bodyTable.setCinposcode("1-1");//绔嬪簱婧愯揣浣�
+ bodyTable.setCoutposcode("");//鐩爣璐т綅
+ bodyTable.setItrsid(orderDetl.getSku());//琛屼富閿�
+ bodyTable.setEditprop("A");//鐘舵�� A 鏂板
+
+ ArrayList<OrderRsult.BodyTable> bodyTables = new ArrayList<>();
+ bodyTables.add(bodyTable);
+ orderRsult.setBodyTable(bodyTables);
+
+ ArrayList<OrderRsult.HeadTable> headTables = new ArrayList<>();
+ headTables.add(headTable);
+ orderRsult.setHeadTable(headTables);
+
+ String response = "";
+ boolean success = false;
+ try {
+
+ response = new HttpHandler.Builder()
+// .setHeaders(map)
+ .setUri(u8Properties.getURL())
+ .setPath(u8Properties.getResultReportPath())
+ .setJson(JSON.toJSONString(orderRsult))
+ .build()
+ .doPost();
+ log.info("璁㈠崟鏄庣粏瀹屾垚涓婃姤u8鍘熷杩斿洖锛歿}", response);
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ if (jsonObject.getInteger("code").equals(200)) {
+ orderDetl.setUnits(qty + (Cools.isEmpty(orderDetl.getUnits()) ? 0 : orderDetl.getUnits()));
+ if (Objects.equals(orderDetl.getQty(), orderDetl.getAnfme())) {
+ orderDetl.setInspect(1);
+ }
+ orderDetlService.updateById(orderDetl);
+ success = true;
+ } else {
+ log.error("璁㈠崟鏄庣粏瀹屾垚涓婃姤u8澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", u8Properties.getURL() + "/" + u8Properties.getResultReportPath(), JSON.toJSONString(orderRsult), response);
+ }
+ } catch (Exception e) {
+ response = e.getMessage();
+ log.error("璁㈠崟鏄庣粏瀹屾垚涓婃姤u8寮傚父锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", u8Properties.getURL() + "/" + u8Properties.getResultReportPath(), JSON.toJSONString(orderRsult), response);
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
+ apiLogService.save(
+ "璁㈠崟瀹屾垚涓婃姤u8",
+ u8Properties.getURL() + "/" + u8Properties.getResultReportPath(),
+ "",
+ "127.0.0.1",
+ JSON.toJSONString(orderRsult),
+ response,
+ success
+ );
+ } catch (Exception e) {
+ log.error("璁㈠崟瀹屾垚涓婃姤u8鎺ュ彛鏃ュ織淇濆瓨寮傚父", e);
+ }
+ }
+ }
+}
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 650e884..da3b481 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -21,6 +21,11 @@
private Double anfme;
+ /**
+ * 鍗曡鍙凤紝u8鏄庣粏id
+ */
+ private String sku;
+
public DetlDto() {
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4aad41e..e83e13a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -71,6 +71,15 @@
comb:
limit: 5000
+u8:
+ URL: http://127.0.0.1:8080/jsjwms
+ sServer: 10.10.0.10
+ sAccID: (default)@980
+ sUserID: PW008
+ sPassword: D#012332.
+ # 璁㈠崟鏄庣粏缁撴灉涓婃姤鍦板潃
+ resultReportPath: open/asrs/order/resultExport/default/v1
+
#erp瀵规帴
erp:
# 寮�鍏�
--
Gitblit v1.9.1