From d52bab61f91056e75e60ddeda76a72cd1bd63615 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 07 八月 2025 14:40:00 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 93 +++++++++++++++++++++++++++++-----------------
1 files changed, 59 insertions(+), 34 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 c569d81..d02c846 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
@@ -10,6 +10,7 @@
import com.zy.asrs.wms.apis.wcs.entity.response.CommonReponse;
import com.zy.asrs.wms.apis.wcs.utils.HttpEssUtils;
import com.zy.asrs.wms.asrs.entity.*;
+import com.zy.asrs.wms.asrs.entity.dto.MatnrDetlDto;
import com.zy.asrs.wms.asrs.entity.dto.PickSheetDetlDto;
import com.zy.asrs.wms.asrs.entity.dto.ShippingOrderDetlDto;
import com.zy.asrs.wms.asrs.entity.enums.*;
@@ -125,7 +126,7 @@
//缁勬嫋閫氱煡妗�
waitPakins.forEach(pakin -> {
- waitPakinService.comb(pakin);
+ waitPakinService.comb(pakin, ordersParam.getInType());
});
@@ -372,27 +373,30 @@
}
}
});
+
+ //鍒ゆ柇鏄惁涓烘尝娆″崟鎹�
+ if (pickSheet.getType().equals(1)) {
+ //鍒犻櫎娉㈡鍙婂搴旀槑缁嗕俊鎭�
+ if (!waveService.remove(new LambdaQueryWrapper<Wave>().eq(Wave::getId, pickSheet.getWaveId()))) {
+ throw new CoolException("娉㈡鍒楄〃鍗曟嵁鍒犻櫎澶辫触锛侊紒");
+ }
- //鍒犻櫎娉㈡鍙婂搴旀槑缁嗕俊鎭�
- 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("娉㈡鏄庣粏鍒楄〃鍒犻櫎澶辫触锛侊紒");
+ }
- 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("鍘熷璁㈠崟鍒犻櫎澶辫触锛侊紒");
+ 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;
@@ -417,7 +421,8 @@
@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);
+ CacheSite siteNo = cacheSiteMapper.selectOne(new LambdaQueryWrapper<CacheSite>()
+ .eq(CacheSite::getSiteNo, param.get("siteNo")), false);
if (Objects.isNull(siteNo)) {
throw new CoolException("绔欑偣寮傚父锛侊紒");
}
@@ -425,7 +430,8 @@
if (!StringUtil.isNullOrEmpty(siteNo.getOrderNo())) {
throw new CoolException("褰撳墠鎾绔欑偣宸茬粦瀹氳鍗曪紒锛�");
}
- Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, param.get("orderNo").toString()));
+ Order order = orderService.getOne(new LambdaQueryWrapper<Order>()
+ .eq(Order::getOrderNo, param.get("orderNo").toString()));
if (Objects.isNull(order)) {
throw new CoolException("缁戝畾璁㈠崟涓嶅瓨鍦紒锛�");
}
@@ -437,12 +443,12 @@
throw new CoolException("璁㈠崟鎾浣嶇粦瀹氬け璐ワ紒锛�");
}
- if (!waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>()
- .eq(WaveSeed::getOrderNo, order.getOrderNo())
- .set(WaveSeed::getSiteId, siteNo.getId())
- .set(WaveSeed::getSiteNo, siteNo.getSiteNo()))) {
- throw new CoolException("鎾绔欑偣鏇存柊澶辫触锛侊紒");
- }
+// if (!waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>()
+// .eq(WaveSeed::getOrderNo, order.getOrderNo())
+// .set(WaveSeed::getSiteId, siteNo.getId())
+// .set(WaveSeed::getSiteNo, siteNo.getSiteNo()))) {
+// throw new CoolException("鎾绔欑偣鏇存柊澶辫触锛侊紒");
+// }
//缁戝畾鎴愬姛锛屾挱绉嶅浜伅
sowLightMange(siteNo.getSiteNo(), order, "LIGHT");
} else {
@@ -466,7 +472,7 @@
public void sowLightMange(String siteNo, Order order, String light) {
// 鍒拌揪鎷ｉ�変綅锛屾帶鍒舵挱绉嶅浜伅
CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>()
- .eq(CacheSite::getSiteNo, siteNo));
+ .eq(CacheSite::getSiteNo, siteNo));
if (Objects.isNull(cacheSite)) {
log.error("鏉＄爜锛歿}锛屾湭鎵惧埌鎾澧欎寒鐏�", siteNo);
throw new CoolException("鏈壘鍒版挱绉嶅");
@@ -475,7 +481,7 @@
if (Objects.isNull(detls)) {
throw new CoolException("鏁版嵁閿欒锛岃鍗曟槑缁嗕笉瀛樺湪锛侊紒");
}
- int anfme = (int)detls.stream().mapToDouble(OrderDetl::getAnfme).sum();
+ int anfme = (int) detls.stream().mapToDouble(OrderDetl::getAnfme).sum();
SlapLightControlParam slapLightControlParam = new SlapLightControlParam();
slapLightControlParam
.setControllerCode(cacheSite.getMemo())
@@ -489,7 +495,7 @@
log.info("鎾澧欎寒鐏笅鍙�", JSONObject.toJSONString(slapLightControlParam));
CommonReponse response = HttpEssUtils.post("鍒拌揪鎷ｉ�変綅锛屾挱绉嶅浜伅", HttpEssUtils.PLT_SEND_COMMAND, slapLightControlParam);
if (response.getCode().equals(0)) {
- log.info("鎾澧檣}浜伅鎴愬姛", cacheSite.getSiteNo());
+ log.info("鎾澧檣}浜伅鎴愬姛", cacheSite.getSiteNo());
} else {
log.info("鎾澧檣}浜伅澶辫触", cacheSite.getSiteNo());
}
@@ -680,7 +686,13 @@
List<LocDetl> detls = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
.eq(LocDetl::getLocNo, barcode));
for (int i = 0; i < detls.size(); i++) {
-// detls.get(i).setMats(matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, detls.get(i).getMatnr())));
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getId, detls.get(i).getMatId()));
+ MatnrDetlDto detlDto = new MatnrDetlDto();
+ detlDto.setTspec(mat.getSpecs())
+ .setType(mat.getModel())
+ .setMatnrName(mat.getMaktx())
+ .setMatnrNo(mat.getMatnr());
+ detls.get(i).setMats(detlDto);
}
return detls;
}
@@ -697,7 +709,7 @@
.eq(Loc::getLocStsId, LocStsType.F.val())
.eq(Loc::getLocNo, param.get("barcode")));
if (Objects.isNull(barcode)) {
- throw new CoolException("婧愬簱浣嶆槑缁嗕笉瀛樺湪锛侊紒");
+ throw new CoolException(param.get("barcode") + "搴撲綅鐘舵�佷笉鍙墽琛屾鎿嶄綔锛侊紒");
}
Loc tarCode = locService.getOne(new LambdaQueryWrapper<Loc>()
.eq(Loc::getLocStsId, LocStsType.O.val())
@@ -711,7 +723,7 @@
List<LocArea> locAreas = locAreaService.list(new LambdaQueryWrapper<LocArea>()
.in(LocArea::getLocId, ids)
.eq(LocArea::getTypeId, LocAreaTypeSts.LOC_AREA_TYPE_FLAT.id));
- if (!locAreas.isEmpty() && locAreas.size() == ids.size()) {
+ if (!locAreas.isEmpty() && locAreas.size() != ids.size()) {
throw new CoolException("闈炲钩搴撲笉鍙墽琛屾鎿嶄綔锛侊紒");
}
@@ -720,6 +732,19 @@
return R.error("搴撲綅鏄庣粏涓嶅瓨鍦紒锛�");
}
+ if (!locService.update(new LambdaUpdateWrapper<Loc>()
+ .eq(Loc::getLocNo, barcode.getLocNo())
+ .set(Loc::getBarcode, null)
+ .set(Loc::getLocStsId, LocStsType.O.val()))) {
+ throw new CoolException("婧愬簱浣嶇姸鎬佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ if (!locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getLocNo, tarCode.getLocNo())
+ .set(Loc::getBarcode, barcode.getBarcode())
+ .set(Loc::getLocStsId, LocStsType.F.val()))) {
+ throw new CoolException("鐩爣搴撲綅淇敼澶辫触锛侊紒");
+ }
+
if (!locDetlService.update(new LambdaUpdateWrapper<LocDetl>()
.eq(LocDetl::getLocId, barcode.getId())
.set(LocDetl::getLocId, tarCode.getId())
--
Gitblit v1.9.1