From e046dba174365eb8934ee1e4206f09821145e876 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 21 八月 2025 13:23:22 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 389 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 301 insertions(+), 88 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 555f5e6..5b25040 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,11 +1,17 @@
package com.zy.asrs.wms.asrs.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.apis.wcs.entity.request.SlapLightControlParam;
+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.*;
@@ -18,6 +24,7 @@
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.service.HostService;
import io.netty.util.internal.StringUtil;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,6 +35,7 @@
import java.util.stream.Collectors;
@Service
+@Slf4j
public class MobileServiceImpl implements MobileService {
@Autowired
@@ -76,22 +84,27 @@
@Autowired
private OrderDetlMapper orderDetlMapper;
@Autowired
- private WaveSeedMapper waveSeedMapper;
+ private WaveSeedService waveSeedMapper;
@Autowired
private WaveSeedLogService waveSeedLogService;
@Autowired
private OrderDetlLogService orderDetlLogService;
-
@Autowired
private PlatformDetlService platformDetlService;
@Autowired
private PlatformDetlLogService platformDetlLogService;
-
@Override
@Transactional(rollbackFor = Exception.class)
public boolean batchMergeOrders(BatchMergeOrdersParam ordersParam) {
+ Loc locServiceOne = locService.getOne(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getLocStsId, 1)
+ .eq(Loc::getBarcode, ordersParam.getMergeNo()), false);
+ if (!Objects.isNull(locServiceOne)) {
+ throw new CoolException("鎵樼洏宸插叆搴擄紝涓嶈兘鍐嶇粍鎵橈紒锛�");
+ }
+
Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, ordersParam.getOrderNo()));
if (Objects.isNull(order)) {
throw new CoolException("璁㈠崟涓嶅瓨鍦紒锛�");
@@ -114,11 +127,12 @@
//缁勬嫋閫氱煡妗�
waitPakins.forEach(pakin -> {
- waitPakinService.comb(pakin);
+ waitPakinService.comb(pakin, ordersParam.getInType());
});
+
// UTC鍏ュ簱鍗曟嵁(闈炲钩搴撳叆搴撳崟鎹�)
- if (order.getOrderType() != OrderType.PK_IN_ORDER.id) {
+ if (!ordersParam.getInType().equals(OrderType.PK_IN_ORDER.id)) {
/*** 椤圭洰涓嬪彂娴佺▼ * 1. PDA缁勬嫋閫氱煡妗�* 2. 鐢熸垚浠诲姟妗�* 3. 閫氳繃瀹氭椂浠诲姟涓嬪彂鑷矱SS** */
//鐢熸垚浠诲姟妗�
GeneratePakInParam generatePakInParam = new GeneratePakInParam();
@@ -169,7 +183,6 @@
if (!locService.updateById(loc)) {
throw new CoolException("搴撲綅鏇存柊澶辫触锛侊紒");
}
-
List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, shelvesParams.getBarcode()));
if (waitPakins.isEmpty()) {
throw new CoolException("褰撳墠鎷栫洏娌℃湁缁勬嫋妗�!!");
@@ -197,6 +210,16 @@
}
//淇敼鐘舵�佷负鍏ュ簱涓�
pakin.setIoStatus(1);
+
+ OrderDetl detl = orderDetlService.getById(pakin.getDetlId());
+ if (Objects.isNull(detl)) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹槑缁嗕笉瀛樺湪锛侊紒");
+ }
+ Double qty = Math.round((detl.getQty() + pakin.getAnfme()) * 1000) / 1000.0;
+ detl.setQty(qty);
+ if (!orderDetlService.updateById(detl)) {
+ throw new CoolException("鍗曟嵁鏄庣粏淇敼澶辫触锛侊紒");
+ }
});
//鍒犻櫎缁勬嫋妗ｏ紝鍔犲叆鍘嗗彶缁勬嫋妗�
@@ -204,56 +227,69 @@
WaitPakinLog pakinLog = new WaitPakinLog();
BeanUtils.copyProperties(waitPakin, pakinLog);
pakinLog.setIoStatus(1);
+ pakinLog.setId(null);
if (!waitPakinLogService.saveOrUpdate(pakinLog)) {
throw new CoolException("缁勬嫋鍘嗗彶妗ｆ洿鏂板け璐�");
}
});
- if (!waitPakinService.removeBatchByIds(waitPakins)) {
- throw new CoolException("缁勬嫋妗ｅ垹闄ゅけ璐ワ紒锛�");
- }
//閫氳繃缁勬嫋璁㈠崟ID鑾峰彇璁㈠崟锛屽苟鍒犻櫎鍘熷崟鎹紝鍔犲叆鍗曟嵁鍘嗗彶妗�
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)) {
- throw new CoolException("鍘嗗彶鍗曟嵁鏇存柊澶辫触锛侊紒");
+ List<OrderDetl> detls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()));
+ Double sum = detls.stream().mapToDouble(OrderDetl::getQty).sum();
+// Double summed = detls.stream().mapToDouble(OrderDetl::getWorkQty).sum();
+// Double v = Math.round((sum ) * 1000) / 1000.0;
+ Double anfme = detls.stream().mapToDouble(OrderDetl::getAnfme).sum();
+ if (sum.compareTo(anfme) == 0.0) {
+ order.setOrderSettle(OrderSettleType.COMPLETE.val());
+ if (!orderService.updateById(order)) {
+ throw new CoolException("鍗曟嵁鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
}
});
- //鍒犻櫎璁㈠崟鏁版嵁
- if (!orderService.removeBatchByIds(orders)) {
- throw new CoolException("璁㈠崟鍒犻櫎澶辫触锛侊紒");
+// //璁㈠崟鍏ュ巻鍙叉。
+// 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);
+// orderLog.setId(null);
+// if (!orderLogService.save(orderLog)) {
+// throw new CoolException("鍘嗗彶鍗曟嵁鏇存柊澶辫触锛侊紒");
+// }
+// });
+// //鍒犻櫎璁㈠崟鏁版嵁
+// 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);
+// detlLog.setQty(delt.getWorkQty());
+// detlLog.setWorkQty(0.0);
+// detlLog.setId(null);
+// detlLogs.add(detlLog);
+// });
+// //璁㈠崟鏄庣粏杞巻鍙叉。
+// if (!orderDetlLogService.saveBatch(detlLogs)) {
+// throw new CoolException("璁㈠崟鏄庣粏杞巻鍙插け璐ワ紒锛�");
+// }
+//
+// //鍒犻櫎璁㈠崟鏄庣粏鏁版嵁
+// if (!orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, list))) {
+// throw new CoolException("璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+// }
+ if (!waitPakinService.removeBatchByIds(waitPakins)) {
+ 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);
- detlLog.setQty(delt.getWorkQty());
- detlLog.setWorkQty(0.0);
- 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;
}
@@ -291,7 +327,7 @@
pickSheet.setStatus(3);
if (!pickSheetService.updateById(pickSheet)) {
throw new CoolException("杞巻鍙叉。澶辫触锛侊紒");
- } else{
+ } else {
if (!pickSheetDetlService.update(new LambdaUpdateWrapper<PickSheetDetl>().eq(PickSheetDetl::getPickId, pickSheet.getId()).set(PickSheetDetl::getStatus, 3))) {
throw new CoolException("鎷ｈ揣鍗曟槑缁嗚浆鍘嗗彶妗ｅけ璐ワ紒锛�");
}
@@ -338,27 +374,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;
@@ -366,6 +405,7 @@
/**
* 鑾峰彇鎾澧欑珯鐐�
+ *
* @return
*/
@Override
@@ -375,13 +415,15 @@
/**
* 璁㈠崟缁戝畾鎾澧欑珯鐐�+
+ *
* @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);
+ CacheSite siteNo = cacheSiteMapper.selectOne(new LambdaQueryWrapper<CacheSite>()
+ .eq(CacheSite::getSiteNo, param.get("siteNo")), false);
if (Objects.isNull(siteNo)) {
throw new CoolException("绔欑偣寮傚父锛侊紒");
}
@@ -389,33 +431,77 @@
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("缁戝畾璁㈠崟涓嶅瓨鍦紒锛�");
}
- siteNo.setOrderNo(order.getOrderNo()).setOrderId(order.getId()).setSiteStatus(CacheSiteStatusType.R.id).setBarcode(param.get("barcode").toString());
- if (cacheSiteMapper.updateById(siteNo) < 1) {
- throw new CoolException("璁㈠崟鎾浣嶇粦瀹氬け璐ワ紒锛�" );
+ siteNo.setOrderNo(order.getOrderNo())
+ .setOrderId(order.getId())
+ .setSiteStatus(CacheSiteStatusType.R.id)
+ .setBarcode(param.get("barcode").toString());
+ if (!cacheSiteService.saveOrUpdate(siteNo)) {
+ throw new CoolException("璁㈠崟鎾浣嶇粦瀹氬け璐ワ紒锛�");
}
- int update = waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>()
- .eq(WaveSeed::getOrderNo, order.getOrderNo())
- .set(WaveSeed::getSiteId, siteNo.getId())
- .set(WaveSeed::getSiteNo, siteNo.getSiteNo()));
- if (update < 1) {
- 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 {
if (StringUtil.isNullOrEmpty(siteNo.getOrderNo())) {
throw new CoolException("褰撳墠鎾绔欑偣鏈粦瀹氳鍗曪紒锛�");
}
- siteNo.setOrderId(null).setOrderNo(null).setSiteNo("0");
+ siteNo.setOrderId(null).setOrderNo(null).setBarcode(null).setSiteNo("0");
if (cacheSiteMapper.updateById(siteNo) < 1) {
- throw new CoolException("璁㈠崟涓庢挱绉嶄綅瑙ｇ粦澶辫触锛侊紒" );
+ throw new CoolException("璁㈠崟涓庢挱绉嶄綅瑙ｇ粦澶辫触锛侊紒");
}
}
return true;
}
+
+ /**
+ * @author Ryan
+ * @date 2025/7/11
+ * @description: 缁戝畾鎾澧欎寒鐏�
+ * @version 1.0
+ */
+ public void sowLightMange(String siteNo, Order order, String light) {
+ // 鍒拌揪鎷ｉ�変綅锛屾帶鍒舵挱绉嶅浜伅
+ CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>()
+ .eq(CacheSite::getSiteNo, siteNo));
+ if (Objects.isNull(cacheSite)) {
+ log.error("鏉＄爜锛歿}锛屾湭鎵惧埌鎾澧欎寒鐏�", siteNo);
+ throw new CoolException("鏈壘鍒版挱绉嶅");
+ }
+ List<OrderDetl> detls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()));
+ if (Objects.isNull(detls)) {
+ throw new CoolException("鏁版嵁閿欒锛岃鍗曟槑缁嗕笉瀛樺湪锛侊紒");
+ }
+ int anfme = (int) detls.stream().mapToDouble(OrderDetl::getAnfme).sum();
+ SlapLightControlParam slapLightControlParam = new SlapLightControlParam();
+ slapLightControlParam
+ .setControllerCode(cacheSite.getMemo())
+ .setTagCode(cacheSite.getSiteNo())
+ .setColor("GREEN")
+ .setIndex(cacheSite.getIndex())
+// .setMode("LIGHT")
+ .setMode(light)
+ .setDisplay(anfme + "");
+ // 鍙戣捣浜伅璇锋眰
+ log.info("鎾澧欎寒鐏笅鍙�", JSONObject.toJSONString(slapLightControlParam));
+ CommonReponse response = HttpEssUtils.post("鍒拌揪鎷ｉ�変綅锛屾挱绉嶅浜伅", HttpEssUtils.PLT_SEND_COMMAND, slapLightControlParam);
+ if (response.getCode().equals(0)) {
+ log.info("鎾澧檣}浜伅鎴愬姛", cacheSite.getSiteNo());
+ } else {
+ log.info("鎾澧檣}浜伅澶辫触", cacheSite.getSiteNo());
+ }
+ }
+
@Override
public R selectShippingDetl(Map<String, Object> params) {
@@ -442,6 +528,7 @@
* 1. 鍑哄簱淇敼璁㈠崟瀹屾垚鐘舵�侊紝鍒ゆ柇璁㈠崟鏄惁瀹屾垚锛屽畬鎴愬姞鍏ュ巻鍙叉。锛屾湭瀹屾垚淇敼璁㈠崟宸插畬鎴愭暟閲�
* 2. 鍒犻櫎璁㈠崟宸插畬鎴愭挱绉嶆槑缁嗕俊鎭�
* 3. 娓呴櫎闆嗚揣鍖虹粦瀹氭暟鎹�
+ *
* @param params
* @return
*/
@@ -484,31 +571,35 @@
throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦紒锛�");
}
} else { //閮ㄥ垎鎷ｈ揣
- byId.setQty(order.getWorkQty() + byId.getQty());
+ byId.setQty(Math.round((order.getWorkQty() + byId.getQty()) * 1000) / 1000.0);
byId.setWorkQty(0.0);
if (!orderDetlService.updateById(byId)) {
throw new CoolException("閮ㄥ垎鎷ｆ枡鏄庣粏鏇存柊澶辫触锛侊紒");
}
}
- List<WaveSeed> waveSeeds = waveSeedMapper.selectList(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getOrderDetlId, order.getId()));
+ List<WaveSeed> waveSeeds = waveSeedMapper.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getOrderDetlId, order.getId()));
//fixme 璁㈠崟鏄庣粏鏈挱绉嶏紝榛樿鍙彂璐�
if (!waveSeeds.isEmpty()) {
ArrayList<WaveSeedLog> waveSeedLogs = new ArrayList<>();
waveSeeds.forEach(seed -> {
- WaveSeedLog waveSeedLog = new WaveSeedLog();
- BeanUtils.copyProperties(seed, waveSeedLog);
- waveSeedLog.setId(null);
+ WaveSeedLog waveSeedLog = new WaveSeedLog();
+ BeanUtils.copyProperties(seed, waveSeedLog);
+ waveSeedLog.setId(null);
waveSeedLogs.add(waveSeedLog);
- });
+ });
if (!waveSeedLogService.saveBatch(waveSeedLogs)) {
throw new CoolException("娉㈡槑鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
}
+
+ List<Long> list = waveSeeds.stream().map(WaveSeed::getId).collect(Collectors.toList());
+ //鍒犻櫎鎾鏄庣粏淇℃伅
+ if (!waveSeedMapper.removeByIds(list)) {
+ throw new CoolException("鎾鏄庣粏鍒犻櫎鎼虹▼锛侊紒");
+ }
+
}
- //鍒犻櫎鎾鏄庣粏淇℃伅
- if (waveSeedMapper.deleteByIds(waveSeeds) < 1) {
- throw new CoolException("鎾鏄庣粏鍒犻櫎鎼虹▼锛侊紒");
- }
+
});
orderList.forEach(one -> {
@@ -529,7 +620,7 @@
}
} else { //涓嶄负绌猴紝淇敼璁㈠崟鐘舵�侊紝鍙噸鏂扮粍鎷�
one.setOrderSettle(OrderSettleType.INIT.val());
- if (orderService.updateById(one));
+ if (orderService.updateById(one)) ;
}
});
@@ -553,4 +644,126 @@
return R.ok("鍙戣揣瀹屾垚锛侊紒");
}
+ /**
+ * @author Ryan
+ * @date 2025/6/28
+ * @description: 鑾峰彇骞冲簱鎺ㄨ崘搴撲綅
+ * @version 1.0
+ */
+ @Override
+ public R getRecommendLocs() {
+ return locService.getRecommengLocs();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/6/28
+ * @description: 鏌ヨ鐗╂枡淇℃伅
+ * @version 1.0
+ */
+ @Override
+ public R getMatsByCode(String matnr) {
+ QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();
+ wrapper.eq("matnr", matnr).select("matnr, SUM(anfme) anfme");
+ LocDetl detl = locDetlService.getOne(wrapper);
+
+ Mat one = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, detl.getMatnr()), false);
+ if (Objects.isNull(one)) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦紒锛�");
+ }
+ one.setAnfme(detl.getAnfme());
+ return R.ok().add(Arrays.asList(one));
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/7/10
+ * @description: 鑾峰彇搴撲綅鏄庣粏
+ * @version 1.0
+ */
+ @Override
+ public List<LocDetl> getDetlsByCode(String barcode) {
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, barcode));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
+ }
+ LocArea locArea = locAreaService.getOne(new LambdaQueryWrapper<LocArea>()
+ .eq(LocArea::getLocId, loc.getId())
+ .eq(LocArea::getTypeId, LocAreaTypeSts.LOC_AREA_TYPE_FLAT.id));
+ if (Objects.isNull(locArea)) {
+ throw new CoolException("闈炲钩搴撳簱浣嶄笉鍙墽琛屾鎿嶄綔锛侊紒");
+ }
+ List<LocDetl> detls = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
+ .eq(LocDetl::getLocNo, barcode));
+ for (int i = 0; i < detls.size(); i++) {
+ 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;
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/7/11
+ * @description: 骞冲簱搴撲綅杞Щ
+ * @version 1.0
+ */
+ @Override
+ public R transferLocs(Map<String, String> param) {
+ Loc barcode = locService.getOne(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getLocStsId, LocStsType.F.val())
+ .eq(Loc::getLocNo, param.get("barcode")));
+ if (Objects.isNull(barcode)) {
+ throw new CoolException(param.get("barcode") + "搴撲綅鐘舵�佷笉鍙墽琛屾鎿嶄綔锛侊紒");
+ }
+ Loc tarCode = locService.getOne(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getLocStsId, LocStsType.O.val())
+ .eq(Loc::getLocNo, param.get("tarCode")));
+ if (Objects.isNull(tarCode)) {
+ throw new CoolException("璇锋鏌ョ洰鏍囦负鍞綅鏄惁瀛樺湪鎴栨槸鍚︿负绌哄簱锛侊紒");
+ }
+
+ List<Long> ids = Arrays.asList(barcode.getId(), tarCode.getId());
+
+ 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()) {
+ throw new CoolException("闈炲钩搴撲笉鍙墽琛屾鎿嶄綔锛侊紒");
+ }
+
+ List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, barcode.getLocNo()));
+ if (locDetls.isEmpty()) {
+ 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())
+ .set(LocDetl::getLocNo, tarCode.getLocNo()))) {
+ throw new CoolException("搴撲綅鏄庣粏淇敼澶辫触锛侊紒");
+ }
+
+ return R.ok();
+ }
+
+
}
--
Gitblit v1.9.1