From cc3185eaf94050d299cbd9d0c105eb3d1229996a Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期四, 24 十月 2024 16:10:04 +0800
Subject: [PATCH] 修復
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java | 199 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 195 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
index c74c4b1..3a9d595 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
@@ -1,17 +1,51 @@
package com.zy.asrs.common.wms.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.common.domain.dto.DetlDto;
+import com.zy.asrs.common.domain.dto.OrderNameListDto;
+import com.zy.asrs.common.domain.param.OpenOrderPakinParam;
+import com.zy.asrs.common.domain.param.OpenOrderPakoutParam;
+import com.zy.asrs.common.wms.entity.*;
+import com.zy.asrs.common.wms.mapper.OrderDetlMapper;
import com.zy.asrs.common.wms.mapper.OrderMapper;
-import com.zy.asrs.common.wms.entity.Order;
-import com.zy.asrs.common.wms.service.OrderService;
+import com.zy.asrs.common.wms.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.DateUtils;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.common.SnowflakeIdWorker;
+import com.zy.asrs.framework.exception.CoolException;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service("orderService")
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
+
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private OpenService openService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private OrderDetlMapper orderDetlMapper;
+ @Autowired
+ private DocTypeService docTypeService;
+
+ @Override
+ public List<Order> selectComplete() {
+ return this.baseMapper.selectComplete();
+ }
+
+ @Override
+ public List<OrderDetl> selectWorkingDetls(Long orderId) {
+ return orderDetlMapper.selectWorkingDetls(orderId);
+ }
@Override
public void updateOrder1(Long orderId,Long userId) {
@@ -19,12 +53,169 @@
}
@Override
- public Order selectByNo(String orderNo) {
- List<Order> orderList = this.list(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, orderNo));
+ public Order selectByNo(String orderNo, Long hostId) {
+ List<Order> orderList = this.list(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, orderNo).eq(Order::getHostId, hostId));
if (Cools.isEmpty(orderList)) {
return null;
}
return orderList.get(0);
}
+ @Override
+ public boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls, Long hostId) {
+ try {
+ List<DetlDto> detlDtos = new ArrayList<>();
+ wrkDetls.forEach(wrkDetl -> {
+ detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
+ });
+ String orderNo = "HAND" + snowflakeIdWorker.nextId();
+ if (pakin) {
+ // 鐢熸垚鍏ュ簱鍗曟嵁
+ OpenOrderPakinParam openParam = new OpenOrderPakinParam();
+ openParam.setOrderNo(orderNo);
+ openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+ openParam.setOrderType("鎵嬪姩鍏ュ簱鍗�");
+ openParam.setOrderDetails(detlDtos);
+ openParam.setHostId(hostId);
+ openService.pakinOrderCreate(openParam);
+ } else {
+ // 鐢熸垚鍑哄簱鍗曟嵁
+ OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
+ openParam.setOrderNo(orderNo);
+ openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+ openParam.setOrderType("鎵嬪姩鍑哄簱鍗�");
+ openParam.setOrderDetails(detlDtos);
+ openParam.setHostId(hostId);
+ openService.pakoutOrderCreate(openParam);
+ }
+
+ Order order = this.selectByNo(orderNo, hostId);
+ if (null == order) {
+ throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
+ }
+ if (!this.updateSettle(order.getId(), 4L, null, hostId)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
+ for (DetlDto detlDto : detlDtos) {
+ // 淇敼璁㈠崟鏄庣粏鏁伴噺
+ if (!orderDetlService.increase(order.getId(), hostId, detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
+ }
+ }
+ // 宸ヤ綔妗ｆ槑缁嗘洿鏂板崟鎹紪鍙�
+ for (WrkDetl wrkDetl : wrkDetls) {
+ wrkDetlService.updateOrderNo(orderNo, wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), hostId);
+ }
+ } catch (Exception e) {
+ log.error("", e);
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public boolean updateSettle(Long orderId, Long settle, Long userId, Long hostId) {
+ return this.baseMapper.updateSettle(orderId, settle, userId, hostId) > 0;
+ }
+
+ @Override
+ public void checkComplete(String orderNo, Long hostId) {
+ Order order = this.selectByNo(orderNo, hostId);
+ if (order.getSettle() >= 4L) {
+ return;
+ }
+ List<OrderDetl> orderDetls = orderDetlMapper.selectDetls(order.getId(),hostId);
+ boolean complete = true;
+ for (OrderDetl orderDetl : orderDetls) {
+ if (orderDetl.getAnfme() > orderDetl.getQty()) {
+ complete = false;
+ break;
+ }
+ }
+ if (complete) {
+ if (!this.updateSettle(order.getId(), 4L, null, hostId)) {
+ throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
+ }
+ }
+
+ }
+
+ @Override
+ public List<OrderNameListDto> selectAllCombOrderNo(Long hostId) {
+ List<Order> list = list(new LambdaQueryWrapper<Order>().eq(Order::getHostId, hostId).orderByDesc(Order::getCreateTime));
+ if (Cools.isEmpty(list)){
+ return null;
+ }
+ ArrayList<OrderNameListDto> orderNameListDtos = new ArrayList<>();
+ for (Order order :list){
+ DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, order.getDocType()));
+
+ if (order.getSettle() >= 4) {
+ continue;
+ }
+
+ if (docType.getPakin() == 1){
+ OrderNameListDto orderNameListDto = new OrderNameListDto();
+ orderNameListDto.setOrder_no(order.getOrderNo());
+ orderNameListDtos.add(orderNameListDto);
+ }
+ }
+
+ return orderNameListDtos;
+
+ }
+
+ @Override
+ public List<OrderNameListDto> selectAllorderNo(Long hostId) {
+ List<Order> list = list(new LambdaQueryWrapper<Order>().eq(Order::getHostId, hostId).orderByDesc(Order::getCreateTime));
+ if (Cools.isEmpty(list)){
+ return null;
+ }
+ ArrayList<OrderNameListDto> orderNameListDtos = new ArrayList<>();
+ for (Order order :list){
+ DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, order.getDocType()));
+
+ if (docType.getPakin() == 1){
+ OrderNameListDto orderNameListDto = new OrderNameListDto();
+ orderNameListDto.setOrder_no(order.getOrderNo());
+ orderNameListDtos.add(orderNameListDto);
+ }
+ }
+
+ return orderNameListDtos;
+
+ }
+
+ @Override
+ public List<String> selectAllOutOrderNo(String orderNo,Long hostId) {
+ List<Order> list = list(new LambdaQueryWrapper<Order>()
+ .eq(Order::getHostId, hostId)
+ .like(Order::getOrderNo, orderNo)
+ .orderByDesc(Order::getCreateTime)
+ );
+ if (Cools.isEmpty(orderNo) || orderNo.isEmpty()){
+ list = list(new LambdaQueryWrapper<Order>()
+ .eq(Order::getHostId, hostId)
+ .orderByDesc(Order::getCreateTime)
+ );
+ }
+ if (Cools.isEmpty(list)){
+ return null;
+ }
+ ArrayList<String> orderNameListDtos = new ArrayList<>();
+ for (Order order :list){
+ DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, order.getDocType()));
+
+ if (order.getSettle() >= 4) {
+ continue;
+ }
+
+ if (docType.getPakout() == 1){
+ orderNameListDtos.add(order.getOrderNo());
+ }
+ }
+
+ return orderNameListDtos;
+
+ }
}
--
Gitblit v1.9.1