From 58dc66a9d999c7d350e1ee4bf32b8d85b6e20e00 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期六, 21 九月 2024 10:32:42 +0800 Subject: [PATCH] 逻辑调整 --- src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 130 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 127 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java index d4192a1..84cbac4 100644 --- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java @@ -1,23 +1,37 @@ package com.zy.asrs.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.core.common.Cools; +import com.core.common.SnowflakeIdWorker; +import com.core.exception.CoolException; +import com.zy.asrs.entity.Order; import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.mapper.OrderDetlMapper; import com.zy.asrs.mapper.OrderMapper; -import com.zy.asrs.entity.Order; -import com.zy.asrs.service.OrderService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.zy.asrs.service.*; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +@Slf4j @Service("orderService") public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService { @Autowired private OrderDetlMapper orderDetlMapper; + @Autowired + private OpenService openService; + @Autowired + private SnowflakeIdWorker snowflakeIdWorker; + @Autowired + private OrderDetlService orderDetlService; + @Autowired + private DocTypeService docTypeService; + @Autowired + private WrkDetlService wrkDetlService; @Override public Order selectByNo(String orderNo) { @@ -38,4 +52,114 @@ return this.baseMapper.updateSettle(orderId, settle, userId) > 0; } + @Override + public void checkComplete(String orderNo) { + Order order = this.selectByNo(orderNo); + if (Cools.isEmpty(order) || order.getSettle() >= 4L) { + return; + } + List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId())); + boolean complete = true; + for (OrderDetl orderDetl : orderDetls) { + if (orderDetl.getAnfme() > orderDetl.getQty()) { + complete = false; + break; + } + } + if (complete) { + if (!this.updateSettle(order.getId(), 4L, null)) { + throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�"); + } + } + + } + +// @Override +// public boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls) { +// 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); +// openService.pakinOrderCreate(openParam); +// } else { +// // 鐢熸垚鍑哄簱鍗曟嵁 +// OpenOrderPakoutParam openParam = new OpenOrderPakoutParam(); +// openParam.setOrderNo(orderNo); +// openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime())); +// openParam.setOrderType("鎵嬪姩鍑哄簱鍗�"); +// openParam.setOrderDetails(detlDtos); +// openService.pakoutOrderCreate(openParam); +// } +// +// Order order = this.selectByNo(orderNo); +// if (null == order) { +// throw new CoolException("鐢熸垚鍗曟嵁澶辫触"); +// } +// if (!this.updateSettle(order.getId(), 4L, null)) { +// throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�"); +// } +// for (DetlDto detlDto : detlDtos) { +// // 淇敼璁㈠崟鏄庣粏鏁伴噺 +// if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) { +// throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触"); +// } +// // 淇敼璁㈠崟浣滀笟鏁伴噺 +// if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) { +// throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触"); +// } +// } +// } catch (Exception e) { +// log.error("saveHandlerOrder===>>", e); +// return false; +// } +// return true; +// } + + @Override + public void remove(Long orderId) { + if (!this.deleteById(orderId)) { + throw new CoolException("鍒犻櫎鍗曟嵁澶辫触"); + } + orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId)); + } + + @Override + public List<Order> selectComplete() { + return this.baseMapper.selectComplete(); + } + + @Override + public List<Order> selectComplete8() { + return this.baseMapper.selectComplete8(); + } + + @Override + public boolean addToLogTable(Order order) { + return this.baseMapper.addToLogTable(order) > 0; + } + + @Override + public List<Order> selectorderNoL(String orderNo) { + return this.baseMapper.selectorderNoL(orderNo); + } + + @Override + public Order selectOrderMoveStatus() { + return this.baseMapper.selectOrderMoveStatus(); + } + + @Override + public Order selectOrderMoveStatusInitial() { + return this.baseMapper.selectOrderMoveStatusInitial(); + } + } -- Gitblit v1.9.1