From 78f44737c296af3e970de6f0f8ef2477697ee829 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 12 一月 2026 15:43:31 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 195 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 160 insertions(+), 35 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 a848234..56dd1e9 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,11 +1,9 @@
package com.vincent.rsf.server.manager.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.api.service.AgvService;
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.*;
@@ -16,7 +14,6 @@
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.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -44,6 +41,8 @@
private TaskService taskService;
@Autowired
private TaskItemService taskItemService;
+ @Autowired
+ private AgvService agvService;
/**
@@ -63,9 +62,8 @@
if (StringUtils.isBlank(waitPakin.getBarcode())) {
throw new CoolException("鍙傛暟閿欒锛氭墭鐩樼爜涓虹┖锛侊紒");
}
- List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
+// List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
- .notIn(WaitPakin::getIoStatus, asList)
.eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
if (!Objects.isNull(pakin)) {
throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶缁勬墭鍗曪細" + pakin.getCode() + "浣跨敤锛侊紒");
@@ -85,7 +83,7 @@
}
waitPakin1.setCode(ruleCode)
//鐘舵�佷慨鏀逛负鍏ュ簱涓�
- .setIoStatus(Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val))
+ .setIoStatus(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)
.setAnfme(sum)
.setUpdateBy(userId)
.setCreateBy(userId)
@@ -119,6 +117,10 @@
.setAsnCode(warehouseAreasItems.getAsnCode())
.setAsnItemId(warehouseAreasItems.getAsnItemId())
.setIsptResult(warehouseAreasItems.getIsptResult())
+ .setPlatItemId(warehouseAreasItems.getPlatItemId())
+ .setPlatOrderCode(warehouseAreasItems.getPlatOrderCode())
+ .setPlatWorkCode(warehouseAreasItems.getPlatWorkCode())
+ .setProjectCode(warehouseAreasItems.getProjectCode())
.setBatch(warehouseAreasItems.getSplrBatch())
.setUnit(warehouseAreasItems.getStockUnit())
.setFieldsIndex(warehouseAreasItems.getFieldsIndex())
@@ -127,7 +129,7 @@
.setUpdateBy(userId)
.setCreateBy(userId)
.setMatnrCode(warehouseAreasItems.getMatnrCode());
- AsnOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
+ WkOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
if (!Objects.isNull(order)) {
pakinItem.setType(null == order.getType() ? null : order.getType())
.setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()));
@@ -143,10 +145,9 @@
}
}
items.add(pakinItem);
-
}
- double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
+ Double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
if (!waitPakinItemService.saveBatch(items)) {
throw new CoolException("缁勬墭鏄庣粏淇濆瓨澶辫触锛侊紒");
@@ -158,9 +159,10 @@
if (Objects.isNull(one)) {
throw new CoolException("鏀惰揣鍖烘暟鎹敊璇紒锛�");
}
-// one.setAnfme(one.getAnfme() - pakinItem.getAnfme())
- one.setWorkQty(one.getWorkQty() + pakinItem.getAnfme() + one.getQty());
- if (one.getWorkQty() > one.getAnfme()) {
+ Double workQty = Math.round((one.getWorkQty() + pakinItem.getAnfme()) * 10000) / 10000.0;
+ Double qty = Math.round((workQty + one.getQty()) * 10000) / 10000.0;
+ one.setWorkQty(workQty);
+ if (qty.compareTo(one.getAnfme()) > 0) {
throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒");
}
if (!warehouseAreasItemService.saveOrUpdate(one)) {
@@ -172,8 +174,130 @@
if (!this.updateById(waitPakin1)) {
throw new CoolException("缁勬墭鏁伴噺淇敼澶辫触锛侊紒");
}
+ return pakin;
+ }
- //TODO 缁勬墭瀹屾垚鍚庯紝鎵ｅ噺鏀惰揣鍖哄簱瀛�
+
+
+ /**
+ * @author Munch D. Luffy
+ * @date 2026/01/09
+ * @description: PDA缁勬嫋鍚庡懠鍙獳GV
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized WaitPakin mergeItemsWcs(WaitPakinParam waitPakin, Long userId) {
+ if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
+ throw new CoolException("鍙傛暟閿欒锛氱墿鏂欒窡韪爜涓虹┖锛�");
+ }
+ if (StringUtils.isBlank(waitPakin.getBarcode())) {
+ throw new CoolException("鍙傛暟閿欒锛氭墭鐩樼爜涓虹┖锛侊紒");
+ }
+// List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
+ WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
+ .eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
+ if (!Objects.isNull(pakin)) {
+ throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶缁勬墭鍗曪細" + pakin.getCode() + "浣跨敤锛侊紒");
+ }
+ 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 waitPakin1 = new WaitPakin();
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAIT_PAKIN_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("缂栫爜瑙勫垯閿欒锛� 缂栫爜瑙勫垯銆孲YS_WAIT_PAKIN_CODE銆嶈鍒欐槸涓嶅瓨鍦�");
+ }
+ waitPakin1.setCode(ruleCode)
+ //鐘舵�佷慨鏀逛负鍏ュ簱涓�
+ .setIoStatus(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)
+ .setAnfme(sum)
+ .setUpdateBy(userId)
+ .setCreateBy(userId)
+ .setBarcode(waitPakin.getBarcode());
+ if (!this.save(waitPakin1)) {
+ throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
+ }
+ List<WaitPakinItem> items = new ArrayList<>();
+ for (PakinItem pakinItem1 : waitPakin.getItems()) {
+ //涓嶈壇鏍囩缁勬墭
+ WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem1.getId());
+ if (null == warehouseAreasItems) {
+ throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖猴紒锛�");
+ }
+ WaitPakinItem pakinItem = new WaitPakinItem();
+ pakinItem.setAnfme(warehouseAreasItems.getAnfme())
+ .setPakinId(waitPakin1.getId())
+ .setSource(warehouseAreasItems.getId())
+ .setAsnId(warehouseAreasItems.getAsnId())
+ .setAsnCode(warehouseAreasItems.getAsnCode())
+ .setAsnItemId(warehouseAreasItems.getAsnItemId())
+ .setIsptResult(warehouseAreasItems.getIsptResult())
+ .setPlatItemId(warehouseAreasItems.getPlatItemId())
+ .setPlatOrderCode(warehouseAreasItems.getPlatOrderCode())
+ .setPlatWorkCode(warehouseAreasItems.getPlatWorkCode())
+ .setProjectCode(warehouseAreasItems.getProjectCode())
+ .setBatch(warehouseAreasItems.getSplrBatch())
+ .setUnit(warehouseAreasItems.getStockUnit())
+ .setFieldsIndex(warehouseAreasItems.getFieldsIndex())
+ .setMatnrId(warehouseAreasItems.getMatnrId())
+ .setMaktx(warehouseAreasItems.getMaktx())
+ .setUpdateBy(userId)
+ .setCreateBy(userId)
+ .setMatnrCode(warehouseAreasItems.getMatnrCode());
+ WkOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
+ if (!Objects.isNull(order)) {
+ pakinItem.setType(null == order.getType() ? null : order.getType())
+ .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()));
+ }
+
+ for (PakinItem waitPakinItem : waitPakin.getItems()) {
+ if (waitPakinItem.getId().equals(warehouseAreasItems.getId())) {
+ if (waitPakinItem.getReceiptQty() > warehouseAreasItems.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) {
+ throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺涓斾笉鑳藉皬浜庨浂锛侊紒");
+ }
+ pakinItem.setAnfme(waitPakinItem.getReceiptQty())
+ .setTrackCode(waitPakinItem.getTrackCode());
+ }
+ }
+ items.add(pakinItem);
+ }
+
+ Double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
+
+ if (!waitPakinItemService.saveBatch(items)) {
+ throw new CoolException("缁勬墭鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+
+ for (WaitPakinItem pakinItem : items) {
+ WarehouseAreasItem one = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
+ .eq(WarehouseAreasItem::getId, pakinItem.getSource()));
+ if (Objects.isNull(one)) {
+ throw new CoolException("鏀惰揣鍖烘暟鎹敊璇紒锛�");
+ }
+ Double workQty = Math.round((one.getWorkQty() + pakinItem.getAnfme()) * 10000) / 10000.0;
+ Double qty = Math.round((workQty + one.getQty()) * 10000) / 10000.0;
+ one.setWorkQty(workQty);
+ if (qty.compareTo(one.getAnfme()) > 0) {
+ throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒");
+ }
+ if (!warehouseAreasItemService.saveOrUpdate(one)) {
+ throw new CoolException("鏀惰揣鍖烘墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+
+ waitPakin1.setAnfme(sum1);
+ if (!this.updateById(waitPakin1)) {
+ throw new CoolException("缁勬墭鏁伴噺淇敼澶辫触锛侊紒");
+ }
+ if (waitPakin.getAgvSign()==1) {
+ agvService.AGVBindAndInTaskStart(waitPakin, userId);
+ }
return pakin;
}
@@ -201,8 +325,8 @@
}
List<Long> list = paramItems.stream().map(PakinItem::getId).collect(Collectors.toList());
List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
- .eq(WaitPakinItem::getPakinId, waitPakins.getId())
- .in(WaitPakinItem::getSource, list));
+ .in(WaitPakinItem::getId, list)
+ );
if (pakinItems.isEmpty()) {
throw new CoolException("鏁版嵁閿欒锛氱粍鎵樻槑缁嗕笉瀛樺湪锛侊紒");
}
@@ -210,19 +334,22 @@
// if (!waitPakinItemService.removeByIds(ids)) {
// throw new CoolException("缁勬墭鏄庣粏瑙ｇ粦澶辫触锛侊紒");
// }
-
- List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.listByIds(list);
+ List<Long> list2 = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toList());
+ List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.listByIds(list2);
for (int i1 = 0; i1 < pakinItems.size(); i1++) {
for (PakinItem item : paramItems) {
- if (item.getId().equals(pakinItems.get(i1).getSource())) {
+ if (item.getId().equals(pakinItems.get(i1).getId())) {
if (pakinItems.get(i1).getAnfme().compareTo(item.getReceiptQty()) > 0) {
if (item.getReceiptQty().compareTo(0.00) == 0) {
throw new CoolException("瑙ｇ粦鏁伴噺涓嶈兘涓洪浂锛侊紒");
}
- if (item.getReceiptQty().compareTo(pakinItems.get(i1).getAnfme() - pakinItems.get(i1).getWorkQty() - pakinItems.get(i1).getQty()) > 0) {
+ Double reslt = Math.round((pakinItems.get(i1).getAnfme() - pakinItems.get(i1).getWorkQty() - pakinItems.get(i1).getQty()) * 10000) / 10000.0;
+ if (item.getReceiptQty().compareTo(reslt) > 0) {
throw new CoolException("瑙ｇ粦鏁伴噺涓嶈兘澶т簬鍓╀綑鍙墽琛屾暟锛侊紒");
}
- pakinItems.get(i1).setAnfme(pakinItems.get(i1).getAnfme() - item.getReceiptQty());
+
+ Double anfme = Math.round((pakinItems.get(i1).getAnfme() - item.getReceiptQty()) * 10000) / 10000.0;
+ pakinItems.get(i1).setAnfme(anfme);
if (!waitPakinItemService.updateById(pakinItems.get(i1))) {
throw new CoolException("缁勬墭鏄庣粏鏁伴噺淇敼澶辫触锛侊紒");
}
@@ -231,17 +358,14 @@
throw new CoolException("缁勬墭鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
}
- }
- }
- }
-
- for (int a = 0; a < paramItems.size(); a++) {
- for (int i = 0; i < warehouseAreasItems.size(); i++) {
- if (warehouseAreasItems.get(i).getId().equals(paramItems.get(a).getId())) {
- double v = warehouseAreasItems.get(i).getWorkQty() - paramItems.get(a).getReceiptQty();
- warehouseAreasItems.get(i).setWorkQty(v);
- if (!warehouseAreasItemService.updateById(warehouseAreasItems.get(i))) {
- throw new CoolException("鏀惰揣鍖烘暟閲忎慨鏀瑰け璐ワ紒锛�");
+ for (int i = 0; i < warehouseAreasItems.size(); i++) {
+ if (warehouseAreasItems.get(i).getId().equals(pakinItems.get(i1).getSource())) {
+ double v = Math.round((warehouseAreasItems.get(i).getWorkQty() - item.getReceiptQty()) * 10000) / 10000.0;
+ warehouseAreasItems.get(i).setWorkQty(v);
+ if (!warehouseAreasItemService.updateById(warehouseAreasItems.get(i))) {
+ throw new CoolException("鏀惰揣鍖烘暟閲忎慨鏀瑰け璐ワ紒锛�");
+ }
+ }
}
}
}
@@ -254,7 +378,8 @@
throw new CoolException("缁勬墭鍒犻櫎澶辫触锛侊紒");
}
} else {
- waitPakins.setAnfme(waitPakins.getAnfme() - anfmes);
+ Double anfme = Math.round((waitPakins.getAnfme() - anfmes) * 10000) / 10000.0;
+ waitPakins.setAnfme(anfme);
if (!waitPakinService.updateById(waitPakins)) {
throw new CoolException("缁勬墭鏁版嵁淇敼澶辫触锛侊紒");
}
@@ -298,8 +423,8 @@
continue;
}
double sum = pakin.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
- item.setWorkQty(item.getWorkQty() - sum)
- .setAnfme(item.getAnfme() + sum);
+ Double workQty = Math.round((item.getWorkQty() - sum) * 10000) / 10000.0;
+ item.setWorkQty(workQty);
if (!warehouseAreasItemService.updateById(item)) {
throw new CoolException("鏀惰揣鍖烘暟鎹洖婊氬け璐ワ紒锛�");
}
--
Gitblit v1.9.1