From 8d90833250abee5951572659e9a192f2487cd704 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 03 十一月 2025 09:30:52 +0800
Subject: [PATCH] 标准wms2.0
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 84 ++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 2c9a489..1867759 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -8,13 +8,11 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
-import com.zy.asrs.enums.CommonEnum;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
-import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
import com.zy.common.model.DetlDto;
@@ -46,10 +44,7 @@
private MatService matService;
@Autowired
private WaitPakinService waitPakinService;
- @Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
+
@Autowired
private BasDevpService basDevpService;
@Autowired
@@ -364,7 +359,7 @@
continue;
}
if (orderPakout.getSettle() == 1) {
- OrderInAndOutUtil.updateOrder(false, orderPakout.getId(), 2L, 9527L);
+ orderPakoutService.updateSettle(orderPakout.getId(), 2L, 9527L);
}
OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderPakout.getId(), combMat.getMatnr(), combMat.getBatch(),
combMat.getBrand(), combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(), combMat.getBoxType1(), combMat.getBoxType2(), combMat.getBoxType3());
@@ -514,18 +509,18 @@
typeList.add(docType.getDocId());
}
- Wrapper<Order> wrapper = new EntityWrapper<>();
+ Wrapper<OrderPakin> wrapper = new EntityWrapper<>();
wrapper.eq("status", 1);
wrapper.in("doc_type", typeList);
- List<Order> orders = orderService.selectList(wrapper);
+ List<OrderPakin> orders = orderPakinService.selectList(wrapper);
ArrayList<Long> orderIds = new ArrayList<>();
- for (Order order : orders) {
+ for (OrderPakin order : orders) {
orderIds.add(order.getId());
}
//鎼滅储鏄庣粏
- Wrapper<OrderDetl> wrapper1 = new EntityWrapper<>();
+ Wrapper<OrderDetlPakin> wrapper1 = new EntityWrapper<>();
wrapper1.eq("status", 1);
wrapper1.in("order_id", orderIds);
wrapper1.orderBy("create_time", false);
@@ -535,10 +530,10 @@
if (!Cools.isEmpty(orderNo)) {
wrapper1.like("order_no", orderNo);
}
- List<OrderDetl> list = orderDetlService.selectList(wrapper1);
+ List<OrderDetlPakin> list = orderDetlPakinService.selectList(wrapper1);
ArrayList<PickMatParam> maps = new ArrayList<>();
- for (OrderDetl orderDetl : list) {
+ for (OrderDetlPakin orderDetl : list) {
//鍓╀綑鍙敤鏁伴噺
double count = orderDetl.getAnfme() - orderDetl.getWorkQty();
if (count <= 0) {
@@ -626,17 +621,14 @@
}
// 鍏宠仈缁勬墭
} else {
-// Order order = orderService.selectByNo(param.getOrderNo());
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, elem.getOrderNo());
+ OrderPakin order = orderPakinService.selectByNo(elem.getOrderNo());
if (Cools.isEmpty(order) || order.getSettle() > 2) {
throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
}
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
-// OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
-// elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3());
OrderDetlPakin detls = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
.eq("order_id", order.getId())
.eq("matnr", elem.getMatnr()));
@@ -648,7 +640,7 @@
if (elem.getAnfme() > detls.getEnableQty()) {
throw new CoolException(detls.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
- OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
+ orderDetlPakinService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
@@ -717,8 +709,8 @@
Set<String> stringSet = param.getCombMats().stream().map(CombParam.CombMat::getOrderNo).collect(Collectors.toSet());
stringSet.forEach(orderNo -> {
- Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, orderNo);
- OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
+ OrderPakin order = orderPakinService.selectByNo(orderNo);
+ orderPakinService.updateSettle(order.getId(), 2L, userId);
});
}
@@ -967,34 +959,28 @@
openParam.setOrderType("鎵撳寘鍏ュ簱鍗�");
openParam.setOrderDetails(detlDtos);
openService.pakinOrderCreate(openParam);
-// Order order = orderService.selectByNo(orderNo);
- Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, param.getOrderNo());
+ OrderPakin order = orderPakinService.selectByNo(param.getOrderNo());
if (null == order) {
throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
}
-// if (!orderService.updateSettle(order.getId(), 2L, userId)) {
-// throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
-// }
- OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
-
+ if (!orderPakinService.updateSettle(order.getId(), 2L, userId)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
// 鐢熸垚鍏ュ簱閫氱煡妗�
for (DetlDto detlDto : detlDtos) {
- // 淇敼浣滀笟鏁伴噺 ----------------------------------------
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
-// OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch());
- OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
, detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3());
- if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
- throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+ if (detlDto.getAnfme() > orderDetlPakin.getEnableQty()) {
+ throw new CoolException(orderDetlPakin.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
-// if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
-// throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
-// }
- OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
- , detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme());
+ if (!orderDetlPakinService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
+ , detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+ }
// 淇濆瓨鍏ュ簱閫氱煡妗�
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
@@ -1036,17 +1022,15 @@
BasDevp sta = basDevpService.checkSiteStatus(staNo);
//鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。
- Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, orderNo);
-// Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
+ OrderPakout order = orderPakoutService.selectOne(new EntityWrapper<OrderPakout>().eq("order_no", orderNo));
if (order.getSettle() != 1 && order.getSettle() != 2) {
throw new CoolException("璇ヨ鍗曞凡澶勭悊");
}
-// List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
+ List<OrderDetlPakout> orderDetls = orderDetlPakoutService.selectByOrderId(order.getId());
Date now = new Date();
- for (OrderDetl orderDetl : orderDetls) {
+ for (OrderDetlPakout orderDetl : orderDetls) {
//鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, null);
if (locDetls.size() == 0) {
@@ -1079,10 +1063,9 @@
order.setSettle(2L);
order.setUpdateBy(userId);
order.setUpdateTime(now);
-// if(!orderService.update(order, new EntityWrapper<Order>().eq("order_no", orderNo))){
-// throw new CoolException("鏇存柊璁㈠崟鐘舵�佸け璐�");
-// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 2L, userId);
+ if (!orderPakoutService.update(order, new EntityWrapper<OrderPakout>().eq("order_no", orderNo))) {
+ throw new CoolException("鏇存柊璁㈠崟鐘舵�佸け璐�");
+ }
orderDetl.setWorkQty(orderDetl.getWorkQty() + curOutQty);
orderDetl.setUpdateBy(userId);
orderDetl.setUpdateTime(now);
@@ -1091,10 +1074,9 @@
if (!Cools.isEmpty(orderDetl.getBatch())) {
wrapper.eq("batch", orderDetl.getBatch());
}
-// if(!orderDetlService.update(orderDetl, wrapper)){
-// throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
-// }
- OrderInAndOutUtil.updateOrderDetl(order.getPakinPakoutStatus$(), order, orderDetl);
+ if (!orderDetlPakoutService.update(orderDetl, wrapper)) {
+ throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
+ }
}
@@ -1103,7 +1085,7 @@
@Override
@Transactional
- public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
+ public void stockOut(OrderDetlPakout orderDetl, BasDevp staNo, LocDetl locDetl,
Double curOutQty, Integer ioType, Long userId, Date now) {
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locDetl.getLocNo());
--
Gitblit v1.9.1