From 33590e66e814b1c2e025e038410ef0006f4f38f7 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期一, 21 十月 2024 16:37:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java | 295 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 290 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
index 057e514..1637675 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
@@ -3,7 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.domain.dto.DetlDto;
import com.zy.asrs.common.domain.param.MobileAdjustParam;
+import com.zy.asrs.common.openapi.entity.dto.MergeBoardManyDto;
+import com.zy.asrs.common.openapi.entity.dto.PickMergeDto;
+import com.zy.asrs.common.openapi.entity.dto.PickMergeOrderDto;
import com.zy.asrs.common.openapi.entity.param.CombParam;
+import com.zy.asrs.common.openapi.entity.param.WarehouseOutMergeBoardManyParam;
+import com.zy.asrs.common.openapi.entity.param.WarehouseOutPickMergeParam;
import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.common.wms.mapper.LocDetlMapper;
import com.zy.asrs.common.wms.service.*;
@@ -20,10 +25,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
@@ -52,6 +54,8 @@
private LocDetlService locDetlService;
@Autowired
private WaitPakinLogService waitPakinLogService;
+ @Autowired
+ private AdjDetlService adjDetlService;
@Override
@Transactional
@@ -157,7 +161,7 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
- waitPakin.setOwner(param.getOwner());
+ waitPakin.setOwner(Optional.ofNullable(param.getOwner()).orElse(""));
if (!waitPakinService.save(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -451,7 +455,16 @@
}
try {
//澶勭悊搴撳瓨淇℃伅
+ AdjDetl adjDetl = new AdjDetl();
+ adjDetl.setLocNo(locDetl.getLocNo());
+ adjDetl.setMatnr(locDetl.getMatnr());
+ adjDetl.setBatch(locDetl.getBatch());
+ adjDetl.setOriQty(locDetl.getAnfme());
+ adjDetl.setMemo("WarehouseOutV1-pick");
+ adjDetl.setModiTime(new Date());
+
if (combMat.getAnfme().equals(locDetl.getAnfme())){
+ adjDetl.setAdjQty(0D);
//搴撳瓨鐩哥瓑鍒犻櫎鏁版嵁
locDetlService.removeById(locDetl);
int count = locDetlService.count(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo,combParam.getLocno()).eq(LocDetl::getHostId, hostId));
@@ -464,6 +477,11 @@
BigDecimal subtract = BigDecimal.valueOf(locDetl.getAnfme()).subtract(BigDecimal.valueOf(combMat.getAnfme()));
locDetl.setAnfme(subtract.doubleValue());
locDetlService.updateById(locDetl);
+ adjDetl.setAdjQty(subtract.doubleValue());
+ }
+
+ if (!adjDetlService.save(adjDetl)) {
+ throw new CoolException("淇濆瓨搴撳瓨璋冩暣璁板綍澶辫触");
}
}catch (Exception e){
throw new CoolException("鏇存柊搴撳瓨鏁版嵁鍑洪敊"+e.getMessage());
@@ -471,4 +489,271 @@
}
return R.ok();
}
+
+ @Override
+ @Transactional
+ public R WarehouseOutPickMergeV1(WarehouseOutPickMergeParam param, Long hostId) {
+ //鍒ゆ柇搴撲綅鐘舵��
+ LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, param.getLocNo()).eq(LocMast::getHostId,hostId).eq(LocMast::getWhsType,0L));
+ if (Cools.isEmpty(locMast)){
+ return R.error("璇ュ簱浣嶄笉瀛樺湪");
+ }
+ if (!locMast.getLocSts().equals("P")){
+ return R.error("璇ュ簱浣嶇姸鎬佷负锛�"+locMast.getLocSts()+",涓嶆弧瓒虫嫞鏂欓�斾腑骞舵澘鏉′欢锛侊紒锛�");
+ }
+
+ HashMap<String, OrderDetl> mapData = new HashMap<>();
+ for (OrderDetl orderDetl : param.getCombMats()) {
+ String key = orderDetl.getMatnr();
+ if (!Cools.isEmpty(orderDetl.getBatch())) {
+ key += "_" + orderDetl.getBatch();
+ }
+
+ OrderDetl value = mapData.get(key);
+ if(value == null){
+ mapData.put(key, orderDetl);
+ }else {
+ value.setAnfme(value.getAnfme() + orderDetl.getAnfme());
+ mapData.put(key, value);
+ }
+ }
+
+ List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, locMast.getLocNo()));
+
+ HashMap<String, PickMergeDto> locData = new HashMap<>();
+ for (LocDetl locDetl : locDetls) {
+ String matKey = locDetl.getMatnr();
+ if (!Cools.isEmpty(locDetl.getBatch())) {
+ matKey += "_" + locDetl.getBatch();
+ }
+
+ PickMergeDto dto = new PickMergeDto();
+ dto.setOriginAnfme(locDetl.getAnfme());
+ dto.setLocDetl(locDetl);
+ dto.setOrders(new ArrayList<>());
+ locData.put(matKey, dto);
+ }
+
+ for (Map.Entry<String, OrderDetl> entry : mapData.entrySet()) {
+ OrderDetl orderDetl = entry.getValue();
+ LocDetl locDetl = new LocDetl();
+ locDetl.sync(orderDetl);
+ locDetl.setId(null);
+ locDetl.setLocNo(param.getLocNo());
+ locDetl.setBarcode(locMast.getBarcode());
+
+ String matKey = locDetl.getMatnr();
+ if (!Cools.isEmpty(locDetl.getBatch())) {
+ matKey += "_" + locDetl.getBatch();
+ }
+
+ PickMergeDto dto = locData.get(matKey);
+ if (dto == null) {
+ ArrayList<PickMergeOrderDto> orders = new ArrayList<>();
+ orders.add(new PickMergeOrderDto(locDetl.getOrderNo(), locDetl.getAnfme()));
+
+ dto = new PickMergeDto();
+ dto.setOriginAnfme(locDetl.getAnfme());
+ dto.setLocDetl(locDetl);
+ dto.setOrders(orders);
+
+ locData.put(matKey, dto);
+ }else {
+ LocDetl detl = dto.getLocDetl();
+ List<PickMergeOrderDto> orders = dto.getOrders();
+
+ detl.setAnfme(detl.getAnfme() + locDetl.getAnfme());
+ orders.add(new PickMergeOrderDto(locDetl.getOrderNo(), locDetl.getAnfme()));
+
+ dto.setLocDetl(detl);
+ dto.setOrders(orders);
+
+ locData.put(matKey, dto);
+ }
+ }
+
+
+ for (Map.Entry<String, PickMergeDto> entry : locData.entrySet()) {
+ PickMergeDto dto = entry.getValue();
+
+ Double originAnfme = dto.getOriginAnfme();
+ LocDetl locDetl = dto.getLocDetl();
+ List<PickMergeOrderDto> orders = dto.getOrders();
+
+ if (locDetl.getId() == null) {
+ if (!locDetlService.save(locDetl)) {
+ throw new CoolException("骞舵澘搴撳瓨鎻掑叆澶辫触");
+ }
+ }else {
+ if (!locDetlService.updateById(locDetl)) {
+ throw new CoolException("骞舵澘搴撳瓨鏇存柊澶辫触");
+ }
+ }
+
+ if (!orders.isEmpty()){
+ for (PickMergeOrderDto orderDto : orders) {
+ Order order = orderService.selectByNo(orderDto.getOrderNo(), hostId);
+ if (Cools.isEmpty(order)){
+ continue;
+ }
+ if (order.getSettle() == 1){
+ orderService.updateSettle(order.getId(), 2L, 9527L, hostId);
+ }
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), locDetl.getMatnr(), locDetl.getBatch(),hostId);
+ if (Cools.isEmpty(orderDetl)){
+ continue;
+ }
+ if (orderDetl.getAnfme() < (orderDetl.getWorkQty() + orderDto.getAnfme())) {
+ throw new CoolException("鎷ｉ�夋暟閲忓嚭閿�,璁㈠崟鍓╀綑鍑哄簱鏁伴噺灏忎簬宸插嚭搴撴暟閲忎笌灏嗘嫞閫夋暟閲忎箣鍜岋紒锛侊紒");
+ }
+ // 淇敼璁㈠崟鏄庣粏浣滀笟鏁伴噺
+ if (!orderDetlService.increaseWorkQtyByOrderNo(orderDto.getOrderNo(), locDetl.getMatnr(), locDetl.getBatch(), orderDto.getAnfme(), hostId)) {
+ throw new CoolException("淇敼鍗曟嵁鏄庣粏宸ヤ綔鏁伴噺澶辫触");
+ }
+ // 淇敼璁㈠崟鏄庣粏瀹屾垚鏁伴噺
+ if (!orderDetlService.increase(order.getId(), hostId, locDetl.getMatnr(), locDetl.getBatch(), orderDto.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁鏄庣粏瀹屾垚鏁伴噺澶辫触");
+ }
+ // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
+ orderService.checkComplete(orderDto.getOrderNo(), hostId);
+ }
+ }
+
+ try {
+ //澶勭悊搴撳瓨淇℃伅
+ AdjDetl adjDetl = new AdjDetl();
+ adjDetl.setLocNo(locDetl.getLocNo());
+ adjDetl.setMatnr(locDetl.getMatnr());
+ adjDetl.setBatch(locDetl.getBatch());
+ adjDetl.setOriQty(originAnfme);
+ adjDetl.setAdjQty(locDetl.getAnfme());
+ adjDetl.setMemo("WarehouseOutV1-pick");
+ adjDetl.setModiTime(new Date());
+
+ if (!adjDetlService.save(adjDetl)) {
+ throw new CoolException("淇濆瓨搴撳瓨璋冩暣璁板綍澶辫触");
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ throw new CoolException("鏇存柊搴撳瓨鏁版嵁鍑洪敊" + e.getMessage());
+ }
+ }
+ return R.ok();
+ }
+
+ @Override
+ @Transactional
+ public R WarehouseOutMergeBoardMany(WarehouseOutMergeBoardManyParam param, Long hostId) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode(), hostId);
+ if (wrkMast == null) {
+ throw new CoolException("宸ヤ綔妗ｄ笉瀛樺湪");
+ }
+
+ if (wrkMast.getIoType() != 104) {
+ throw new CoolException("宸ヤ綔绫诲瀷涓嶅睘浜庡苟鏉垮嚭搴�");
+ }
+
+ if (wrkMast.getWrkSts() != 199) {
+ throw new CoolException("宸ヤ綔鐘舵�佷笉婊¤冻澶氭骞舵澘鍏ュ簱鐘舵��");
+ }
+
+ List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()));
+
+ HashMap<String, MergeBoardManyDto> wrkData = new HashMap<>();
+ for (WrkDetl wrkDetl : wrkDetls) {
+ String matKey = wrkDetl.getMatnr();
+ if (!Cools.isEmpty(wrkDetl.getBatch())) {
+ matKey += "_" + wrkDetl.getBatch();
+ }
+
+ MergeBoardManyDto dto = new MergeBoardManyDto();
+ dto.setOriginAnfme(wrkDetl.getAnfme());
+ dto.setWrkDetl(wrkDetl);
+ dto.setOrders(new ArrayList<>());
+ wrkData.put(matKey, dto);
+ }
+
+ for (OrderDetl orderDetl : param.getCombMats()) {
+ String matKey = orderDetl.getMatnr();
+ if (!Cools.isEmpty(orderDetl.getBatch())) {
+ matKey += "_" + orderDetl.getBatch();
+ }
+
+ MergeBoardManyDto dto = wrkData.get(matKey);
+ if(dto == null){
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(orderDetl);
+ wrkDetl.setId(null);
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setWrkMastId(wrkMast.getId());
+ wrkDetl.setIoTime(new Date());
+
+ ArrayList<PickMergeOrderDto> orderDtos = new ArrayList<>();
+ orderDtos.add(new PickMergeOrderDto(orderDetl.getOrderNo(), orderDetl.getAnfme()));
+
+ dto = new MergeBoardManyDto();
+ dto.setOriginAnfme(orderDetl.getAnfme());
+ dto.setWrkDetl(wrkDetl);
+ dto.setOrders(orderDtos);
+ }else {
+ WrkDetl wrkDetl = dto.getWrkDetl();
+ List<PickMergeOrderDto> orders = dto.getOrders();
+
+ wrkDetl.setAnfme(wrkDetl.getAnfme() + orderDetl.getAnfme());
+ orders.add(new PickMergeOrderDto(orderDetl.getOrderNo(), orderDetl.getAnfme()));
+
+ dto.setWrkDetl(wrkDetl);
+ dto.setOrders(orders);
+ }
+
+ wrkData.put(matKey, dto);
+ }
+
+ for (Map.Entry<String, MergeBoardManyDto> entry : wrkData.entrySet()) {
+ MergeBoardManyDto dto = entry.getValue();
+ List<PickMergeOrderDto> orders = dto.getOrders();
+ WrkDetl wrkDetl = dto.getWrkDetl();
+
+ if (wrkDetl.getId() == null) {
+ if (!wrkDetlService.save(wrkDetl)) {
+ throw new CoolException("澶氭骞舵澘鎻掑叆宸ヤ綔鏄庣粏澶辫触");
+ }
+ }else {
+ if (!wrkDetlService.updateById(wrkDetl)) {
+ throw new CoolException("澶氭骞舵澘鏇存柊宸ヤ綔鏄庣粏澶辫触");
+ }
+ }
+
+ if (!orders.isEmpty()){
+ for (PickMergeOrderDto orderDto : orders) {
+ Order order = orderService.selectByNo(orderDto.getOrderNo(), hostId);
+ if (Cools.isEmpty(order)){
+ continue;
+ }
+ if (order.getSettle() == 1){
+ orderService.updateSettle(order.getId(), 2L, 9527L, hostId);
+ }
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), wrkDetl.getMatnr(), wrkDetl.getBatch(),hostId);
+ if (Cools.isEmpty(orderDetl)){
+ continue;
+ }
+ if (orderDetl.getAnfme() < (orderDetl.getWorkQty() + orderDto.getAnfme())) {
+ throw new CoolException("鎷ｉ�夋暟閲忓嚭閿�,璁㈠崟鍓╀綑鍑哄簱鏁伴噺灏忎簬宸插嚭搴撴暟閲忎笌灏嗘嫞閫夋暟閲忎箣鍜岋紒锛侊紒");
+ }
+ // 淇敼璁㈠崟鏄庣粏浣滀笟鏁伴噺
+ if (!orderDetlService.increaseWorkQtyByOrderNo(orderDto.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), orderDto.getAnfme(), hostId)) {
+ throw new CoolException("淇敼鍗曟嵁鏄庣粏宸ヤ綔鏁伴噺澶辫触");
+ }
+ // 淇敼璁㈠崟鏄庣粏瀹屾垚鏁伴噺
+ if (!orderDetlService.increase(order.getId(), hostId, wrkDetl.getMatnr(), wrkDetl.getBatch(), orderDto.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁鏄庣粏瀹屾垚鏁伴噺澶辫触");
+ }
+ // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
+ orderService.checkComplete(orderDto.getOrderNo(), hostId);
+ }
+ }
+ }
+
+ return R.ok();
+ }
}
--
Gitblit v1.9.1