From 2aa1e6940784c314bc350b6d4b2d1a2feed33a70 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 11 四月 2022 13:46:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 22 +++++
src/main/java/com/zy/asrs/controller/OpenController.java | 37 +++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 130 ++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 11 ++
4 files changed, 199 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index d6c8eca..dd13352 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -5,6 +5,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
@@ -58,13 +59,47 @@
* 鍏ュ簱鍗曞洖鍐�
*/
@PostMapping("/order/pakin/complete/default/v1")
- public synchronized R orderComplete(@RequestHeader(required = false) String appkey,
+ public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) OpenOrderCompleteParam param) {
auth(appkey, param);
return R.ok().add(openService.pakinOrderComplete(param));
}
/**
+ * 娣诲姞鍑哄簱鍗�
+ */
+ @PostMapping("/order/pakout/new/default/v1")
+ public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderPakoutParam param) {
+ auth(appkey, param);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getOrderNo())) {
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderType())) {
+ return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
+ openService.pakoutOrderCreate(param);
+ return R.ok();
+ }
+
+ /**
+ * 鍑哄簱鍗曞洖鍐�
+ */
+ @PostMapping("/order/pakout/complete/default/v1")
+ public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) OpenOrderCompleteParam param) {
+ auth(appkey, param);
+ return R.ok().add(openService.pakoutOrderComplete(param));
+ }
+
+
+ /**
* 搴撳瓨缁熻
*/
@RequestMapping("/stock/default/v1")
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
new file mode 100644
index 0000000..a44287a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -0,0 +1,22 @@
+package com.zy.asrs.entity.param;
+
+import com.zy.common.model.DetlDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2022/4/8
+ */
+@Data
+public class OpenOrderPakoutParam {
+
+ private String orderNo;
+
+ private String orderType;
+
+ private String orderTime;
+
+ private List<DetlDto> orderDetails;
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 70988d3..df294c2 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.param.OpenOrderPakoutParam;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
@@ -20,6 +21,16 @@
List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param);
/**
+ * 娣诲姞鍏ュ簱鍗�
+ */
+ void pakoutOrderCreate(OpenOrderPakoutParam param);
+
+ /**
+ * 鍏ュ簱鍗曞洖鍐�
+ */
+ List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param);
+
+ /**
* 搴撳瓨缁熻
*/
List<StockVo> queryStock();
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 b87ce40..bc4b8f7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -11,6 +11,7 @@
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.param.OpenOrderPakoutParam;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.service.*;
@@ -176,6 +177,135 @@
}
@Override
+ public void pakoutOrderCreate(OpenOrderPakoutParam param) {
+ Order order = orderService.selectByNo(param.getOrderNo());
+ if (!Cools.isEmpty(order)) {
+ throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ }
+ 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());
+ } 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.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("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ }
+
+ @Override
+ public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) {
+ List<OpenOrderCompeteResult> results = new ArrayList<>();
+ if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
+ // 鎸囧畾璁㈠崟
+ 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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ }
+ } 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;
+ }
+
+ @Override
@Transactional
public List<StockVo> queryStock() {
return locDetlService.queryStockTotal();
--
Gitblit v1.9.1