From 464ad021114d1194bc55b4b4554fd563f6236e96 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 13 一月 2025 21:27:56 +0800
Subject: [PATCH] # 非平库单据，在平库可做入库操作
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 69 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 10 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 77f09a9..d84ddd1 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
@@ -1,9 +1,7 @@
package com.zy.asrs.wms.asrs.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.dto.PickSheetDetlDto;
@@ -11,12 +9,14 @@
import com.zy.asrs.wms.asrs.entity.enums.OrderType;
import com.zy.asrs.wms.asrs.entity.param.BatchMergeOrdersParam;
import com.zy.asrs.wms.asrs.entity.param.GeneratePakInParam;
-import com.zy.asrs.wms.asrs.entity.param.PageRequest;
import com.zy.asrs.wms.asrs.entity.param.PakinOnShelvesParams;
import com.zy.asrs.wms.asrs.mapper.CacheSiteMapper;
+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;
import com.zy.asrs.wms.system.service.HostService;
+import io.netty.util.internal.StringUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -63,6 +63,11 @@
private WaveDetlService waveDetlService;
@Autowired
private CacheSiteMapper cacheSiteMapper;
+
+ @Autowired
+ private SeedSitesMapper seedSitesMapper;
+ @Autowired
+ private OrderDetlMapper orderDetlMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -131,7 +136,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("璇烽�夋嫨骞冲簱鍖哄簱浣嶏紝鍐嶆搷浣滐紒锛�");
}
@@ -146,6 +151,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());
@@ -157,7 +166,7 @@
locDetl.setLocId(loc.getId());
locDetl.setMatnr(pakin.getMatnr());
Mat one = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, pakin.getMatnr()));
- if (!Objects.isNull(one)) {
+ if (Objects.isNull(one)) {
throw new CoolException("褰撳墠鐗╂枡涓嶅瓨鍦紒锛�");
}
locDetl.setMatId(one.getId());
@@ -182,11 +191,14 @@
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() + ",涓嶅彲鍋氬钩搴撲笂鏋舵搷浣滐紒锛�");
+ }
OrderLog orderLog = new OrderLog();
BeanUtils.copyProperties(order, orderLog);
if (!orderLogService.save(orderLog)) {
@@ -194,9 +206,14 @@
}
});
+ //鍒犻櫎璁㈠崟鏁版嵁
if (!orderService.removeBatchByIds(orders)) {
throw new CoolException("璁㈠崟鍒犻櫎澶辫触锛侊紒");
}
+// //鍒犻櫎璁㈠崟鏄庣粏鏁版嵁
+// if (orderDetlMapper.delete(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, list)) < 1) {
+// throw new CoolException("璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+// }
return true;
}
@@ -292,6 +309,9 @@
}
List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getWaveId, pickSheet.getWaveId()));
+ if (orders.isEmpty()) {
+ throw new CoolException("娉㈡璁㈠崟涓嶅瓨鍦紒锛�");
+ }
List<Long> list = orders.stream().map(Order::getId).collect(Collectors.toList());
boolean remove = orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, list));
if (!remove) {
@@ -304,20 +324,49 @@
return true;
}
+ /**
+ * 鑾峰彇鎾澧欑珯鐐�
+ * @return
+ */
@Override
public List<CacheSite> getSeedLocs() {
return cacheSiteMapper.selectList(new LambdaQueryWrapper<>());
}
/**
- * 璁㈠崟缁戝畾鎾澧�
+ * 璁㈠崟缁戝畾鎾澧欑珯鐐�+
* @param param
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean bindOrderBySite(Map<String, Object> param) {
-// return cacheSiteMapper.bindOrderBySite(param);
- return false;
+ CacheSite siteNo = cacheSiteMapper.selectOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteNo, param.get("siteNo")), false);
+ if (Objects.isNull(siteNo)) {
+ throw new CoolException("绔欑偣寮傚父锛侊紒");
+ }
+ if (param.get("type").equals("bind")) {
+ if (!StringUtil.isNullOrEmpty(siteNo.getOrderNo())) {
+ throw new CoolException("褰撳墠鎾绔欑偣宸茬粦瀹氳鍗曪紒锛�");
+ }
+ Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, param.get("orderNo").toString()));
+ if (Objects.isNull(order)) {
+ throw new CoolException("缁戝畾璁㈠崟涓嶅瓨鍦紒锛�");
+ }
+ siteNo.setOrderNo(order.getOrderNo()).setOrderId(order.getId()).setSiteStatus(CacheSiteStatusType.R.id);
+ if (cacheSiteMapper.updateById(siteNo) < 1) {
+ throw new CoolException("璁㈠崟鎾浣嶇粦瀹氬け璐ワ紒锛�" );
+ }
+ } else {
+ if (StringUtil.isNullOrEmpty(siteNo.getOrderNo())) {
+ throw new CoolException("褰撳墠鎾绔欑偣鏈粦瀹氳鍗曪紒锛�");
+ }
+ siteNo.setOrderId(null).setOrderNo(null).setSiteNo("0");
+ if (cacheSiteMapper.updateById(siteNo) < 1) {
+ throw new CoolException("璁㈠崟涓庢挱绉嶄綅瑙ｇ粦澶辫触锛侊紒" );
+ }
+ }
+ return true;
}
}
--
Gitblit v1.9.1