From 0874ababb94bfb41a3bf7826572a60b84e0fd943 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 22 四月 2022 18:26:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 229 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 222 insertions(+), 7 deletions(-)
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..7dd8ac8 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,18 +1,19 @@
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;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
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.*;
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 +25,7 @@
/**
* Created by vincent on 2022/4/9
*/
+@Slf4j
@Service
public class OpenServiceImpl implements OpenService {
@@ -39,6 +41,10 @@
private MatService matService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private PackService packService;
+ @Autowired
+ private TagService tagService;
@Override
@Transactional
@@ -47,7 +53,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(
@@ -109,6 +115,8 @@
}
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);
@@ -124,8 +132,178 @@
}
@Override
- public Object pakinOrderComplete(OpenOrderCompleteParam param) {
- return null;
+ @Transactional
+ public List<OpenOrderCompeteResult> pakinOrderComplete(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
+ 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
@@ -134,4 +312,41 @@
return locDetlService.queryStockTotal();
}
+ @Override
+ @Transactional
+ public void packageUp(String barcode) {
+ Pack pack = packService.selectByBarcode(barcode);
+ if (null != pack) {
+ throw new CoolException(barcode + "閲嶅鎻愪氦");
+ }
+ Date now = new Date();
+ // todo:luxiaotao 瑙ｆ瀽鏉＄爜瑙勫垯锛岃幏鍙栫墿鏂欎唬鐮�
+ pack = new Pack(
+ barcode, // 鏉＄爜[闈炵┖]
+ null, // 鍟嗗搧缂栧彿
+ null, // 鎵瑰彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (!packService.insert(pack)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ Mat mat = new Mat();
+ mat.setTagId(tagService.getTop().getId());
+ mat.setMatnr(barcode);
+ mat.setMaktx(barcode);
+ mat.setStatus(1);
+ mat.setCreateTime(now);
+ mat.setUpdateTime(now);
+ mat.setMemo("鎵撳寘涓婄嚎");
+ if (!matService.insert(mat)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+
}
--
Gitblit v1.9.1