From 17080b28dc3fb0df12a5a4da76e10dd9203e5725 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 08 十月 2025 11:07:48 +0800
Subject: [PATCH] 订单功能完善
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 94 ++++++++++++++++++++++++++++++++--------------
1 files changed, 65 insertions(+), 29 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 4b978d1..e18d9aa 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -1,6 +1,7 @@
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.DateUtils;
import com.core.common.SnowflakeIdWorker;
@@ -8,10 +9,10 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+import com.zy.asrs.entity.result.OrderNameListDto;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.service.*;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
@Slf4j
@Service("orderService")
@@ -36,6 +38,31 @@
private DocTypeService docTypeService;
@Autowired
private WrkDetlService wrkDetlService;
+
+ @Override
+ public List<OrderNameListDto> selectAllCombOrderNo() {
+ List<Order> list = this.selectList(new EntityWrapper<Order>().orderBy("create_time",false));
+ if (Cools.isEmpty(list)){
+ return null;
+ }
+ ArrayList<OrderNameListDto> orderNameListDtos = new ArrayList<>();
+ for (Order order :list){
+ DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_id", 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 Order selectByNo(String orderNo) {
@@ -59,7 +86,7 @@
@Override
public void checkComplete(String orderNo) {
Order order = this.selectByNo(orderNo);
- if (order.getSettle() >= 4L) {
+ if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
return;
}
List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
@@ -70,31 +97,17 @@
break;
}
}
- if (complete) {
- // 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
- DocType docType = docTypeService.selectById(order.getDocType());
- if (null != docType && docType.getPakout() == 1) {
- if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
- throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
- }
- List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
- for (WrkDetl wrkDetl : wrkDetls) {
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(wrkDetl);
- orderDetl.setQty(orderDetl.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(orderNo);
- orderDetl.setStatus(1);
- orderDetl.setCreateTime(order.getCreateTime());
- orderDetl.setCreateBy(order.getCreateBy());
- orderDetl.setUpdateTime(order.getUpdateTime());
- orderDetl.setUpdateBy(order.getUpdateBy());
- if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
- }
- }
- }
+ //褰撹璁㈠崟鏄庣粏鏁伴噺==瀹屾垚鏁伴噺涓�>涓婃姤鏁伴噺锛屼笂鎶ョ姸鎬佷负 鍚� 鎴栬�� 鏄� 鏃堕兘鏀规垚绛夊緟涓婃姤锛屽畾鏃跺櫒杞绛夊緟涓婃姤杩涜涓婃姤
+ for (OrderDetl orderDetl : orderDetls) {
+ if (Objects.equals(orderDetl.getAnfme(), orderDetl.getQty())&&
+ orderDetl.getQty()>(orderDetl.getUnits() == null ? 0 : orderDetl.getUnits())
+ &&orderDetl.getInspect()<2) {
+ orderDetl.setInspect(2);//绛夊緟涓婃姤
+ orderDetlService.updateById(orderDetl);
+ }
+ }
+ if (complete) {
if (!this.updateSettle(order.getId(), 4L, null)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
@@ -140,9 +153,13 @@
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("", e);
+ log.error("saveHandlerOrder===>>", e);
return false;
}
return true;
@@ -162,8 +179,27 @@
}
@Override
- public void addToLogTable(Order order) {
- this.baseMapper.addToLogTable(order);
+ 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