From 96f92ed5f6c0e3ac57214828e09b5aa4fa33270a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 12 十一月 2025 14:58:35 +0800
Subject: [PATCH] erp对接接口开发
---
src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java | 22 -
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 3
src/main/java/com/zy/asrs/controller/OpenController.java | 13
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 4
src/main/java/com/zy/asrs/entity/ErpReportDto.java | 28 ++
src/main/java/com/zy/asrs/entity/param/MatSyncParam.java | 7
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 555 ++++++++++++++++++++++++++------------------------
src/main/java/com/zy/asrs/service/OpenService.java | 2
src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java | 20
src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java | 3
10 files changed, 364 insertions(+), 293 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 27c812c..f1a90fe 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -73,12 +73,12 @@
}
@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) {
auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
+ if (Cools.isEmpty(param,param.getMatDetails())) {
return R.parse(BaseRes.PARAM);
}
openService.syncMat(param);
@@ -106,6 +106,7 @@
* 娣诲姞鍏ュ簱鍗�
*/
@PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "鍏ュ簱鍗曟嵁涓嬪彂")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakinParam param,
HttpServletRequest request) {
@@ -120,6 +121,9 @@
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
+ if (!param.getOptType().equals("delete") && Cools.isEmpty(param.getOrderDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
openService.pakinOrderCreate(param);
@@ -141,7 +145,7 @@
* 娣诲姞鍑哄簱鍗�
*/
@PostMapping("/order/pakout/default/v1")
- @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
+ @AppAuth(memo = "鍑哄簱鍗曟嵁涓嬪彂")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakoutParam param,
HttpServletRequest request) {
@@ -158,6 +162,9 @@
if (Cools.isEmpty(param.getOrderDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
+ if (!param.getOptType().equals("delete") && Cools.isEmpty(param.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
openService.pakoutOrderCreate(param);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/entity/ErpReportDto.java b/src/main/java/com/zy/asrs/entity/ErpReportDto.java
new file mode 100644
index 0000000..597c891
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/ErpReportDto.java
@@ -0,0 +1,28 @@
+package com.zy.asrs.entity;
+
+import com.zy.common.model.DetlDto;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author pang.jiabao
+ * @description 鍗曟嵁瀹屾垚涓婃姤鍙傛暟
+ * @createDate 2025/11/12 10:55
+ */
+@Data
+public class ErpReportDto {
+
+ private String orderNo;
+
+ private List<DetlDto> orderDetails;
+
+ @Data
+ @AllArgsConstructor
+ public static class DetlDto {
+ private String matnr;
+ private Double anfme;
+ }
+
+}
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 ccb3419..3a6dc3b 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
@@ -20,6 +20,13 @@
@Data
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..030f53e 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
@@ -15,6 +15,9 @@
private String orderType;
+ // 鎿嶄綔绫诲瀷 add.鏂板锛宒elete.鍒犻櫎
+ private String optType;
+
private String orderTime;
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 c2da074..ae8842f 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -17,6 +17,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/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 0d2fa0e..6e85104 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 4fe2a16..ce9be2c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -56,91 +56,113 @@
@Override
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
+ String orderNo = param.getOrderNo();
+ String orderType = param.getOrderType();
+ String optType = param.getOptType();
OrderPakin order = orderPakinService.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 OrderPakin(
- 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 (!orderPakinService.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.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getLineNumber(), detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
- if (DetlDto.hasLineNumber(list, dto)) {
- DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getLineNumber(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+ if (optType.equals("add")) {
+ if (!Cools.isEmpty(order)) {
+ throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ }
+ DocType docType = docTypeService.selectOrAdd(orderType, Boolean.TRUE);
+ Date now = new Date();
+ // 鍗曟嵁涓绘。
+ order = new OrderPakin(
+ 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, // 鐘舵��
+ null, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ null, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderPakinService.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.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getLineNumber(), detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
+ if (DetlDto.hasLineNumber(list, dto)) {
+ DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getLineNumber(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
+ 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() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ OrderDetlPakin orderDetl = new OrderDetlPakin();
+ orderDetl.sync(mat);
+ orderDetl.setLineNumber(detlDto.getLineNumber());
+ orderDetl.setBatch(detlDto.getBatch());
+ orderDetl.setAnfme(detlDto.getAnfme());
+ orderDetl.setBrand(detlDto.getBrand());
+ orderDetl.setStandby1(detlDto.getStandby1());
+ orderDetl.setStandby2(detlDto.getStandby2());
+ orderDetl.setStandby3(detlDto.getStandby3());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(null);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(null);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ orderDetl.setPakinPakoutStatus(1);
+ if (!orderDetlPakinService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ } else if (optType.equals("delete")) {
+ if (Cools.isEmpty(order)) {
+ throw new CoolException(orderNo + "鍗曟嵁涓嶅瓨鍦紒");
+ }
+
+ // 璁㈠崟鐘舵��
+ Long settle = order.getSettle();
+ if (settle == 1) {
+ // 鍒犻櫎璁㈠崟鏄庣粏
+ orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_id", order.getId()));
+ // 鍒犻櫎璁㈠崟涓昏〃
+ orderPakinService.delete(new EntityWrapper<OrderPakin>().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() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
- OrderDetlPakin orderDetl = new OrderDetlPakin();
- orderDetl.sync(mat);
- orderDetl.setLineNumber(detlDto.getLineNumber());
- orderDetl.setBatch(detlDto.getBatch());
- orderDetl.setAnfme(detlDto.getAnfme());
- orderDetl.setBrand(detlDto.getBrand());
- orderDetl.setStandby1(detlDto.getStandby1());
- orderDetl.setStandby2(detlDto.getStandby2());
- orderDetl.setStandby3(detlDto.getStandby3());
- 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);
- orderDetl.setPakinPakoutStatus(1);
- if (!orderDetlPakinService.insert(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
+ } else {
+ throw new CoolException(orderNo + "锛屾搷浣滅被鍨嬩笉瀛樺湪锛�" + optType);
}
}
@@ -204,97 +226,118 @@
@Override
@Transactional
public void pakoutOrderCreate(OpenOrderPakoutParam param) {
+ String orderNo = param.getOrderNo();
+ String optType = param.getOptType();
+ String orderType = param.getOrderType();
OrderPakout order = orderPakoutService.selectByNo(param.getOrderNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
- if (!Cools.isEmpty(order)) {
- if (order.getSettle() > 1L) {
- throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ if (optType.equals("add")) {
+ if (!Cools.isEmpty(order)) {
+ if (order.getSettle() > 1L) {
+ throw new CoolException(param.getOrderNo() + "璁㈠崟宸插瓨鍦�");
+ }
+ orderPakoutService.remove(order.getId());
}
- orderPakoutService.remove(order.getId());
- }
- DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
- Date now = new Date();
- // 鍗曟嵁涓绘。
- order = new OrderPakout(
- 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 (!orderPakoutService.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.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getLineNumber(),
- detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
- if (DetlDto.hasLineNumber(list, dto)) {
- DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getLineNumber(),
- dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+ DocType docType = docTypeService.selectOrAdd(orderType, Boolean.FALSE);
+ Date now = new Date();
+ // 鍗曟嵁涓绘。
+ order = new OrderPakout(
+ 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, // 鐘舵��
+ null, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ null, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderPakoutService.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.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getLineNumber(),
+ detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
+ if (DetlDto.hasLineNumber(list, dto)) {
+ DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getLineNumber(),
+ dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
+ 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() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ OrderDetlPakout orderDetl = new OrderDetlPakout();
+ orderDetl.sync(mat);
+ orderDetl.setLineNumber(detlDto.getLineNumber());
+ orderDetl.setBatch(detlDto.getBatch());
+ orderDetl.setAnfme(detlDto.getAnfme());
+ orderDetl.setBrand(detlDto.getBrand());
+ orderDetl.setStandby1(detlDto.getStandby1());
+ orderDetl.setStandby2(detlDto.getStandby2());
+ orderDetl.setStandby3(detlDto.getStandby3());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(null);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(null);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ orderDetl.setPakinPakoutStatus(2);
+ if (!orderDetlPakoutService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ } else if (optType.equals("delete")) {
+ if (Cools.isEmpty(order)) {
+ throw new CoolException(orderNo + "鍗曟嵁涓嶅瓨鍦紒");
+ }
+ // 璁㈠崟鐘舵��
+ Long settle = order.getSettle();
+ if (settle == 1) {
+ // 鍒犻櫎璁㈠崟鏄庣粏
+ orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()));
+ // 鍒犻櫎璁㈠崟涓昏〃
+ orderPakoutService.delete(new EntityWrapper<OrderPakout>().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() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
- OrderDetlPakout orderDetl = new OrderDetlPakout();
- orderDetl.sync(mat);
- orderDetl.setLineNumber(detlDto.getLineNumber());
- orderDetl.setBatch(detlDto.getBatch());
- orderDetl.setAnfme(detlDto.getAnfme());
- orderDetl.setBrand(detlDto.getBrand());
- orderDetl.setStandby1(detlDto.getStandby1());
- orderDetl.setStandby2(detlDto.getStandby2());
- orderDetl.setStandby3(detlDto.getStandby3());
- 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);
- orderDetl.setPakinPakoutStatus(2);
- if (!orderDetlPakoutService.insert(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
+ } else {
+ throw new CoolException(orderNo + "锛屾搷浣滅被鍨嬩笉瀛樺湪锛�" + optType);
}
}
@@ -473,111 +516,93 @@
@Override
@Transactional
public void syncMat(MatSyncParam param) {
- if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
- throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
- }
-
+ Date now = new Date();
for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
- if (Cools.isEmpty(matParam.getMatnr())) {
- throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
+ 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.getGroupName())) {
+ Tag priTag = tagService.selectByName(matParam.getGroupName(), 2);
+ if (priTag == null) {
+ Tag top = tagService.getTop();
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(top.getId());
+ priTag = new Tag(
+ null, // 缂栧彿
+ matParam.getGroupName(), // 鍚嶇О
+ 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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
}
+ tagId = priTag.getId();
+ } else {
+ tagId = tagService.getTop().getId();
}
- tagId = secTag.getId();
- } else {
- tagId = tagService.getTop().getId();
- }
- mat.sync(matParam);
-// mat.setMatnr(param.getMatnr());
-// mat.setMaktx(param.getMaktx());
-// mat.setSpecs(param.getSpecs());
-// mat.setModel(param.getModel());
-
- mat.setTagId(tagId);
- mat.setLocType(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(matParam);
- 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/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index e9a4374..776d61f 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -50,7 +50,7 @@
}
} catch (Exception e) {
log.error(e.getMessage());
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp寮傚父", order.getOrderNo());
}
}
}
@@ -69,7 +69,7 @@
}
} catch (Exception e) {
log.error(e.getMessage());
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp寮傚父", order.getOrderNo());
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java
index b40c44d..bf71b92 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java
@@ -5,10 +5,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.OrderDetlPakin;
-import com.zy.asrs.entity.OrderPakin;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderDetlPakinService;
@@ -23,6 +20,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -51,12 +49,14 @@
return FAIL.setMsg("鏈壘鍒板搴旂殑鍗曟嵁绫诲瀷锛�" + order.getOrderNo());
}
- MesPakinParam pakinParam = new MesPakinParam();
+ ErpReportDto param = new ErpReportDto();
+ param.setOrderDetails(new ArrayList<>());
List<OrderDetlPakin> orderDetls = orderDetlPakinService.selectByOrderId(order.getId());
for (OrderDetlPakin orderDetl : orderDetls) {
- String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
- pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
+ param.getOrderDetails().add(new ErpReportDto.DetlDto(orderDetl.getMatnr(),orderDetl.getQty()));
}
+ param.setOrderNo(order.getOrderNo());
+
String response = "";
boolean success = false;
ReturnT<String> result = SUCCESS;
@@ -64,7 +64,7 @@
response = new HttpHandler.Builder()
.setUri(MesConstant.URI)
.setPath(MesConstant.PAKIN_PATH)
- .setJson(JSON.toJSONString(pakinParam))
+ .setJson(JSON.toJSONString(param))
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
@@ -73,7 +73,7 @@
orderPakinService.updateSettle(order.getId(), 6L, null);
success = true;
} else {
- log.error("鍏ュ簱瀹屾垚涓婃姤erp澶辫触锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URI + MesConstant.PAKIN_PATH, JSON.toJSONString(pakinParam), response);
+ log.error("鍏ュ簱瀹屾垚涓婃姤erp澶辫触锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URI + MesConstant.PAKIN_PATH, JSON.toJSONString(param), response);
throw new CoolException("鍏ュ簱瀹屾垚涓婃姤erp澶辫触");
}
} catch (Exception e) {
@@ -87,7 +87,7 @@
MesConstant.URI + MesConstant.PAKIN_PATH,
null,
"127.0.0.1",
- JSON.toJSONString(pakinParam),
+ JSON.toJSONString(param),
response,
success
);
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java
index 1b670a3..353c8ac 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java
@@ -5,10 +5,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.OrderDetlPakout;
-import com.zy.asrs.entity.OrderPakout;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderDetlPakoutService;
@@ -23,6 +20,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -51,14 +49,14 @@
return FAIL.setMsg("鏈壘鍒板搴旂殑鍗曟嵁绫诲瀷锛�" + order.getOrderNo());
}
- MesPakoutParam pakoutParam = new MesPakoutParam();
- pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("鎵嬪姩鍑哄簱鍗�"));
- pakoutParam.setOrderNo(order.getOrderNo());
+ ErpReportDto param = new ErpReportDto();
+ param.setOrderDetails(new ArrayList<>());
List<OrderDetlPakout> orderDetls = orderDetlPakoutService.selectByOrderId(order.getId());
for (OrderDetlPakout orderDetl : orderDetls) {
- String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
- pakoutParam.getList().add(new MesPakoutParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
+ param.getOrderDetails().add(new ErpReportDto.DetlDto(orderDetl.getMatnr(),orderDetl.getQty()));
}
+ param.setOrderNo(order.getOrderNo());
+
String response = "";
boolean success = false;
ReturnT<String> result = SUCCESS;
@@ -66,7 +64,7 @@
response = new HttpHandler.Builder()
.setUri(MesConstant.URI)
.setPath(MesConstant.PAKOUT_PATH)
- .setJson(JSON.toJSONString(pakoutParam))
+ .setJson(JSON.toJSONString(param))
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
@@ -75,7 +73,7 @@
orderPakoutService.updateSettle(order.getId(), 6L, null);
success = true;
} else {
- log.error("鍑哄簱瀹屾垚涓婃姤erp澶辫触锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URI + MesConstant.PAKOUT_PATH, JSON.toJSONString(pakoutParam), response);
+ log.error("鍑哄簱瀹屾垚涓婃姤erp澶辫触锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URI + MesConstant.PAKOUT_PATH, JSON.toJSONString(param), response);
throw new CoolException("鍑哄簱瀹屾垚涓婃姤erp澶辫触");
}
} catch (Exception e) {
@@ -89,7 +87,7 @@
MesConstant.URI + MesConstant.PAKOUT_PATH,
null,
"127.0.0.1",
- JSON.toJSONString(pakoutParam),
+ JSON.toJSONString(param),
response,
success
);
--
Gitblit v1.9.1