From fcbb4059f11d1e2b320d581bf6f960d9965142c6 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 08:58:18 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 230 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 140 insertions(+), 90 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 16e47ac..ff53c59 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.asrs.entity.*;
@@ -17,7 +18,6 @@
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.service.HostService;
import io.netty.util.internal.StringUtil;
-import org.aspectj.weaver.ast.Or;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -82,10 +82,21 @@
@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::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("璁㈠崟涓嶅瓨鍦紒锛�");
@@ -100,7 +111,9 @@
.setMatnr(orderdetl.getMatnr())
.setDetlId(orderdetl.getDetlId())
.setIoStatus(0)
- .setOrderNo(orderdetl.getOrderNo()).setOrderId(orderdetl.getOrderId()).setStatus(1);
+ .setOrderNo(orderdetl.getOrderNo())
+ .setOrderId(orderdetl.getOrderId())
+ .setStatus(1);
waitPakins.add(waitPakin);
});
@@ -109,8 +122,9 @@
waitPakinService.comb(pakin);
});
+
// 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();
@@ -161,7 +175,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("褰撳墠鎷栫洏娌℃湁缁勬嫋妗�!!");
@@ -189,6 +202,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("鍗曟嵁鏄庣粏淇敼澶辫触锛侊紒");
+ }
});
//鍒犻櫎缁勬嫋妗ｏ紝鍔犲叆鍘嗗彶缁勬嫋妗�
@@ -196,56 +219,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 + summed) * 1000) / 1000.0;
+ Double anfme = detls.stream().mapToDouble(OrderDetl::getAnfme).sum();
+ if (v.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;
}
@@ -257,10 +293,11 @@
.eq(PickSheet::getDeleted, 0)
.eq(PickSheet::getStatus, 1)
);
- BeanUtils.copyProperties(pickSheet, pickDetlDto);
- if (Objects.isNull(pickDetlDto)) {
- throw new CoolException("瀵硅薄澶嶅埗澶辫触锛侊紒");
+ if (Objects.isNull(pickSheet)) {
+ throw new CoolException("鎷ｈ揣鍗曚笉瀛樺湪锛侊紒");
}
+ BeanUtils.copyProperties(pickSheet, pickDetlDto);
+
List<PickSheetDetl> sheetDetls = pickSheetDetlService.list(new LambdaQueryWrapper<PickSheetDetl>()
.eq(PickSheetDetl::getPickId, pickSheet.getId())
.eq(PickSheetDetl::getStatus, 1)
@@ -300,8 +337,8 @@
throw new CoolException("鏁版嵁閿欒锛侊紒");
}
//鏇存柊閿佸畾搴撳瓨
- BigDecimal workQty = BigDecimal.valueOf(detl.getAnfme()).subtract(pickDetl.getAnfme());
- detl.setWorkQty(workQty.doubleValue());
+// BigDecimal workQty = BigDecimal.valueOf(detl.getAnfme()).subtract(pickDetl.getAnfme());
+ detl.setWorkQty(0.0);
//璁＄畻缁撴灉灏忎簬绛変簬闆讹紝绉诲嚭搴撳瓨鏄庣粏
BigDecimal qty = BigDecimal.valueOf(detl.getAnfme()).subtract(pickDetl.getAnfme());
detl.setAnfme(qty.doubleValue());
@@ -324,7 +361,7 @@
.set(Loc::getBarcode, null)
.set(Loc::getUpdateTime, new Date())
.set(Loc::getLocStsId, LocStsType.O.val()));
- if (update) {
+ if (!update) {
throw new CoolException("搴撳瓨鏇存柊澶辫触锛侊紒 ");
}
}
@@ -384,7 +421,10 @@
if (Objects.isNull(order)) {
throw new CoolException("缁戝畾璁㈠崟涓嶅瓨鍦紒锛�");
}
- siteNo.setOrderNo(order.getOrderNo()).setOrderId(order.getId()).setSiteStatus(CacheSiteStatusType.R.id).setBarcode(param.get("barcode").toString());
+ siteNo.setOrderNo(order.getOrderNo())
+ .setOrderId(order.getId())
+ .setSiteStatus(CacheSiteStatusType.R.id)
+ .setBarcode(param.get("barcode").toString());
if (cacheSiteMapper.updateById(siteNo) < 1) {
throw new CoolException("璁㈠崟鎾浣嶇粦瀹氬け璐ワ紒锛�" );
}
@@ -400,7 +440,7 @@
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("璁㈠崟涓庢挱绉嶄綅瑙ｇ粦澶辫触锛侊紒" );
}
@@ -442,6 +482,18 @@
if (params.isEmpty()) {
throw new CoolException("鍙戣揣鍗曟嵁鏄庣粏涓虹┖锛屼笉鍙墽琛屽彂璐ф搷浣滐紒锛�");
}
+
+ //鑾峰彇褰撳墠涓婁紶鎵�鏈夎鍗曞彿
+ Set<String> orderNoSet = params.stream().map(ShippingOrderDetlDto::getOrderNo).collect(Collectors.toSet());
+ if (orderNoSet.isEmpty()) {
+ throw new CoolException("涓诲崟淇℃伅涓嶅瓨鍦紝璇锋牳瀵瑰嚭搴撹鍗曪紒锛�");
+ }
+
+ List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getOrderNo, orderNoSet));
+ if (orderList.isEmpty()) {
+ throw new CoolException("璁㈠崟涓嶅瓨鍦紒锛�");
+ }
+
params.forEach(order -> {
OrderDetl byId = orderDetlService.getById(order.getId());
if (Objects.isNull(byId)) {
@@ -449,6 +501,7 @@
}
OrderDetlLog orderDetlLog = new OrderDetlLog();
BeanUtils.copyProperties(byId, orderDetlLog);
+ orderDetlLog.setId(null);
orderDetlLog.setQty(order.getWorkQty());
orderDetlLog.setWorkQty(0.0);
if (!orderDetlLogService.save(orderDetlLog)) {
@@ -462,7 +515,7 @@
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("閮ㄥ垎鎷ｆ枡鏄庣粏鏇存柊澶辫触锛侊紒");
@@ -489,19 +542,10 @@
}
});
- //鑾峰彇褰撳墠涓婁紶鎵�鏈夎鍗曞彿
- Set<String> orderNoSet = params.stream().map(ShippingOrderDetlDto::getOrderNo).collect(Collectors.toSet());
- if (orderNoSet.isEmpty()) {
- throw new CoolException("涓诲崟淇℃伅涓嶅瓨鍦紝璇锋牳瀵瑰嚭搴撹鍗曪紒锛�");
- }
-
- List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getOrderNo, orderNoSet));
- if (orderList.isEmpty()) {
- throw new CoolException("璁㈠崟涓嶅瓨鍦紒锛�");
- }
orderList.forEach(one -> {
OrderLog orderLog = new OrderLog();
BeanUtils.copyProperties(one, orderLog);
+ orderLog.setId(null);
orderLog.setOrderSettle(OrderSettleType.COMPLETE.val());
if (!orderLogService.save(orderLog)) {
@@ -520,40 +564,46 @@
}
});
- Set<Long> waveIds = orderList.stream().map(Order::getWaveId).collect(Collectors.toSet());
- if (waveIds.isEmpty()) {
- throw new CoolException("娉㈡淇℃伅涓虹┖锛侊紒");
+ Set<Long> ordersSet = orderList.stream().map(Order::getId).collect(Collectors.toSet());
+ List<PlatformDetl> platDetls = platformDetlService.list(new LambdaQueryWrapper<PlatformDetl>().in(PlatformDetl::getOrderId, ordersSet));
+ if (platDetls.isEmpty()) {
+ throw new CoolException("璁㈠崟淇℃伅鏈繘闆嗚揣鍖猴紒锛�");
}
- List<Wave> waves = waveService.list(new LambdaQueryWrapper<Wave>().eq(Wave::getId, waveIds));
- for (Wave wave : waves) {
- WaveLog waveLog = new WaveLog();
- waveLog.sync(wave);
- waveLog.setId(null);
- if (!waveLogService.save(waveLog)) {
- throw new CoolException("娉㈡杞巻鍙插け璐�");
- }
-
- List<WaveDetl> waveDetls = waveDetlService.list(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, wave.getId()));
- for (WaveDetl waveDetl : waveDetls) {
- WaveDetlLog waveDetlLog = new WaveDetlLog();
- waveDetlLog.sync(waveDetl);
- waveDetlLog.setId(null);
- waveDetlLog.setWaveId(waveLog.getId());
- if (!waveDetlLogService.save(waveDetlLog)) {
- throw new CoolException("娉㈡鏄庣粏杞巻鍙插け璐�");
- }
-
- if (!waveDetlService.removeById(waveDetl.getId())) {
- throw new CoolException("娉㈡鏄庣粏鍒犻櫎澶辫触");
- }
- }
-
- if (!waveService.removeById(wave.getId())) {
- throw new CoolException("娉㈡鍒犻櫎澶辫触");
- }
+ ArrayList<PlatformDetlLog> platformDetls = new ArrayList<>();
+ platDetls.forEach(plat -> {
+ PlatformDetlLog detl = new PlatformDetlLog();
+ BeanUtils.copyProperties(plat, detl);
+ detl.setId(null);
+ platformDetls.add(detl);
+ });
+ //闆嗚揣鍖鸿浆鍘嗗彶妗�
+ if (!platformDetlLogService.saveBatch(platformDetls)) {
+ throw new CoolException("闆嗚揣鍖鸿鍗曡浆鍘嗗彶妗ｅけ璐ワ紒锛�");
}
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) {
+ return R.ok().add(matService.list(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr)));
+ }
+
}
--
Gitblit v1.9.1