From 19fe6936cbe4deef1f18186350a71acff4dff58e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 14 一月 2025 17:06:18 +0800
Subject: [PATCH] # 24. PDA出库成功后，界面数据重置，避免重复操作 （已修复） 25. PDA接口请求，添加一个Loading遮档 （已修复） 27. 非平库单据，在平库可做入库操作 （已修复） 29. 平库入库后，订单明细没有添加（已修复） 30. 平库入库后，单据类型没有修改（已修复） 31. 没有绑定播种位，不能进行播种，前后端都需加判定（已修复） 33. 平库入库未修改入库已完成数量（已修复）
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
index f078b36..965c041 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.dto.PickSheetDetlDto;
@@ -12,6 +11,8 @@
import com.zy.asrs.wms.asrs.entity.param.GeneratePakInParam;
import com.zy.asrs.wms.asrs.entity.param.PakinOnShelvesParams;
import com.zy.asrs.wms.asrs.mapper.CacheSiteMapper;
+import com.zy.asrs.wms.asrs.mapper.OrderDetlLogMapper;
+import com.zy.asrs.wms.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.wms.asrs.mapper.SeedSitesMapper;
import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.system.entity.Host;
@@ -66,6 +67,11 @@
@Autowired
private SeedSitesMapper seedSitesMapper;
+ @Autowired
+ private OrderDetlMapper orderDetlMapper;
+
+ @Autowired
+ private OrderDetlLogService orderDetlLogService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -105,8 +111,6 @@
if (workService.generatePakIn(generatePakInParam)) {
return true;
}
- } else {
- //fixme 骞冲簱鏄惁闇�瑕侀绾﹀叆搴�
}
return false;
}
@@ -134,7 +138,7 @@
throw new CoolException("搴撲綅娌℃湁鍒嗛厤鎵�灞炰粨搴撳尯鍩燂紒锛�");
}
locAreas.forEach(locArea -> {
- LocAreaType typeServiceOne = locAreaTypeService.getOne(new LambdaQueryWrapper<LocAreaType>().eq(LocAreaType::getId, locArea.getTypeId()), false);
+ LocAreaType typeServiceOne = locAreaTypeService.getOne(new LambdaQueryWrapper<LocAreaType>().eq(LocAreaType::getId, locArea.getTypeId()));
if (typeServiceOne.getParentId() != LocAreaTypeSts.LOC_AREA_TYPE_FLAT.id && typeServiceOne.getId() != LocAreaTypeSts.LOC_AREA_TYPE_FLAT.id) {
throw new CoolException("璇烽�夋嫨骞冲簱鍖哄簱浣嶏紝鍐嶆搷浣滐紒锛�");
}
@@ -149,6 +153,10 @@
}
List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, shelvesParams.getBarcode()));
+ if (waitPakins.isEmpty()) {
+ throw new CoolException("褰撳墠鎷栫洏娌℃湁缁勬嫋妗�!!");
+ }
+
waitPakins.forEach(pakin -> {
LocDetl locDetl = new LocDetl();
locDetl.setAnfme(pakin.getAnfme());
@@ -177,6 +185,7 @@
waitPakins.forEach(waitPakin -> {
WaitPakinLog pakinLog = new WaitPakinLog();
BeanUtils.copyProperties(waitPakin, pakinLog);
+ pakinLog.setIoStatus(1);
if (!waitPakinLogService.saveOrUpdate(pakinLog)) {
throw new CoolException("缁勬嫋鍘嗗彶妗ｆ洿鏂板け璐�");
}
@@ -185,11 +194,17 @@
if (!waitPakinService.removeBatchByIds(waitPakins)) {
throw new CoolException("缁勬嫋妗ｅ垹闄ゅけ璐ワ紒锛�");
}
-
//閫氳繃缁勬嫋璁㈠崟ID鑾峰彇璁㈠崟锛屽苟鍒犻櫎鍘熷崟鎹紝鍔犲叆鍗曟嵁鍘嗗彶妗�
- List<Long> list = waitPakins.stream().map(WaitPakin::getOrderId).collect(Collectors.toList());
+ Set<Long> list = waitPakins.stream().map(WaitPakin::getOrderId).collect(Collectors.toSet());
List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getId, list));
+ //璁㈠崟鍏ュ巻鍙叉。
orders.forEach(order -> {
+ if (order.getOrderType() != OrderType.PK_IN_ORDER.id) {
+ throw new CoolException("褰撳墠璁㈠崟绫诲瀷:" + order.getOrderType() + ",涓嶅彲鍋氬钩搴撲笂鏋舵搷浣滐紒锛�");
+ }
+ //淇敼璁㈠崟鐘舵�佷负宸插畬鎴�
+ order.setOrderSettle(OrderSettleType.COMPLETE.val());
+
OrderLog orderLog = new OrderLog();
BeanUtils.copyProperties(order, orderLog);
if (!orderLogService.save(orderLog)) {
@@ -197,8 +212,27 @@
}
});
+ //鍒犻櫎璁㈠崟鏁版嵁
if (!orderService.removeBatchByIds(orders)) {
throw new CoolException("璁㈠崟鍒犻櫎澶辫触锛侊紒");
+ }
+
+ List<OrderDetl> detls = orderDetlMapper.selectList(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, list));
+ List<OrderDetlLog> detlLogs = new ArrayList<>();
+ detls.forEach(delt ->{
+ OrderDetlLog detlLog = new OrderDetlLog();
+ BeanUtils.copyProperties(delt, detlLog);
+ detlLogs.add(detlLog);
+ });
+
+ //璁㈠崟鏄庣粏杞巻鍙叉。
+ if (!orderDetlLogService.saveBatch(detlLogs)) {
+ throw new CoolException("璁㈠崟鏄庣粏杞巻鍙插け璐ワ紒锛�");
+ }
+
+ //鍒犻櫎璁㈠崟鏄庣粏鏁版嵁
+ if (!orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, list))) {
+ throw new CoolException("璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
return true;
@@ -303,7 +337,7 @@
if (!remove) {
throw new CoolException("鍘熷璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
- if (orderService.remove(new LambdaQueryWrapper<Order>().in(Order::getId, list))) {
+ if (!orderService.remove(new LambdaQueryWrapper<Order>().in(Order::getId, list))) {
throw new CoolException("鍘熷璁㈠崟鍒犻櫎澶辫触锛侊紒");
}
--
Gitblit v1.9.1