From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 250 ++++++++++++++++++++++++++-----------------------
1 files changed, 132 insertions(+), 118 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 28d32d7..926ed70 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,9 +1,6 @@
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.manager.controller.params.PakinItem;
@@ -16,7 +13,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;
@@ -63,9 +59,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 +80,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)
@@ -107,80 +102,49 @@
List<WaitPakinItem> items = new ArrayList<>();
for (PakinItem pakinItem1 : waitPakin.getItems()) {
//涓嶈壇鏍囩缁勬墭
- if (!Objects.isNull(waitPakin.getType()) && waitPakin.getType().equals("defective")) {
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnCode, pakinItem1.getAsnCode()));
- if (Objects.isNull(orderItems) || orderItems.isEmpty()) {
- throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
- }
- for (AsnOrderItem item : orderItems) {
- WaitPakinItem pakinItem = new WaitPakinItem();
- pakinItem.setAnfme(item.getAnfme())
- .setPakinId(waitPakin1.getId())
- .setAsnId(item.getAsnId())
- .setAsnCode(item.getAsnCode())
- .setAsnItemId(item.getId())
- .setBatch(item.getSplrBatch())
- .setUnit(item.getStockUnit())
- .setFieldsIndex(item.getFieldsIndex())
- .setMatnrId(item.getMatnrId())
- .setMaktx(item.getMaktx())
- .setUpdateBy(userId)
- .setCreateBy(userId)
- .setMatnrCode(item.getMatnrCode());
- AsnOrder order = asnOrderService.getById(item.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.getTrackCode().equals(item.getTrackCode())) {
- if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) >= 0) {
- throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒");
- }
- pakinItem.setAnfme(waitPakinItem.getReceiptQty()).setTrackCode(waitPakinItem.getTrackCode());
- }
- }
- items.add(pakinItem);
- }
- } else {
- 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.getId())
- .setBatch(warehouseAreasItems.getSplrBatch())
- .setUnit(warehouseAreasItems.getStockUnit())
- .setFieldsIndex(warehouseAreasItems.getFieldsIndex())
- .setMatnrId(warehouseAreasItems.getMatnrId())
- .setMaktx(warehouseAreasItems.getMaktx())
- .setUpdateBy(userId)
- .setCreateBy(userId)
- .setMatnrCode(warehouseAreasItems.getMatnrCode());
- AsnOrder 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.getTrackCode().equals(warehouseAreasItems.getTrackCode())) {
- if (waitPakinItem.getReceiptQty() > warehouseAreasItems.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) {
- throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺涓斾笉鑳藉皬浜庨浂锛侊紒");
- }
- pakinItem.setAnfme(waitPakinItem.getReceiptQty()).setTrackCode(waitPakinItem.getTrackCode());
- }
- }
- items.add(pakinItem);
-
+ 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();
+
+ Double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
if (!waitPakinItemService.saveBatch(items)) {
throw new CoolException("缁勬墭鏄庣粏淇濆瓨澶辫触锛侊紒");
@@ -188,14 +152,14 @@
for (WaitPakinItem pakinItem : items) {
WarehouseAreasItem one = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
- .eq(WarehouseAreasItem::getTrackCode, pakinItem.getTrackCode())
- .eq(!Cools.isEmpty(pakinItem.getBatch()),WarehouseAreasItem::getSplrBatch, pakinItem.getBatch()));
+ .eq(WarehouseAreasItem::getId, pakinItem.getSource()));
if (Objects.isNull(one)) {
throw new CoolException("鏀惰揣鍖烘暟鎹敊璇紒锛�");
}
- one.setAnfme(one.getAnfme() - pakinItem.getAnfme())
- .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)) {
@@ -207,17 +171,14 @@
if (!this.updateById(waitPakin1)) {
throw new CoolException("缁勬墭鏁伴噺淇敼澶辫触锛侊紒");
}
-
- //TODO 缁勬墭瀹屾垚鍚庯紝鎵ｅ噺鏀惰揣鍖哄簱瀛�
-
return pakin;
}
/**
- * @author Ryan
- * @description 缁勬墭瑙ｇ粦
* @param
* @return
+ * @author Ryan
+ * @description 缁勬墭瑙ｇ粦
* @time 2025/3/29 14:42
*/
@Override
@@ -225,24 +186,75 @@
public synchronized WaitPakin unBind(WaitPakinParam param) {
String barcode = param.getBarcode();
if (StringUtils.isNotBlank(barcode)) {
- WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode), false);
+ WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));
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<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::getMatnrId, list));
+ .in(WaitPakinItem::getId, 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("缁勬墭鏄庣粏瑙ｇ粦澶辫触锛侊紒");
+// List<Long> ids = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList());
+// if (!waitPakinItemService.removeByIds(ids)) {
+// throw new CoolException("缁勬墭鏄庣粏瑙ｇ粦澶辫触锛侊紒");
+// }
+ 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).getId())) {
+ if (pakinItems.get(i1).getAnfme().compareTo(item.getReceiptQty()) > 0) {
+ if (item.getReceiptQty().compareTo(0.00) == 0) {
+ throw new CoolException("瑙ｇ粦鏁伴噺涓嶈兘涓洪浂锛侊紒");
+ }
+ 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("瑙ｇ粦鏁伴噺涓嶈兘澶т簬鍓╀綑鍙墽琛屾暟锛侊紒");
+ }
+
+ 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("缁勬墭鏄庣粏鏁伴噺淇敼澶辫触锛侊紒");
+ }
+ } else {
+ if (!waitPakinItemService.removeById(pakinItems.get(i1).getId())) {
+ 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("鏀惰揣鍖烘暟閲忎慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ }
+ }
+ }
+ }
+
+ double anfmes = paramItems.stream().mapToDouble(PakinItem::getReceiptQty).sum();
+// double anfmes = warehouseAreasItems.stream().mapToDouble(WarehouseAreasItem::getAnfme).sum();
+ if (waitPakins.getAnfme().compareTo(anfmes) <= 0) {
+ if (!waitPakinService.removeById(waitPakins.getId())) {
+ throw new CoolException("缁勬墭鍒犻櫎澶辫触锛侊紒");
+ }
+ } else {
+ Double anfme = Math.round((waitPakins.getAnfme() - anfmes) * 10000) / 10000.0;
+ waitPakins.setAnfme(anfme);
+ if (!waitPakinService.updateById(waitPakins)) {
+ throw new CoolException("缁勬墭鏁版嵁淇敼澶辫触锛侊紒");
+ }
}
return waitPakins;
}
@@ -266,25 +278,34 @@
if (!taskItems.isEmpty()) {
return R.error("缁勬嫋妗ｆ湁鏄庣粏浠诲姟");
}
- }
- Set<Long> sourceIds = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toSet());
+ Set<Long> sourceIds = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toSet());
- List<WarehouseAreasItem> areasItems = warehouseAreasItemService.listByIds(sourceIds);
+ List<WarehouseAreasItem> areasItems = warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>()
+ .in(WarehouseAreasItem::getId, sourceIds));
- if (areasItems.isEmpty()) {
- return R.error("鏀惰揣鍖烘暟鎹笉瀛樺湪锛侊紒");
- }
+ if (areasItems.isEmpty()) {
+ return R.error("鏀惰揣鍖烘暟鎹笉瀛樺湪锛侊紒");
+ }
- Map<Long, List<WaitPakinItem>> listMap = pakinItems.stream().collect(Collectors.groupingBy(WaitPakinItem::getSource));
- for (WarehouseAreasItem item : areasItems) {
- List<WaitPakinItem> pakin = listMap.get(item.getId());
- if (Objects.isNull(pakin)) {continue;}
- double sum = pakin.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
- item.setWorkQty(item.getWorkQty() - sum)
- .setAnfme(item.getAnfme() + sum);
- if (!warehouseAreasItemService.updateById(item)) {
- throw new CoolException("鏀惰揣鍖烘暟鎹洖婊氬け璐ワ紒锛�");
+ Map<Long, List<WaitPakinItem>> listMap = pakinItems.stream().collect(Collectors.groupingBy(WaitPakinItem::getSource));
+ for (WarehouseAreasItem item : areasItems) {
+ List<WaitPakinItem> pakin = listMap.get(item.getId());
+ if (Objects.isNull(pakin)) {
+ continue;
+ }
+ double sum = pakin.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
+ Double workQty = Math.round((item.getWorkQty() - sum) * 10000) / 10000.0;
+ item.setWorkQty(workQty);
+ if (!warehouseAreasItemService.updateById(item)) {
+ throw new CoolException("鏀惰揣鍖烘暟鎹洖婊氬け璐ワ紒锛�");
+ }
+ }
+
+ Set<Long> pakinItemIds = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toSet());
+
+ if (!waitPakinItemService.removeByIds(pakinItemIds)) {
+ throw new CoolException("鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
}
@@ -292,13 +313,6 @@
return R.error("Delete Fail");
}
- Set<Long> pakinItemIds = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toSet());
-
- if (!waitPakinItemService.removeByIds(pakinItemIds)) {
- throw new CoolException("鏄庣粏鍒犻櫎澶辫触锛侊紒");
- }
return R.ok("Delete Success").add(pakinIds);
-
-
}
}
--
Gitblit v1.9.1