From 6ddd525901cce19178983f37cbde7209d9df897e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 11 四月 2022 09:27:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java | 5 +
src/main/java/com/zy/asrs/controller/OpenController.java | 46 ++++++++++++++-
src/main/java/com/zy/asrs/service/DocTypeService.java | 2
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 51 ++++++++++++++++-
src/main/java/com/zy/asrs/entity/result/OpenOrderCompeteResult.java | 23 +++++++
src/main/java/com/zy/asrs/service/OpenService.java | 3
6 files changed, 120 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8002f80..8c15105 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,18 +1,19 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
+import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.service.OpenService;
+import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* Created by vincent on 2022/4/8
@@ -22,7 +23,7 @@
@RequestMapping("open/asrs")
public class OpenController {
- private static final boolean auth = false;
+ private static final boolean auth = true;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
@@ -86,4 +87,41 @@
}
}
+ public static void main(String[] args) {
+ // 1
+ System.out.println("======================================");
+ OpenOrderPakinParam param = new OpenOrderPakinParam();
+ param.setOrderNo(String.valueOf(new SnowflakeIdWorker().nextId()));
+ param.setOrderType("鎵撳寘涓婄嚎鍗�");
+ param.setOrderTime(DateUtils.convert(new Date()));
+ List<DetlDto> orderDetails = new ArrayList<>();
+ param.setOrderDetails(orderDetails);
+ for (int i = 0; i < 3; i++) {
+ DetlDto detlDto = new DetlDto();
+ switch (i) {
+ case 0:
+ detlDto.setMatnr("MDH020030530");
+ detlDto.setAnfme(18.0);
+ break;
+ case 1:
+ detlDto.setMatnr("MDH020016416");
+ detlDto.setAnfme(32.0);
+ break;
+ case 2:
+ detlDto.setMatnr("LSH90152025");
+ detlDto.setAnfme(50.0);
+ break;
+ default:
+ break;
+ }
+ orderDetails.add(detlDto);
+ }
+ System.out.println(JSON.toJSONString(param));
+ // 2
+ System.out.println("======================================");
+ OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
+ param1.setOrderNo("963001846497017856");
+ System.out.println(JSON.toJSONString(param1));
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/result/OpenOrderCompeteResult.java b/src/main/java/com/zy/asrs/entity/result/OpenOrderCompeteResult.java
new file mode 100644
index 0000000..5ba59f2
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/result/OpenOrderCompeteResult.java
@@ -0,0 +1,23 @@
+package com.zy.asrs.entity.result;
+
+import com.zy.common.model.DetlDto;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by vincent on 2022/4/11
+ */
+@Data
+public class OpenOrderCompeteResult {
+
+ private String orderNo;
+
+ private String orderType;
+
+ private String orderTime;
+
+ private List<DetlDto> orderDetails = new ArrayList<>();
+
+}
diff --git a/src/main/java/com/zy/asrs/service/DocTypeService.java b/src/main/java/com/zy/asrs/service/DocTypeService.java
index e324cae..35e585d 100644
--- a/src/main/java/com/zy/asrs/service/DocTypeService.java
+++ b/src/main/java/com/zy/asrs/service/DocTypeService.java
@@ -5,6 +5,6 @@
public interface DocTypeService extends IService<DocType> {
- DocType selectOrAdd(String docName);
+ DocType selectOrAdd(String docName, Boolean pakin);
}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 8fa76d2..70988d3 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -2,6 +2,7 @@
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
import java.util.List;
@@ -16,7 +17,7 @@
/**
* 鍏ュ簱鍗曞洖鍐�
*/
- Object pakinOrderComplete(OpenOrderCompleteParam param);
+ List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param);
/**
* 搴撳瓨缁熻
diff --git a/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java
index b7eef61..43fb249 100644
--- a/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java
@@ -15,7 +15,7 @@
public class DocTypeServiceImpl extends ServiceImpl<DocTypeMapper, DocType> implements DocTypeService {
@Override
- public DocType selectOrAdd(String docName) {
+ public DocType selectOrAdd(String docName, Boolean pakin) {
if (Cools.isEmpty(docName)) {
return null;
}
@@ -29,6 +29,9 @@
docType = new DocType();
docType.setDocId(docId);
docType.setDocName(docName);
+ if (null != pakin) {
+ docType.setPakin(pakin ? 1 : 0);
+ }
docType.setStatus(1);
docType.setCreateTime(new Date());
docType.setUpdateTime(new Date());
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 98eb4bd..762ed92 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,6 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
@@ -10,9 +11,11 @@
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +27,7 @@
/**
* Created by vincent on 2022/4/9
*/
+@Slf4j
@Service
public class OpenServiceImpl implements OpenService {
@@ -47,7 +51,7 @@
if (!Cools.isEmpty(order)) {
throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
}
- DocType docType = docTypeService.selectOrAdd(param.getOrderType());
+ DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
Date now = new Date();
// 鍗曟嵁涓绘。
order = new Order(
@@ -124,8 +128,49 @@
}
@Override
- public Object pakinOrderComplete(OpenOrderCompleteParam param) {
- return null;
+ @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 {
+ // 鎸囧畾璁㈠崟
+ Order order = orderService.selectByNo(param.getOrderNo());
+ if (null != order) {
+ 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()));
+ }
+ if (order.getSettle() == 4L) {
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ }
+ }
+ return results;
}
@Override
--
Gitblit v1.9.1