chengf
2026-03-25 1e0e62187e2b7ff3e1fef23b182a710dc8cd76f8
service-store/src/main/java/com/java110/store/cmd/resourceStore/ImportResourceStoreCmd.java
@@ -23,13 +23,14 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.Dict.DictDto;
import com.java110.dto.Dict.DictQueryDto;
import com.java110.dto.purchaseApply.PurchaseApplyDto;
import com.java110.dto.resourceStore.ResourceStoreDto;
import com.java110.dto.resourceStoreType.ResourceStoreTypeDto;
import com.java110.dto.dict.DictDto;
import com.java110.dto.dict.DictQueryDto;
import com.java110.dto.importData.Vtil;
import com.java110.dto.purchase.PurchaseApplyDto;
import com.java110.dto.resource.ResourceStoreDto;
import com.java110.dto.resource.ResourceStoreTypeDto;
import com.java110.dto.user.UserDto;
import com.java110.entity.assetImport.ImportResourceStoreDto;
import com.java110.dto.importData.ImportResourceStoreDto;
import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.DictInnerServiceSMO;
@@ -38,12 +39,13 @@
import com.java110.po.purchase.PurchaseApplyDetailPo;
import com.java110.po.purchase.PurchaseApplyPo;
import com.java110.po.purchase.ResourceStorePo;
import com.java110.po.resourceStoreTimes.ResourceStoreTimesPo;
import com.java110.po.resourceStoreType.ResourceStoreTypePo;
import com.java110.po.resource.ResourceStoreTimesPo;
import com.java110.po.resource.ResourceStoreTypePo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -113,7 +115,7 @@
        JSONArray importResourceStoreDtos = reqJson.getJSONArray("importResourceStoreDtos");
        List<ImportResourceStoreDto> tmpImportResourceStoreDtos = JSONArray.parseArray(importResourceStoreDtos.toJSONString(), ImportResourceStoreDto.class);
        if (tmpImportResourceStoreDtos == null || tmpImportResourceStoreDtos.size() < 1) {
        if (ListUtil.isNull(tmpImportResourceStoreDtos)) {
            cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(0));
            return;
        }
@@ -150,13 +152,48 @@
            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());
            resourceStorePo.setPrice(Vtil.defaultValue(resourceStorePo.getPrice(), null));
            int flag = 0;
            if (resourceStoreDtos == null || resourceStoreDtos.size() < 1) {
                resourceStorePo.setResId(GenerateCodeFactory.getResId(GenerateCodeFactory.CODE_PREFIX_resId));
            if (ListUtil.isNull(resourceStoreDtos)) {
                resourceStorePo.setResId(resourceStoreDto.getResId() == null ? GenerateCodeFactory.getResId(GenerateCodeFactory.CODE_PREFIX_resId) : resourceStoreDto.getResId());
                flag = resourceStoreV1InnerServiceSMOImpl.saveResourceStore(resourceStorePo);
@@ -273,6 +310,9 @@
            resourceStoreTimesPo.setResCode(resourceStorePo.getResCode());
            resourceStoreTimesPo.setStoreId(resourceStorePo.getStoreId());
            resourceStoreTimesPo.setTimesId(GenerateCodeFactory.getGeneratorId("10"));
            resourceStoreTimesPo.setShId(resourceStorePo.getShId());
            resourceStoreTimesPo.setCommunityId(resourceStorePo.getCommunityId());
            resourceStoreTimesV1InnerServiceSMOImpl.saveOrUpdateResourceStoreTimes(resourceStoreTimesPo);
        }
        int saveFlag = purchaseApplyInnerServiceSMOImpl.savePurchaseApply(purchaseApplyPo);