From cba29f2b769ae2010dd91ec5ed4e4199ead90ce6 Mon Sep 17 00:00:00 2001
From: Ryan <creaycat@gmail.com>
Date: 星期三, 02 四月 2025 18:49:03 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 160 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index acac827..cc8f42a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -1,12 +1,170 @@
package com.vincent.rsf.server.manager.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.manager.controller.params.PakinItem;
+import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
+import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.mapper.WaitPakinMapper;
-import com.vincent.rsf.server.manager.entity.WaitPakin;
-import com.vincent.rsf.server.manager.service.WaitPakinService;
+import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
@Service("waitPakinService")
public class WaitPakinServiceImpl extends ServiceImpl<WaitPakinMapper, WaitPakin> implements WaitPakinService {
+
+ @Autowired
+ private AsnOrderService asnOrderService;
+ @Autowired
+ private AsnOrderItemService asnOrderItemService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
+ @Autowired
+ private LocService locService;
+
+ /**
+ * @author Ryan
+ * @description 缁勬嫋
+ * @param
+ * @return
+ * @time 2025/3/29 14:42
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public WaitPakin mergeItems(WaitPakinParam waitPakin) {
+ if (waitPakin.getItems().isEmpty()) {
+ throw new CoolException("鍙傛暟閿欒锛氱墿鏂欒窡韪爜涓虹┖锛�");
+ }
+ if (StringUtils.isBlank(waitPakin.getBarcode())) {
+ throw new CoolException("鍙傛暟閿欒锛氭墭鐩樼爜涓虹┖锛侊紒");
+ }
+
+ List<WaitPakin> list = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
+ if (!list.isEmpty()) {
+ List<String> stringList = list.stream().map(WaitPakin::getCode).collect(Collectors.toList());
+ String join = StringUtils.join(stringList, ",");
+ throw new CoolException("鎷栫洏鐮侊細" + waitPakin.getBarcode() + "宸茶缁勬嫋鍗曪細" + join + "浣跨敤锛侊紒");
+ }
+
+ List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, waitPakin.getBarcode()));
+ if (!locs.isEmpty()) {
+ List<String> locCodes = locs.stream().map(Loc::getCode).collect(Collectors.toList());
+ String join = StringUtils.join(locCodes, ",");
+ throw new CoolException("鎷栫洏鐮侊細" + waitPakin.getBarcode() + "宸茶搴撲綅锛�" + join + "浣跨敤锛侊紒");
+ }
+
+ double sum = waitPakin.getItems().stream().mapToDouble(PakinItem::getReceiptQty).sum();
+
+ WaitPakin pakin = new WaitPakin();
+
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAIT_PAKIN_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("缂栫爜瑙勫垯閿欒锛� 缂栫爜瑙勫垯銆孲YS_WAIT_PAKIN_CODE銆嶈鍒欐槸涓嶅瓨鍦�");
+ }
+ pakin.setCode(ruleCode)
+ //鐘舵�佷慨鏀逛负鍏ュ簱涓�
+ .setIoStatus(Short.parseShort("1"))
+ .setAnfme(sum)
+ .setBarcode(waitPakin.getBarcode());
+ if (!this.save(pakin)) {
+ throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
+ }
+
+ /**鐗╂枡璺熻釜鐮�*/
+ List<String> tracks = waitPakin.getItems().stream().map(PakinItem::getTrackCode).collect(Collectors.toList());
+
+ List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
+ .in(AsnOrderItem::getTrackCode, tracks));
+ if (Objects.isNull(asnOrderItems) || asnOrderItems.isEmpty()) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+
+ List<WaitPakinItem> items = new ArrayList<>();
+ for (AsnOrderItem item : asnOrderItems) {
+ WaitPakinItem pakinItem = new WaitPakinItem();
+ pakinItem.setAnfme(item.getAnfme())
+ .setPakinId(pakin.getId())
+ .setAsnId(item.getAsnId())
+ .setAsnCode(item.getAsnCode())
+ .setAsnItemId(item.getId())
+ .setMatnrCode(item.getMatnrCode())
+ .setBatch(item.getSplrBatch())
+ .setUnit(item.getStockUnit())
+ .setFieldsIndex(item.getFieldsIndex())
+ .setUnit(item.getStockUnit())
+ .setMatnrId(StringUtils.isNotBlank(item.getMatnrId()) ? Long.parseLong(item.getMatnrId()) : null)
+ .setMaktx(item.getMaktx())
+ .setMatnrCode(item.getMatnrCode());
+ for (PakinItem waitPakinItem : waitPakin.getItems()) {
+ if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) {
+ Double v = item.getWorkQty() + waitPakinItem.getReceiptQty();
+ pakinItem.setWorkQty(v)
+ .setAnfme(waitPakinItem.getReceiptQty())
+ .setTrackCode(waitPakinItem.getTrackCode());
+ /**鏇存柊鍗曟嵁鎵ц涓簱瀛�*/
+ if (v.compareTo(item.getAnfme()) > 0) {throw new CoolException("鎵ц涓暟閲忓ぇ浜庢敹璐ф暟閲忥紒锛�");}
+ if (!asnOrderItemService.update(new LambdaUpdateWrapper<AsnOrderItem>()
+ .eq(AsnOrderItem::getTrackCode, waitPakinItem.getTrackCode()).set(AsnOrderItem::getWorkQty, v))) {
+ throw new CoolException("鎵ц涓簱瀛樻洿鏂板け璐ワ紒锛�");
+ }
+ }
+ }
+ items.add(pakinItem);
+ }
+ if (!waitPakinItemService.saveBatch(items)) {
+ throw new CoolException("缁勬嫋鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ return pakin;
+ }
+
+ /**
+ * @author Ryan
+ * @description 缁勬嫋瑙ｇ粦
+ * @param
+ * @return
+ * @time 2025/3/29 14:42
+ */
+ @Override
+ public WaitPakin unBind(WaitPakinParam param) {
+ String barcode = param.getBarcode();
+ if (StringUtils.isNotBlank(barcode)) {
+ WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode), false);
+ if (Objects.isNull(waitPakins)) {
+ throw new CoolException("缁勬嫋涓嶅瓨鍦紒锛�");
+ }
+ List<PakinItem> paramItems = param.getItems();
+ if (Objects.isNull(paramItems) || paramItems.isEmpty()) {
+ throw new CoolException("瑙ｇ粦鐗╂枡涓嶈兘涓虹┖锛侊紒");
+ }
+ List<Long> list = paramItems.stream().map(PakinItem::getMatnrId).collect(Collectors.toList());
+ List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
+ .eq(WaitPakinItem::getPakinId, waitPakins.getId())
+ .in(WaitPakinItem::getMatnrId, list));
+ if (pakinItems.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨槑缁嗕笉瀛樺湪锛侊紒");
+ }
+ List<Long> ids = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList());
+ if (!waitPakinItemService.removeByIds(ids)) {
+ throw new CoolException("缁勬嫋鏄庣粏瑙ｇ粦澶辫触锛侊紒");
+ }
+ return waitPakins;
+ }
+ return new WaitPakin();
+ }
}
--
Gitblit v1.9.1