From d1511d2d12b4223882fcfdabd3ba6b59c038edc4 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 08 一月 2025 21:29:46 +0800
Subject: [PATCH] #拣货单功能开发
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 206 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 193 insertions(+), 13 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 d01778e..0c66545 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,27 +1,29 @@
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.exception.CoolException;
-import com.zy.asrs.wms.asrs.entity.Order;
-import com.zy.asrs.wms.asrs.entity.WaitPakin;
-import com.zy.asrs.wms.asrs.entity.enums.LocTypeHeightType;
+import com.zy.asrs.wms.asrs.entity.*;
+import com.zy.asrs.wms.asrs.entity.dto.PickSheetDetlDto;
+import com.zy.asrs.wms.asrs.entity.enums.*;
import com.zy.asrs.wms.asrs.entity.enums.OrderType;
-import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
import com.zy.asrs.wms.asrs.entity.param.BatchMergeOrdersParam;
import com.zy.asrs.wms.asrs.entity.param.GeneratePakInParam;
-import com.zy.asrs.wms.asrs.service.MobileService;
-import com.zy.asrs.wms.asrs.service.OrderService;
-import com.zy.asrs.wms.asrs.service.WaitPakinService;
-import com.zy.asrs.wms.asrs.service.WorkService;
+import com.zy.asrs.wms.asrs.entity.param.PageRequest;
+import com.zy.asrs.wms.asrs.entity.param.PakinOnShelvesParams;
+import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.service.HostService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
@Service
public class MobileServiceImpl implements MobileService {
@@ -29,13 +31,27 @@
@Autowired
private WaitPakinService waitPakinService;
@Autowired
+ private WaitPakinLogService waitPakinLogService;
+ @Autowired
private WorkService workService;
@Autowired
private HostService hostService;
-
@Autowired
private OrderService orderService;
-
+ @Autowired
+ private OrderLogService orderLogService;
+ @Autowired
+ private LocService locService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private LocAreaService locAreaService;
+ @Autowired
+ private LocAreaTypeService locAreaTypeService;
+ @Autowired
+ private PickSheetService pickSheetService;
+ @Autowired
+ private PickSheetDetlService pickSheetDetlService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -85,4 +101,168 @@
public List<Host> getHosts() {
return hostService.list();
}
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean pakinToStock(PakinOnShelvesParams shelvesParams) {
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, shelvesParams.getLoc()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
+ }
+ if (loc.getLocStsId() != LocStsType.O.val()) {
+ throw new CoolException("褰撳墠搴撲綅鐘舵�佷笉鏄┖搴撶姸鎬�." + LocStsType.O.val());
+ }
+
+ //鍒ゆ柇褰撳墠浠撳簱鏄惁涓哄钩搴撲綅
+ List<LocArea> locAreas = locAreaService.list(new LambdaQueryWrapper<LocArea>().eq(LocArea::getLocId, loc.getId()));
+ if (locAreas.isEmpty()) {
+ throw new CoolException("搴撲綅娌℃湁鍒嗛厤鎵�灞炰粨搴撳尯鍩燂紒锛�");
+ }
+ locAreas.forEach(locArea -> {
+ LocAreaType typeServiceOne = locAreaTypeService.getOne(new LambdaQueryWrapper<LocAreaType>().eq(LocAreaType::getId, locArea.getTypeId()), false);
+ if (typeServiceOne.getParentId() != LocAreaTypeSts.LOC_AREA_TYPE_FLAT.id && typeServiceOne.getId() != LocAreaTypeSts.LOC_AREA_TYPE_FLAT.id) {
+ throw new CoolException("璇烽�夋嫨骞冲簱鍖哄簱浣嶏紝鍐嶆搷浣滐紒锛�");
+ }
+ });
+
+ loc.setBarcode(shelvesParams.getBarcode());
+ loc.setUpdateTime(new Date());
+ //搴撳瓨鐘舵�佷慨鏀逛负鍦ㄥ簱鐘舵��
+ loc.setLocStsId(LocStsType.F.val());
+ if (!locService.updateById(loc)) {
+ throw new CoolException("搴撲綅鏇存柊澶辫触锛侊紒");
+ }
+
+ List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, shelvesParams.getBarcode()));
+ waitPakins.forEach(pakin -> {
+ LocDetl locDetl = new LocDetl();
+ 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());
+ locDetl.setMemo(pakin.getMemo());
+ locDetl.setUpdateTime(new Date());
+ if (!locDetlService.saveOrUpdate(locDetl)) {
+ throw new CoolException("搴撳瓨鏄庣粏鏇存柊澶辫触锛侊紒");
+ }
+ //淇敼鐘舵�佷负鍏ュ簱涓�
+ pakin.setIoStatus(1);
+ });
+
+ //鍒犻櫎缁勬嫋妗ｏ紝鍔犲叆鍘嗗彶缁勬嫋妗�
+ waitPakins.forEach(waitPakin -> {
+ WaitPakinLog pakinLog = new WaitPakinLog();
+ BeanUtils.copyProperties(waitPakin, pakinLog);
+ if (!waitPakinLogService.saveOrUpdate(pakinLog)) {
+ throw new CoolException("缁勬嫋鍘嗗彶妗ｆ洿鏂板け璐�");
+ }
+ });
+
+ 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));
+ orders.forEach(order -> {
+ OrderLog orderLog = new OrderLog();
+ BeanUtils.copyProperties(order, orderLog);
+ if (!orderLogService.save(orderLog)) {
+ throw new CoolException("鍘嗗彶鍗曟嵁鏇存柊澶辫触锛侊紒");
+ }
+ });
+
+ if (!orderService.removeBatchByIds(orders)) {
+ throw new CoolException("璁㈠崟鍒犻櫎澶辫触锛侊紒");
+ }
+
+ return true;
+ }
+
+ @Override
+ public PickSheetDetlDto outFlatSheet(String code) {
+ PickSheetDetlDto pickDetlDto = new PickSheetDetlDto();
+ PickSheet pickSheet = pickSheetService.getOne(new LambdaQueryWrapper<PickSheet>()
+ .eq(PickSheet::getPickNo, code)
+ .eq(PickSheet::getDeleted, 0)
+ .eq(PickSheet::getStatus, 1)
+ );
+ BeanUtils.copyProperties(pickSheet, pickDetlDto);
+ if (Objects.isNull(pickDetlDto)) {
+ throw new CoolException("瀵硅薄澶嶅埗澶辫触锛侊紒");
+ }
+ List<PickSheetDetl> sheetDetls = pickSheetDetlService.list(new LambdaQueryWrapper<PickSheetDetl>()
+ .eq(PickSheetDetl::getPickId, pickSheet.getId())
+ .eq(PickSheetDetl::getStatus, 1)
+ .eq(PickSheetDetl::getDeleted, 0));
+ pickDetlDto.setPickSheetDetlList(sheetDetls);
+ return pickDetlDto;
+ }
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean confirmFlatSheet(String code) {
+ PickSheet pickSheet = pickSheetService.getOne(new LambdaQueryWrapper<PickSheet>().eq(PickSheet::getPickNo, code));
+ if (pickSheet.getStatus() == 1) {
+ //鐘舵�佷慨鏀逛负锛� 宸茶浆鍘嗗彶妗�
+ pickSheet.setStatus(3);
+ if (!pickSheetService.updateById(pickSheet)) {
+ throw new CoolException("杞巻鍙叉。澶辫触锛侊紒");
+ } else{
+ if (!pickSheetDetlService.update(new LambdaUpdateWrapper<PickSheetDetl>().eq(PickSheetDetl::getPickId, pickSheet.getId()).set(PickSheetDetl::getStatus, 3))) {
+ throw new CoolException("鎷ｈ揣鍗曟槑缁嗚浆鍘嗗彶妗ｅけ璐ワ紒锛�");
+ }
+ }
+ } else {
+ throw new CoolException("璇峰嬁鎿嶄綔鍘嗗彶妗ｆ暟鎹紒锛�");
+ }
+ List<PickSheetDetl> sheetDetls = pickSheetDetlService.list(new LambdaQueryWrapper<PickSheetDetl>().eq(PickSheetDetl::getPickId, pickSheet.getId()));
+ Map<Long, List<PickSheetDetl>> listMap = sheetDetls.stream().collect(Collectors.groupingBy(PickSheetDetl::getLocId));
+ listMap.keySet().forEach(key -> {
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getId, key));
+ listMap.get(key).forEach(pickDetl -> {
+ LocDetl detl = locDetlService.getOne(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getId, pickDetl.getLocDetlId()));
+ if (Objects.isNull(detl)) {
+ throw new CoolException("鏁版嵁閿欒锛侊紒");
+ }
+ //鏇存柊閿佸畾搴撳瓨
+ BigDecimal workQty = BigDecimal.valueOf(detl.getAnfme()).subtract(pickDetl.getAnfme());
+ detl.setWorkQty(workQty.doubleValue());
+ //璁＄畻缁撴灉灏忎簬绛変簬闆讹紝绉诲嚭搴撳瓨鏄庣粏
+ BigDecimal qty = BigDecimal.valueOf(detl.getAnfme()).subtract(pickDetl.getAnfme());
+ detl.setAnfme(qty.doubleValue());
+ if (qty.compareTo(new BigDecimal("0.00")) <= 0) {
+ detl.setDeleted(1);
+ if (!locDetlService.removeById(detl)) {
+ throw new CoolException("搴撳瓨鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ }
+ } else { //缁撴灉澶т簬闆讹紝鏇存柊搴撳瓨鏄庣粏
+ if (!locDetlService.updateById(detl)) {
+ throw new CoolException("搴撳瓨鏄庣粏鏇存柊澶辫触锛侊紒");
+ }
+ }
+ });
+ /**鏄庣粏鏇存柊瀹屾垚鍚庯紝鍒ゆ柇鏄惁涓虹┖锛屼负绌烘洿鏂颁富鍗曠姸鎬佷负绌哄簱锛屾嫋鐩樼爜娓呯┖锛屼笉涓虹┖涓嶅仛鏇存柊**/
+ List<LocDetl> list = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocId, loc.getId()).eq(LocDetl::getDeleted, 0));
+ if (list.isEmpty()) {
+ boolean update = locService.update(new LambdaUpdateWrapper<Loc>()
+ .eq(Loc::getId, loc.getId())
+ .set(Loc::getBarcode, null)
+ .set(Loc::getUpdateTime, new Date())
+ .set(Loc::getLocStsId, LocStsType.O.val()));
+ if (update) {
+ throw new CoolException("搴撳瓨鏇存柊澶辫触锛侊紒 ");
+ }
+ }
+ });
+ return true;
+ }
+
}
--
Gitblit v1.9.1