From 33032d320cb75854def7391026b0401f1bfb8360 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期六, 11 五月 2024 17:26:02 +0800
Subject: [PATCH] 20240511修改: 分发单优化， 分类，物品，分发单明细，采购单明细数据导入
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 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..1d9d185 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,7 +129,7 @@
+ "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());
}
@@ -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