From 645da5e4e48dd94b760ea4dcbf80e22bf2a3f33c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 11 一月 2025 17:20:08 +0800
Subject: [PATCH] #添加播种站点功能
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 insertions(+), 1 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..77f09a9 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
@@ -13,6 +13,7 @@
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.service.*;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.service.HostService;
@@ -39,6 +40,8 @@
@Autowired
private OrderService orderService;
@Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
private OrderLogService orderLogService;
@Autowired
private LocService locService;
@@ -52,6 +55,14 @@
private PickSheetService pickSheetService;
@Autowired
private PickSheetDetlService pickSheetDetlService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private WaveService waveService;
+ @Autowired
+ private WaveDetlService waveDetlService;
+ @Autowired
+ private CacheSiteMapper cacheSiteMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -140,12 +151,16 @@
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)) {
@@ -167,6 +182,7 @@
if (!waitPakinService.removeBatchByIds(waitPakins)) {
throw new CoolException("缁勬嫋妗ｅ垹闄ゅけ璐ワ紒锛�");
}
+
//閫氳繃缁勬嫋璁㈠崟ID鑾峰彇璁㈠崟锛屽苟鍒犻櫎鍘熷崟鎹紝鍔犲叆鍗曟嵁鍘嗗彶妗�
List<Long> list = waitPakins.stream().map(WaitPakin::getOrderId).collect(Collectors.toList());
List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getId, list));
@@ -210,6 +226,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,7 +281,43 @@
}
}
});
+
+ //鍒犻櫎娉㈡鍙婂搴旀槑缁嗕俊鎭�
+ 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()));
+ 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;
}
+ @Override
+ public List<CacheSite> getSeedLocs() {
+ return cacheSiteMapper.selectList(new LambdaQueryWrapper<>());
+ }
+
+ /**
+ * 璁㈠崟缁戝畾鎾澧�
+ * @param param
+ * @return
+ */
+ @Override
+ public boolean bindOrderBySite(Map<String, Object> param) {
+// return cacheSiteMapper.bindOrderBySite(param);
+ return false;
+ }
+
}
--
Gitblit v1.9.1