| | |
| | | + "LEFT JOIN l_wh_procure_model pm ON pm.FROM_PROCURE_GOODS_ID = fpg.id WHERE pm.BUSINESS_TYPE = 1 "); |
| | | // 只查询本机构的采购单 |
| | | if (param.getAgencyId() != null) { |
| | | sql.append("and fp.AGENCY_ID like :agencyId "); |
| | | sql.append("and fp.AGENCY_ID = :agencyId "); |
| | | paramts.put("agencyId", param.getAgencyId()); |
| | | } |
| | | |
| | |
| | | procureGood.setWhFormProcureId(whFormProcureId); |
| | | procureGood.setBaseCategoryId(baseCategoryId); |
| | | procureGood.setBaseGoodsTemplateId(baseGoodsTemplateId); |
| | | // TODO 物品历史版本 |
| | | procureGood.setGoodsTemplateName(procureGoodT.getGoodsTemplateName()); |
| | | procureGood.setSupplier(supplier); |
| | | procureGood.setSort(i); |
| | |
| | | } |
| | | // 查询型号信息 |
| | | Map<String, Object> tempGoodsInfo = baseGoodsTemplateService.queryGoodsInfoByModelId(baseGoodsModelsId); |
| | | if (tempGoodsInfo == null) { |
| | | if (CollectionUtils.isEmpty(tempGoodsInfo)) { |
| | | throw new RuntimeException("采购的价型号未找到"); |
| | | } |
| | | String modelName = (String)tempGoodsInfo.get("modelname"); |