From ebffcb0b8d434096e14eeb9abc757d1c7b24c02f Mon Sep 17 00:00:00 2001
From: zengxiangping <318732054@qq.com>
Date: Fri, 19 Apr 2024 16:16:30 +0800
Subject: [PATCH] 出入库单导入修改
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java | 7 +++++++
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentDetailServiceImpl.java | 3 +++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java
index 07a5401..fc395ac 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java
@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.monitor4all.logRecord.annotation.OperationLog;
import cn.monitor4all.logRecord.context.LogRecordContext;
+import org.springframework.util.CollectionUtils;
/**
* @Description: 入库单详情
@@ -156,10 +157,16 @@ public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, R
@Override
@Transactional(rollbackFor = Exception.class)
public void importFinishedProduct(List<ReceiptDetail> receiptDetailList) {
+ if (CollectionUtils.isEmpty(receiptDetailList)) {
+ throw new JeecgBootException("导入信息为空");
+ }
+ BigDecimal totalQty = receiptDetailList.stream().map(i -> i.getQty()).reduce(BigDecimal.ZERO, BigDecimal::add);
ReceiptHeader receiptHeader = new ReceiptHeader();
receiptHeader.setType(QuantityConstant.RECEIPT_BILL_TYPE_QTR);
receiptHeader.setCompanyCode(QuantityConstant.DEFAULT_COMPANY);
receiptHeader.setWarehouseCode(QuantityConstant.DEFAULT_WAREHOUSE);
+ receiptHeader.setTotallines(receiptDetailList.size());
+ receiptHeader.setTotalqty(totalQty);
Result<ReceiptHeader> rs1 = receiptHeaderService.saveReceiptHeader(receiptHeader);
if (rs1.isSuccess()) {
receiptHeader = rs1.getResult();
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentDetailServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentDetailServiceImpl.java
index 569a34f..e965db4 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentDetailServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentDetailServiceImpl.java
@@ -160,6 +160,9 @@ public class ShipmentDetailServiceImpl extends ServiceImpl<ShipmentDetailMapper,
@Override
@Transactional(rollbackFor = Exception.class)
public void importFinishedProduct(List<ShipmentDetail> shipmentDetailList) {
+ if (CollectionUtils.isEmpty(shipmentDetailList)) {
+ throw new JeecgBootException("导入信息为空");
+ }
List<String> zoneCodeList = shipmentDetailList.stream().map(i -> i.getZoneCode()).distinct().collect(Collectors.toList());
if (CollectionUtils.isEmpty(zoneCodeList)) {
throw new JeecgBootException("出库单导入失败，库区没有填写");
--
libgit2 0.22.2