From cc6dae7468506691bfb23ca81be5e14045771bce Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 15 一月 2025 20:43:59 +0800
Subject: [PATCH] # 拍灯容器流动流程修改 发货确认功能开发 部分功能优化
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 190 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 176 insertions(+), 14 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 77f09a9..134d238 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,22 +1,22 @@
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.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
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.*;
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.*;
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;
@@ -64,6 +64,18 @@
@Autowired
private CacheSiteMapper cacheSiteMapper;
+ @Autowired
+ private SeedSitesMapper seedSitesMapper;
+ @Autowired
+ private OrderDetlMapper orderDetlMapper;
+ @Autowired
+ private WaveSeedMapper waveSeedMapper;
+ @Autowired
+ private WaveSeedLogService waveSeedLogService;
+ @Autowired
+ private OrderDetlLogService orderDetlLogService;
+
+
@Override
@Transactional(rollbackFor = Exception.class)
public boolean batchMergeOrders(BatchMergeOrdersParam ordersParam) {
@@ -102,8 +114,6 @@
if (workService.generatePakIn(generatePakInParam)) {
return true;
}
- } else {
- //fixme 骞冲簱鏄惁闇�瑕侀绾﹀叆搴�
}
return false;
}
@@ -131,7 +141,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("璇烽�夋嫨骞冲簱鍖哄簱浣嶏紝鍐嶆搷浣滐紒锛�");
}
@@ -146,6 +156,10 @@
}
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());
@@ -157,7 +171,7 @@
locDetl.setLocId(loc.getId());
locDetl.setMatnr(pakin.getMatnr());
Mat one = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, pakin.getMatnr()));
- if (!Objects.isNull(one)) {
+ if (Objects.isNull(one)) {
throw new CoolException("褰撳墠鐗╂枡涓嶅瓨鍦紒锛�");
}
locDetl.setMatId(one.getId());
@@ -174,6 +188,7 @@
waitPakins.forEach(waitPakin -> {
WaitPakinLog pakinLog = new WaitPakinLog();
BeanUtils.copyProperties(waitPakin, pakinLog);
+ pakinLog.setIoStatus(1);
if (!waitPakinLogService.saveOrUpdate(pakinLog)) {
throw new CoolException("缁勬嫋鍘嗗彶妗ｆ洿鏂板け璐�");
}
@@ -182,11 +197,17 @@
if (!waitPakinService.removeBatchByIds(waitPakins)) {
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() + ",涓嶅彲鍋氬钩搴撲笂鏋舵搷浣滐紒锛�");
+ }
+ //淇敼璁㈠崟鐘舵�佷负宸插畬鎴�
+ order.setOrderSettle(OrderSettleType.COMPLETE.val());
+
OrderLog orderLog = new OrderLog();
BeanUtils.copyProperties(order, orderLog);
if (!orderLogService.save(orderLog)) {
@@ -194,8 +215,27 @@
}
});
+ //鍒犻櫎璁㈠崟鏁版嵁
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);
+ 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;
@@ -292,32 +332,154 @@
}
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))) {
+ 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) {
-// return cacheSiteMapper.bindOrderBySite(param);
- return false;
+ 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;
+ }
+
+ @Override
+ public R selectShippingDetl(Map<String, Object> params) {
+ //鍒ゆ柇璁㈠崟鏄惁涓虹┖
+ if (StringUtil.isNullOrEmpty((String) params.get("orderNo"))) {
+ throw new CoolException("璁㈠崟缂栫爜鍙蜂笉鑳戒负绌猴紒锛�");
+ }
+ String orderId = params.get("orderNo").toString();
+ List<ShippingOrderDetlDto> waveSeeds = waveSeedMapper.selectShippingOrderDtel(orderId);
+
+ return R.ok(waveSeeds);
+ }
+
+ /**
+ * 鍙戣揣鍗曟槑缁嗙‘璁�
+ * 1. 鍑哄簱淇敼璁㈠崟瀹屾垚鐘舵�侊紝鍒ゆ柇璁㈠崟鏄惁瀹屾垚锛屽畬鎴愬姞鍏ュ巻鍙叉。锛屾湭瀹屾垚淇敼璁㈠崟宸插畬鎴愭暟閲�
+ * 2. 鍒犻櫎璁㈠崟宸插畬鎴愭挱绉嶆槑缁嗕俊鎭�
+ * 3. 娓呴櫎闆嗚揣鍖虹粦瀹氭暟鎹�
+ * @param params
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R confirmShippingDetl(List<ShippingOrderDetlDto> params) {
+ if (params.isEmpty()) {
+ throw new CoolException("鍙戣揣鍗曟嵁鏄庣粏涓虹┖锛屼笉鍙墽琛屽彂璐ф搷浣滐紒锛�");
+ }
+ params.forEach(order -> {
+ //鍒犻櫎鍑哄簱璁㈠崟鍙婃槑缁嗭紝鍔犲叆璁㈠崟鍘嗗彶妗�
+ if (order.getAnfme() == order.getWorkQty()) { //瀹屽叏鎷ｈ揣
+ OrderDetl byId = orderDetlService.getById(order.getId());
+ OrderDetlLog orderDetlLog = new OrderDetlLog();
+ BeanUtils.copyProperties(orderDetlLog, byId);
+ orderDetlLog.setQty(order.getWorkQty());
+ orderDetlLog.setWorkQty(0.0);
+ if (!orderDetlLogService.save(orderDetlLog)) {
+ throw new CoolException("璁㈠崟鏄庣粏杞巻鍙叉。澶辫触锛侊紒");
+ }
+
+ if (!orderDetlService.removeById(byId)) {
+ throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+
+ //鏌ヨ褰撳墠璁㈠崟涓嬪惁杩樻湁鏄庣粏瀛樺湪
+ List<OrderDetl> orders = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderNo, order.getOrderNo()));
+
+ if (orders.isEmpty()) {
+ Order one = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, order.getOrderNo()));
+ if (Objects.isNull(one)) {
+ throw new CoolException("璁㈠崟涓嶅瓨鍦紒锛�");
+ }
+ OrderLog orderLog = new OrderLog();
+
+ BeanUtils.copyProperties(one, orderLog);
+
+ if (!orderLogService.save(orderLog)) {
+ throw new CoolException("鍘熷璁㈠崟杞巻鍙叉。澶辫触锛侊紒");
+ }
+
+ if (!orderService.remove(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, order.getOrderNo()))) {
+ throw new CoolException("鍘熷璁㈠崟鍒犻櫎澶辫触锛侊紒");
+ }
+ }
+ } else {
+ //todo 鍒犻櫎宸插畬鎴愭槑缁嗭紝淇濈暀鍘熷涓诲崟鍙婃湭瀹屾垚鏄庣粏
+ }
+
+ List<WaveSeed> waveSeeds = waveSeedMapper.selectList(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(waveSeedLog, seed);
+ waveSeedLog.setId(null);
+ waveSeedLogs.add(waveSeedLog);
+ });
+ if (waveSeedLogService.saveBatch(waveSeedLogs)) {
+ throw new CoolException("娉㈡槑鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
+ }
+ }
+ //鍒犻櫎鎾鏄庣粏淇℃伅
+ if (waveSeedMapper.deleteByIds(waveSeeds) < 1) {
+ throw new CoolException("鎾鏄庣粏鍒犻櫎鎼虹▼锛侊紒");
+ }
+ });
+
+
+ return null;
}
}
--
Gitblit v1.9.1