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 | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 110 insertions(+), 6 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 0c66545..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,11 +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;
@@ -39,6 +40,8 @@
@Autowired
private OrderService orderService;
@Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
private OrderLogService orderLogService;
@Autowired
private LocService locService;
@@ -52,6 +55,19 @@
private PickSheetService pickSheetService;
@Autowired
private PickSheetDetlService pickSheetDetlService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private WaveService waveService;
+ @Autowired
+ private WaveDetlService waveDetlService;
+ @Autowired
+ private CacheSiteMapper cacheSiteMapper;
+
+ @Autowired
+ private SeedSitesMapper seedSitesMapper;
+ @Autowired
+ private OrderDetlMapper orderDetlMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -120,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("璇烽�夋嫨骞冲簱鍖哄簱浣嶏紝鍐嶆搷浣滐紒锛�");
}
@@ -135,17 +151,25 @@
}
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());
locDetl.setBatch(pakin.getBatch());
locDetl.setMatId(pakin.getMatnrId$());
- ;
locDetl.setCreateTime(new Date());
locDetl.setOrderNo(pakin.getOrderNo());
locDetl.setLocNo(loc.getLocNo());
locDetl.setLocId(loc.getId());
locDetl.setMatnr(pakin.getMatnr());
+ Mat one = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, pakin.getMatnr()));
+ if (Objects.isNull(one)) {
+ throw new CoolException("褰撳墠鐗╂枡涓嶅瓨鍦紒锛�");
+ }
+ locDetl.setMatId(one.getId());
locDetl.setMemo(pakin.getMemo());
locDetl.setUpdateTime(new Date());
if (!locDetlService.saveOrUpdate(locDetl)) {
@@ -168,9 +192,13 @@
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)) {
@@ -178,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;
}
@@ -210,6 +243,9 @@
@Transactional(rollbackFor = Exception.class)
public boolean confirmFlatSheet(String code) {
PickSheet pickSheet = pickSheetService.getOne(new LambdaQueryWrapper<PickSheet>().eq(PickSheet::getPickNo, code));
+ if (Objects.isNull(pickSheet)) {
+ throw new CoolException("鎷ｈ揣鍗曚笉瀛樺湪锛侊紒");
+ }
if (pickSheet.getStatus() == 1) {
//鐘舵�佷慨鏀逛负锛� 宸茶浆鍘嗗彶妗�
pickSheet.setStatus(3);
@@ -262,6 +298,74 @@
}
}
});
+
+ //鍒犻櫎娉㈡鍙婂搴旀槑缁嗕俊鎭�
+ if (!waveService.remove(new LambdaQueryWrapper<Wave>().eq(Wave::getId, pickSheet.getWaveId()))) {
+ throw new CoolException("娉㈡鍒楄〃鍗曟嵁鍒犻櫎澶辫触锛侊紒");
+ }
+
+ if (!waveDetlService.remove(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, pickSheet.getWaveId()))) {
+ throw new CoolException("娉㈡鏄庣粏鍒楄〃鍒犻櫎澶辫触锛侊紒");
+ }
+
+ 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) {
+ throw new CoolException("鍘熷璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ }
+ if (orderService.remove(new LambdaQueryWrapper<Order>().in(Order::getId, list))) {
+ throw new CoolException("鍘熷璁㈠崟鍒犻櫎澶辫触锛侊紒");
+ }
+
+ 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) {
+ 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