From fae8a9349499cd045bc73e8fd22aeae52618a46c Mon Sep 17 00:00:00 2001
From: WangHan <wwh_work@126,com>
Date: 星期四, 19 十二月 2024 10:02:02 +0800
Subject: [PATCH] 采购明细查询修改，查询本级及以下
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java
index 46414cc..47be0cc 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java
@@ -129,8 +129,8 @@
+ "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 ");
- paramts.put("agencyId", param.getAgencyId());
+ sql.append("and AGENCY_ID like :agencyId ");
+ paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
}
// 鍏ュ簱鍗曞彿
@@ -243,7 +243,6 @@
procureGood.setWhFormProcureId(whFormProcureId);
procureGood.setBaseCategoryId(baseCategoryId);
procureGood.setBaseGoodsTemplateId(baseGoodsTemplateId);
- // TODO 鐗╁搧鍘嗗彶鐗堟湰
procureGood.setGoodsTemplateName(procureGoodT.getGoodsTemplateName());
procureGood.setSupplier(supplier);
procureGood.setSort(i);
@@ -262,7 +261,7 @@
}
// 鏌ヨ鍨嬪彿淇℃伅
Map<String, Object> tempGoodsInfo = baseGoodsTemplateService.queryGoodsInfoByModelId(baseGoodsModelsId);
- if (tempGoodsInfo == null) {
+ if (CollectionUtils.isEmpty(tempGoodsInfo)) {
throw new RuntimeException("閲囪喘鐨勪环鍨嬪彿鏈壘鍒�");
}
String modelName = (String)tempGoodsInfo.get("modelname");
--
Gitblit v1.9.1