From c312a110ee4823a4a1f912a05e9648edc56f96e7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 06 六月 2025 15:48:42 +0800
Subject: [PATCH] DO 单生成出库单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 290 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 192 insertions(+), 98 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index 17ea75b..e034a1f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -6,13 +6,15 @@
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.enums.OrderType;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
+import com.vincent.rsf.server.manager.enums.POExceStatus;
import com.vincent.rsf.server.manager.enums.WaveExceStatus;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.service.*;
-import com.vincent.rsf.server.manager.utils.GroupMergeUtil;
+import com.vincent.rsf.server.manager.utils.OptimalAlgorithmUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
@@ -50,6 +52,10 @@
private WaveService waveService;
@Autowired
private WaveItemService waveItemService;
+ @Autowired
+ private OutStockItemService outStockItemService;
+ @Autowired
+ private OutStockService outStockService;
/**
@@ -60,88 +66,27 @@
* @time 2025/4/7 13:28
*/
@Transactional(rollbackFor = Exception.class)
- private void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
+ public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
AsnOrder orders = params.getOrders();
-
params.getItems().forEach(item -> {
item.put("asnId", orders.getId());
item.put("asnCode", orders.getCode());
item.put("poCode", orders.getPoCode());
item.put("createBy", loginUserId);
item.put("updateBy", loginUserId);
- if (!asnOrderItemService.fieldsSave(item)) {
+ if (!asnOrderItemService.fieldsSave(item, loginUserId)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
});
List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getAsnId, params.getOrders().getId()));
- double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ Double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
orders.setAnfme(sum);
if (!this.updateById(orders)) {
throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
}
}
-
- /**
- * @param
- * @return
- * @author Ryan
- * @description 鍒犻櫎鍘熶富鍗曞強鏄庣粏锛屽姞鍏ュ巻鍙叉。
- * @time 2025/3/19 19:53
- */
- @Transactional(rollbackFor = Exception.class)
- private void operateOrderLogs(AsnOrder asrder) throws Exception {
- if (Objects.isNull(asrder) || Objects.isNull(asrder.getId())) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
- asrder.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
-
- if (!this.updateById(asrder)) {
- throw new CoolException("鍗曟嵁鍏抽棴澶辫触锛侊紒");
- }
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, asrder.getId()));
- if (orderItems.isEmpty()) {
- throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒");
- }
-// if (Objects.isNull(asrder.getAnfme()) || asrder.getAnfme().compareTo(0.00) == 0) {
-// throw new CoolException("鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
-// }
- AsnOrder order = this.getById(asrder.getId());
- AsnOrderLog orderLog = new AsnOrderLog();
- order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
- BeanUtils.copyProperties(order, orderLog);
- orderLog.setId(null);
- orderLog.setAsnId(order.getId());
-
- if (!this.saveOrUpdate(order)) {
- throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
- orderLog.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
- if (!asnOrderLogService.save(orderLog)) {
- throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
- }
- List<AsnOrderItemLog> logs = new ArrayList<>();
- List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
- items.forEach(item -> {
- AsnOrderItemLog itemLog = new AsnOrderItemLog();
- BeanUtils.copyProperties(item, itemLog);
- itemLog.setAsnItemId(itemLog.getId())
- .setLogId(orderLog.getId())
- .setAsnId(item.getAsnId());
- logs.add(itemLog);
- });
-
- if (!asnOrderItemLogService.saveBatch(logs)) {
- throw new CoolException("閫氱煡鍗曟槑缁嗗巻鍙叉。淇濆瓨澶辫触锛侊紒");
- }
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()))) {
- throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
- }
- if (!this.removeById(asrder.getId())) {
- throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
- }
- }
/**
* @param
@@ -161,19 +106,45 @@
if (Objects.isNull(order)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- if (!order.getExceStatus().equals(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val)) {
+ if (!order.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)) {
throw new CoolException("褰撳墠鍗曟嵁鐘舵�佷负" + AsnExceStatus.getExceStatus(order.getExceStatus()) + "锛� 涓嶅彲鎵ц鍙栨秷鎿嶄綔锛侊紒");
}
- order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.val).setStatus(0);
- if (!this.saveOrUpdate(order)) {
- throw new CoolException("鍗曟嵁鍙栨秷澶辫触锛侊紒");
+ List<AsnOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, id));
+ if (!orderItems.isEmpty()) {
+ for (AsnOrderItem orderItem : orderItems) {
+ if (!Objects.isNull(orderItem.getPoDetlId())) {
+ DeliveryItem deliveryItem = deliveryItemService.getById(orderItem.getPoDetlId());
+ Double workQty = Math.round((deliveryItem.getWorkQty() - orderItem.getAnfme()) * 10000) / 10000.0;
+ deliveryItem.setWorkQty(workQty.compareTo(0.0) >= 0 ? workQty : 0);
+ if (!deliveryItemService.updateById(deliveryItem)) {
+ throw new CoolException("DO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
+ }
+
+ Delivery delivery = deliveryService.getOne(new LambdaQueryWrapper<Delivery>().eq(Delivery::getCode, orderItem.getPoCode()));
+ if (!Objects.isNull(delivery)) {
+ Double wkQty = Math.round((delivery.getWorkQty() - delivery.getAnfme()) * 10000) / 10000.0;
+ delivery.setWorkQty(wkQty.compareTo(0.0) >= 0 ? wkQty : 0).setExceStatus(POExceStatus.PO_EXCE_STATUS_UN_EXCE.val);
+ if (!deliveryService.updateById(delivery)) {
+ throw new CoolException("DO鍗曟嵁淇敼澶辫触锛侊紒");
+ }
+ }
+ }
+ }
+ }
+
+ if (!this.remove(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, id))) {
+ throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
+ }
+ if (!outStockItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, id))) {
+ throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
return R.ok("鎿嶄綔鎴愬姛");
}
/**
* @param
+ * @param loginUserId
* @return
* @author Ryan
* @description 閫氳繃DO鍗曠敓鎴愬嚭搴撳崟
@@ -181,7 +152,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R genOutStock(List<Long> ids) {
+ public R genOutStock(List<Long> ids, Long loginUserId) {
if (Objects.isNull(ids) || ids.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -190,52 +161,90 @@
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
Map<Long, List<DeliveryItem>> listMap = items.stream().collect(Collectors.groupingBy(DeliveryItem::getDeliveryId));
+ //鑾峰彇绗竴涓狪D
+ Long deliveryId = items.stream().findFirst().get().getDeliveryId();
+ Delivery delivery = deliveryService.getById(deliveryId);
+ if (Objects.isNull(delivery)) {
+ throw new CoolException("涓诲崟鎹笉瀛樺湪锛侊紒");
+ }
+ AsnOrder order = new AsnOrder();
+ BeanUtils.copyProperties(delivery, order);
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, order);
+ if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌� 銆孲YS_OUT_STOCK_CODE銆嶇紪鐮佹槸鍚﹁缃垚鍔�");
+ }
+ order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+ .setType(delivery.getType())
+ .setWkType(delivery.getWkType())
+ .setCode(ruleCode)
+ .setId(null)
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId);
+ if (!this.save(order)) {
+ throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
+ }
+
listMap.keySet().forEach(key -> {
- //TODO 鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀛樺湪锛屽瀛樺湪鍒欑疮鍔犱慨鏀瑰瓙琛紝涓嶅瓨鍦ㄦ墠鏂板缓
- Delivery delivery = deliveryService.getById(key);
- if (Objects.isNull(delivery)) {
- throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
- }
- AsnOrder order = new AsnOrder();
- BeanUtils.copyProperties(delivery, order);
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, order);
- if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
- throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌� 銆孲YS_OUT_STOCK_CODE銆嶇紪鐮佹槸鍚﹁缃垚鍔�");
- }
- order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
- .setCode(ruleCode)
- .setPoId(delivery.getId())
- .setId(null)
- .setPoCode(delivery.getCode());
- if (!this.save(order)) {
- throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
- }
+ Delivery delivery1 = deliveryService.getById(key);
List<AsnOrderItem> orderItems = new ArrayList<>();
listMap.get(key).forEach(item -> {
AsnOrderItem orderItem = new AsnOrderItem();
+ Double anfme = Math.round((item.getAnfme() - item.getWorkQty() - item.getQty()) * 10000) / 10000.0;
BeanUtils.copyProperties(item, orderItem);
orderItem.setId(null)
- .setPoCode(order.getPoCode())
+ .setPoCode(delivery1.getCode())
.setMaktx(item.getMaktx())
.setMatnrCode(item.getMatnrCode())
.setFieldsIndex(item.getFieldsIndex())
+ .setAnfme(anfme)
+ .setWorkQty(0.0)
.setAsnId(order.getId())
.setAsnCode(order.getCode())
+ .setStockUnit(item.getUnit())
+ .setPurUnit(item.getUnit())
+ .setPlatWorkCode(item.getPlatWorkCode())
+ .setPlatOrderCode(item.getPlatOrderCode())
+ .setProjectCode(item.getProjectCode())
.setPlatItemId(item.getPlatItemId())
+ .setFieldsIndex(item.getFieldsIndex())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
.setPoDetlId(item.getId());
orderItems.add(orderItem);
+
+ if (!deliveryItemService.update(new LambdaUpdateWrapper<DeliveryItem>()
+ .set(DeliveryItem::getWorkQty, item.getAnfme())
+ .eq(DeliveryItem::getId, item.getId()))) {
+ throw new CoolException("DO鍗曟槑缁嗕慨鏀瑰け璐ワ紒锛�");
+ }
});
- double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
- //淇敼璁″垝鏁伴噺
- order.setAnfme(sum);
- if (!this.saveOrUpdate(order)) {
- throw new CoolException("涓诲崟鏁伴噺淇敼澶辫触锛侊紒");
- }
+ Double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+
if (!asnOrderItemService.saveBatch(orderItems)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
+
+ Short exceStatus = POExceStatus.PO_EXCE_STATUS_SECTION_DONE.val;
+ if (delivery1.getAnfme().compareTo(sum) <= 0) {
+ exceStatus = AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val;
+ }
+
+ if (!deliveryService.update(new LambdaUpdateWrapper<Delivery>()
+ .set(Delivery::getExceStatus, exceStatus)
+ .set(Delivery::getWorkQty, sum)
+ .eq(Delivery::getId, key))) {
+ throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
+ }
});
+
+ Double sum = items.stream().mapToDouble(DeliveryItem::getAnfme).sum();
+ //淇敼璁″垝鏁伴噺
+ order.setAnfme(sum).setWorkQty(0.0);
+ if (!this.saveOrUpdate(order)) {
+ throw new CoolException("涓诲崟鏁伴噺淇敼澶辫触锛侊紒");
+ }
+
return R.ok();
}
@@ -290,12 +299,97 @@
throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
}
+ for (int i = 0; i < orderItems.size(); i++) {
+ orderItems.get(i).setWorkQty(orderItems.get(i).getAnfme());
+ }
+
+ if (!asnOrderItemService.saveOrUpdateBatch(orderItems)) {
+ throw new CoolException("鍑哄簱鍗曟墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
+ }
+
+ double sum2 = orderItems.stream().mapToDouble(AsnOrderItem::getWorkQty).sum();
if (!this.update(new LambdaUpdateWrapper<AsnOrder>()
+ .set(AsnOrder::getWaveId, wave.getId())
+ .set(AsnOrder::getWorkQty, sum2)
.set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WAVE.val)
.in(AsnOrder::getId, ids))) {
throw new CoolException("鎵ц鐘舵�佷慨鏀逛慨鏀瑰け璐ワ紒锛�");
}
return R.ok("鎿嶄綔瀹屾垚锛侊紒");
+ }
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 淇濆瓨鍑哄簱涓诲崟鍙婃槑缁�
+ * @time 2025/4/29 13:47
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R saveOutStock(AsnOrderAndItemsParams params, Long loginUserId) {
+ if (Objects.isNull(params.getOrders())) {
+ throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
+ }
+ AsnOrder orders = params.getOrders();
+ if (Objects.isNull(orders)) {
+ throw new CoolException("鍗曟嵁涓嶈兘涓虹┖锛侊紒");
+ }
+ if (StringUtils.isBlank(orders.getWkType())) {
+ throw new CoolException("涓氬姟绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, orders);
+ if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌ャ�孲YS_OUT_STOCK_CODE銆嶆槸鍚﹁缃纭紒锛�");
+ }
+ orders.setCode(ruleCode)
+ .setType(OrderType.ORDER_OUT.type)
+ .setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId);
+ if (!this.save(orders)) {
+ throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
+ }
+ if (params.getItems().isEmpty()) {
+ throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕笉鑳戒负绌猴紒锛�");
+ }
+ params.setOrders(orders);
+ try {
+ svaeOrUpdateOrderItem(params, loginUserId);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ return R.ok();
+ }
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 淇敼涓诲崟鍙婃槑缁�
+ * @time 2025/4/29 13:47
+ */
+ @Override
+ public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) {
+ AsnOrder orders = params.getOrders();
+ if (Objects.isNull(orders)) {
+ throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(orders.getId())) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹甀D涓嶈兘涓虹┖锛侊紒");
+ }
+ if (!this.updateById(orders)) {
+ throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
+ }
+ if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
+ throw new CoolException("鏄庣粏鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ try {
+ svaeOrUpdateOrderItem(params, loginUserId);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ return R.ok();
}
/**
@@ -321,7 +415,7 @@
.setWaveCode(wave.getCode());
items.add(item);
});
- List<WaveItem> waveItems = GroupMergeUtil.groupAndMerge(items,
+ List<WaveItem> waveItems = OptimalAlgorithmUtil.groupAndMerge(items,
(p1, p2) -> new WaveItem(
p1.getWaveId(),
p1.getWaveCode(),
@@ -336,7 +430,7 @@
p1.getUnit(),
p1.getTrackCode(),
p1.getFieldsIndex(),
- p1.getAnfme() + p2.getAnfme(),
+ Math.round((p1.getAnfme() + p2.getAnfme()) * 10000) / 10000.0,
p1.getWorkQty(),
p1.getTenantId(),
p1.getStatus(),
--
Gitblit v1.9.1