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 | 106 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 91 insertions(+), 15 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 b110fa7..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,12 +1,17 @@
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.*;
+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.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.service.*;
import com.zy.asrs.wms.system.entity.Host;
@@ -16,10 +21,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.math.BigDecimal;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@@ -45,7 +48,10 @@
private LocAreaService locAreaService;
@Autowired
private LocAreaTypeService locAreaTypeService;
-
+ @Autowired
+ private PickSheetService pickSheetService;
+ @Autowired
+ private PickSheetDetlService pickSheetDetlService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -133,7 +139,8 @@
LocDetl locDetl = new LocDetl();
locDetl.setAnfme(pakin.getAnfme());
locDetl.setBatch(pakin.getBatch());
- locDetl.setMatId(pakin.getMatnrId$());;
+ locDetl.setMatId(pakin.getMatnrId$());
+ ;
locDetl.setCreateTime(new Date());
locDetl.setOrderNo(pakin.getOrderNo());
locDetl.setLocNo(loc.getLocNo());
@@ -178,15 +185,84 @@
return true;
}
-// /**
-// * 鑾峰彇褰撳墠搴撲綅鏄惁瀛樺湪
-// * @param shelvesParams
-// * @return
-// */
-// @Override
-// public Loc selectPakinLocs(PakinOnShelvesParams shelvesParams) {
-// return locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, shelvesParams.getLoc()));
-// }
+ @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