From b2358fc44148073645def4e723c8153a98a701da Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 24 三月 2026 09:29:32 +0800
Subject: [PATCH] 导入测试
---
service-store/src/main/java/com/java110/store/cmd/resourceStore/ImportResourceStoreCmd.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/resourceStore/ImportResourceStoreCmd.java b/service-store/src/main/java/com/java110/store/cmd/resourceStore/ImportResourceStoreCmd.java
index a0ec211..0bb74dd 100644
--- a/service-store/src/main/java/com/java110/store/cmd/resourceStore/ImportResourceStoreCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/resourceStore/ImportResourceStoreCmd.java
@@ -151,14 +151,47 @@
resourceStorePo.setRstId(getRstId(importResourceStoreDto.getRstName(), storeId));
resourceStorePo.setParentRstId(resourceStorePo.getRstId());
resourceStorePo.setPrice(importResourceStoreDto.getPrice());
- resourceStorePo.setUnitCode(getUnitCode(importResourceStoreDto.getUnitCode(), dictDtos));
+ resourceStorePo.setUnitCode(importResourceStoreDto.getUnitCode());
resourceStorePo.setRemark(importResourceStoreDto.getRemark());
resourceStorePo.setWarningStock(importResourceStoreDto.getWarningStock());
resourceStorePo.setAveragePrice(importResourceStoreDto.getPrice());
resourceStorePo.setCommunityId(reqJson.getString("communityId"));
+
+ resourceStorePo.setCommunityName(importResourceStoreDto.getCommunityName());
+ resourceStorePo.setTripleWaybillNo(importResourceStoreDto.getTripleWaybillNo());
+ resourceStorePo.setSystemName(importResourceStoreDto.getSystemName());
+ resourceStorePo.setModel(importResourceStoreDto.getModel());
+ resourceStorePo.setBrand(importResourceStoreDto.getBrand());
+ resourceStorePo.setSupplier(importResourceStoreDto.getSupplier());
+ resourceStorePo.setRstName(importResourceStoreDto.getRstName());
+// 棰勫喅绠楃浉鍏冲瓧娈佃祴鍊�
+ resourceStorePo.setBudgetApproval(importResourceStoreDto.getBudgetApproval());
+ resourceStorePo.setBudgetQuantity(importResourceStoreDto.getBudgetQuantity());
+ resourceStorePo.setBudgetUnitPrice(importResourceStoreDto.getBudgetUnitPrice());
+ resourceStorePo.setBudgetAmount(importResourceStoreDto.getBudgetAmount());
+
+// 鏁伴噺鐩稿叧瀛楁璧嬪��
+ resourceStorePo.setApplyQuantityTotal(importResourceStoreDto.getApplyQuantityTotal());
+ resourceStorePo.setPurchaseQuantityTotal(importResourceStoreDto.getPurchaseQuantityTotal());
+ resourceStorePo.setActualDeliveryQuantity(importResourceStoreDto.getActualDeliveryQuantity());
+ resourceStorePo.setTotalReturnQuantity(importResourceStoreDto.getTotalReturnQuantity());
+
+// 閲戦鐩稿叧瀛楁璧嬪��
+ resourceStorePo.setPayableAmountTotal(importResourceStoreDto.getPayableAmountTotal());
+ resourceStorePo.setPaidAmountTotal(importResourceStoreDto.getPaidAmountTotal());
+ resourceStorePo.setUnpaidAmountTotal(importResourceStoreDto.getUnpaidAmountTotal());
+ resourceStorePo.setPayableAmount(importResourceStoreDto.getPayableAmount());
+ resourceStorePo.setPaidAmount(importResourceStoreDto.getPaidAmount());
+ resourceStorePo.setUnpaidAmount(importResourceStoreDto.getUnpaidAmount());
+
+// 鍏朵粬鐗规畩瀛楁璧嬪��
+ resourceStorePo.setIsOccurred(importResourceStoreDto.getIsOccurred());
+ resourceStorePo.setSupplier1(importResourceStoreDto.getSupplier1());
+ resourceStorePo.setSupplier2(importResourceStoreDto.getSupplier2());
+ resourceStorePo.setSupplier3(importResourceStoreDto.getSupplier3());
int flag = 0;
if (ListUtil.isNull(resourceStoreDtos)) {
- resourceStorePo.setResId(GenerateCodeFactory.getResId(GenerateCodeFactory.CODE_PREFIX_resId));
+ resourceStorePo.setResId(resourceStoreDto.getResId() == null ? GenerateCodeFactory.getResId(GenerateCodeFactory.CODE_PREFIX_resId) : resourceStoreDto.getResId());
flag = resourceStoreV1InnerServiceSMOImpl.saveResourceStore(resourceStorePo);
--
Gitblit v1.8.0