From fcd883af311ce8770c701c14e4eca484c810dc64 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 11 四月 2022 10:40:44 +0800
Subject: [PATCH] #
---
version/自动化立库平台对接协议.docx | 0
src/main/java/com/zy/asrs/controller/OpenController.java | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 39 ++++++++++++++++++++-------------------
3 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 770075a..d6c8eca 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -59,7 +59,7 @@
*/
@PostMapping("/order/pakin/complete/default/v1")
public synchronized R orderComplete(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderCompleteParam param) {
+ @RequestBody(required = false) OpenOrderCompleteParam param) {
auth(appkey, param);
return R.ok().add(openService.pakinOrderComplete(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 529ad91..b87ce40 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -114,6 +114,7 @@
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);
@@ -132,25 +133,7 @@
@Transactional
public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
List<OpenOrderCompeteResult> results = new ArrayList<>();
- if (Cools.isEmpty(param.getOrderNo())) {
- // 鎵�鏈夎鍗�
- List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
- for (Order order : orders) {
- OpenOrderCompeteResult result = new OpenOrderCompeteResult();
- results.add(result);
- result.setOrderNo(order.getOrderNo());
- result.setOrderTime(order.getOrderTime());
- result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
- }
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- }
- } else {
+ if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
// 鎸囧畾璁㈠崟
Order order = orderService.selectByNo(param.getOrderNo());
if (null != order) {
@@ -170,6 +153,24 @@
}
}
}
+ } else {
+ // 鎵�鏈夎鍗�
+ List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
+ for (Order order : orders) {
+ OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+ results.add(result);
+ result.setOrderNo(order.getOrderNo());
+ result.setOrderTime(order.getOrderTime());
+ result.setOrderType(order.getDocType$());
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ for (OrderDetl orderDetl : orderDetls) {
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+ }
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
}
return results;
}
diff --git "a/version/\350\207\252\345\212\250\345\214\226\347\253\213\345\272\223\345\271\263\345\217\260\345\257\271\346\216\245\345\215\217\350\256\256.docx" "b/version/\350\207\252\345\212\250\345\214\226\347\253\213\345\272\223\345\271\263\345\217\260\345\257\271\346\216\245\345\215\217\350\256\256.docx"
index 9703d92..ba9a971 100644
--- "a/version/\350\207\252\345\212\250\345\214\226\347\253\213\345\272\223\345\271\263\345\217\260\345\257\271\346\216\245\345\215\217\350\256\256.docx"
+++ "b/version/\350\207\252\345\212\250\345\214\226\347\253\213\345\272\223\345\271\263\345\217\260\345\257\271\346\216\245\345\215\217\350\256\256.docx"
Binary files differ
--
Gitblit v1.9.1