chengf
2026-03-27 1e20f9b6c5bc642f92f77388c5f339f05a3ae9be
service-store/src/main/java/com/java110/store/cmd/purchaseApply/ListPurchaseApplysCmd.java
@@ -29,6 +29,7 @@
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.api.purchaseApply.ApiPurchaseApplyDataVo;
import com.java110.vo.api.purchaseApply.ApiPurchaseApplyVo;
@@ -77,6 +78,7 @@
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "resOrderType", "必填,请填写订单类型");
        super.validatePageInfo(reqJson);
        super.validateProperty(cmdDataFlowContext);
    }
    @Override
@@ -137,7 +139,7 @@
        for (ApiPurchaseApplyDataVo apiPurchaseApplyDataVo : purchaseApplys) {
            List<PurchaseApplyDetailVo> applyDetailList = apiPurchaseApplyDataVo.getPurchaseApplyDetailVo();
            //todo 如果没有物品直接 跳过
            if (applyDetailList == null || applyDetailList.size() < 1) {
            if (ListUtil.isNull(applyDetailList)) {
                continue;
            }
            StringBuffer resNames = new StringBuffer();
@@ -145,34 +147,17 @@
            BigDecimal purchaseTotalPrice = new BigDecimal(0);
            Integer cursor = 0;
            for (PurchaseApplyDetailVo purchaseApplyDetailVo : applyDetailList) {
                ResourceStoreDto resourceStoreDto = new ResourceStoreDto();
                resourceStoreDto.setResId(purchaseApplyDetailVo.getResId());
                List<ResourceStoreDto> resourceStoreDtos = resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto);
                if (resourceStoreDtos == null || resourceStoreDtos.size() < 1) {
                if (purchaseApplyDetailVo.getQuantity() == null) {
                    continue;
                }
                purchaseApplyDetailVo.setTimes(resourceStoreDtos.get(0).getTimes());
                //todo 是否是固定物品
                apiPurchaseApplyDataVo.setIsFixed(resourceStoreDtos.get(0).getIsFixed());
                apiPurchaseApplyDataVo.setIsFixedName(resourceStoreDtos.get(0).getIsFixedName());
                purchaseApplyDetailVo.setIsFixed(resourceStoreDtos.get(0).getIsFixed());
                purchaseApplyDetailVo.setIsFixedName(resourceStoreDtos.get(0).getIsFixedName());
                //todo 获取仓库名称
                String shName = resourceStoreDtos.get(0).getShName();
                String shId = resourceStoreDtos.get(0).getShId();
                purchaseApplyDetailVo.setShName(shName);
                purchaseApplyDetailVo.setShId(shId);
                apiPurchaseApplyDataVo.setShId(shId);
                apiPurchaseApplyDataVo.setIsFixed(purchaseApplyDetailVo.getIsFixed());
                cursor++;
                if (applyDetailList.size() > 1 && !StringUtil.isEmpty(purchaseApplyDetailVo.getSpecName())) { //领用多种物品,且规格不为空的情况
                if (!StringUtil.isEmpty(purchaseApplyDetailVo.getSpecName())) {
                    resNames.append(cursor + ":" + purchaseApplyDetailVo.getResName() + "(" + purchaseApplyDetailVo.getSpecName() + ")      ");
                }
                if (applyDetailList.size() == 1 && !StringUtil.isEmpty(purchaseApplyDetailVo.getSpecName())) { //领用一种物品,且规格不为空的情况
                    resNames.append(purchaseApplyDetailVo.getResName() + "(" + purchaseApplyDetailVo.getSpecName() + ")");
                }
                if (applyDetailList.size() == 1 && StringUtil.isEmpty(purchaseApplyDetailVo.getSpecName())) { //领用一种物品,且规格为空的情况
                    resNames.append(purchaseApplyDetailVo.getResName());
                } else {
                    resNames.append(cursor + ":" + purchaseApplyDetailVo.getResName());
                }
                BigDecimal price = new BigDecimal(purchaseApplyDetailVo.getPrice());
                BigDecimal quantity = new BigDecimal(purchaseApplyDetailVo.getQuantity());