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 | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 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 c4cc34e..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
@@ -1,27 +1,50 @@
package com.consum.base.service.impl;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.utils.*;
+import com.consum.base.core.utils.CurrencyUtil;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.base.core.utils.MapUtils;
+import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.LWhFormProcureGoodsInfoParam;
import com.consum.base.pojo.LWhFormProcureParam;
import com.consum.base.pojo.LWhProcureModelParam;
import com.consum.base.pojo.excel.ProcureExcelTemplate;
import com.consum.base.pojo.query.FormProcureQry;
-import com.consum.base.service.*;
-import com.consum.model.po.*;
+import com.consum.base.service.BaseGoodsTemplateService;
+import com.consum.base.service.BaseWarehouseService;
+import com.consum.base.service.LOrgSupplierServiceImpl;
+import com.consum.base.service.LWhFormProcureGoodsService;
+import com.consum.base.service.LWhFormProcureService;
+import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.LWhProcureModelService;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LOrgSupplier;
+import com.consum.model.po.LWhFormProcure;
+import com.consum.model.po.LWhFormProcureGoods;
+import com.consum.model.po.LWhProcureModel;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.*;
/**
* @ClassName lWhFormProcureService
@@ -105,9 +128,9 @@
+ "LEFT JOIN l_wh_form_procure_goods fpg ON fp.id = fpg.WH_FORM_PROCURE_ID "
+ "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());
+ if (param.getAgencyId() != null) {
+ sql.append("and AGENCY_ID like :agencyId ");
+ paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
}
// 鍏ュ簱鍗曞彿
@@ -220,7 +243,6 @@
procureGood.setWhFormProcureId(whFormProcureId);
procureGood.setBaseCategoryId(baseCategoryId);
procureGood.setBaseGoodsTemplateId(baseGoodsTemplateId);
- // TODO 鐗╁搧鍘嗗彶鐗堟湰
procureGood.setGoodsTemplateName(procureGoodT.getGoodsTemplateName());
procureGood.setSupplier(supplier);
procureGood.setSort(i);
@@ -239,17 +261,18 @@
}
// 鏌ヨ鍨嬪彿淇℃伅
Map<String, Object> tempGoodsInfo = baseGoodsTemplateService.queryGoodsInfoByModelId(baseGoodsModelsId);
- if (tempGoodsInfo == null) {
+ if (CollectionUtils.isEmpty(tempGoodsInfo)) {
throw new RuntimeException("閲囪喘鐨勪环鍨嬪彿鏈壘鍒�");
}
String modelName = (String)tempGoodsInfo.get("modelname");
// 鏌ヨ鍨嬪彿搴撳瓨
List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
- int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseIds, baseGoodsModelsId, 1, null);
+ // 搴撳瓨鏌ヨ鎵�鏈夌被鍨嬬殑鍖呮嫭鏈烘瀯鍜岄儴闂ㄧ殑绫诲瀷
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(null, warehouseIds, baseGoodsModelsId, 1, null);
LWhProcureModel model = new LWhProcureModel();
model.setId(IdUtil.generateId());
model.setFromProcureGoodsId(fromProcureGoodsId);
- model.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
+ model.setBusinessType(WhBusinessEnum.CAIGOU.getValue());
model.setBusinessId(whFormProcureId);
model.setBaseGoodsModelsId(baseGoodsModelsId);
model.setBaseGoodsModelsName(modelName);
--
Gitblit v1.9.1