From 122f6d1db1e0af5ede6f96cd390f393e5f222e99 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 12 十二月 2023 11:33:42 +0800
Subject: [PATCH] feat: bug修复
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 293 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 192 insertions(+), 101 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
index 24988ac..0d2a6c6 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
@@ -1,10 +1,13 @@
package com.consum.base.service.impl;
+import static com.walker.db.Sorts.DESC;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
+import java.util.Objects;
+import java.util.stream.Collectors;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
@@ -15,6 +18,8 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.type.CategoryType;
+import com.consum.base.core.type.TransferBusinessType;
import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
@@ -22,22 +27,22 @@
import com.consum.base.pojo.LWhFormTransferGoodsInfoParam;
import com.consum.base.pojo.LWhProcureModelUserParam;
import com.consum.base.pojo.LWhTransferModelParam;
+import com.consum.base.pojo.dto.GoodModelInfoDTO;
import com.consum.base.pojo.excel.TransferExcelTemplate;
import com.consum.base.pojo.query.TransferQry;
import com.consum.base.pojo.request.LWhFormTransferParam;
import com.consum.base.pojo.response.DepartGoodsUseInfo;
-import com.consum.base.pojo.response.FormTransferGoodsVO;
import com.consum.base.pojo.response.GoodsModelVO;
+import com.consum.base.pojo.response.GoodsTemplateInfoVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.service.BaseWarehouseManagerService;
import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.FinSysTenantServiceImpl;
-import com.consum.base.service.LWhFormOutputServiceImpl;
+import com.consum.base.service.FinSysTenantService;
import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
import com.consum.base.service.LWhProcureModelUserRecordService;
-import com.consum.base.service.LWhProcureModelUserServiceImpl;
+import com.consum.base.service.LWhProcureModelUserService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.BaseWarehouseManager;
import com.consum.model.po.FinSysTenant;
@@ -47,6 +52,7 @@
import com.consum.model.po.LWhProcureModelUser;
import com.consum.model.po.LWhProcureModelUserRecord;
import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
@@ -63,26 +69,24 @@
@Autowired
private CodeGeneratorService codeGeneratorService;
@Autowired
- private FinSysTenantServiceImpl finSysTenantService;
+ private FinSysTenantService finSysTenantService;
@Autowired
private LWhGoodsService lWhGoodsService;
@Autowired
private LWhProcureModelService lWhProcureModelService;
@Autowired
- private LWhFormOutputServiceImpl lWhFormOutputService;
- @Autowired
private BaseGoodsModelsServiceImpl baseGoodsModelsService;
@Autowired
- private LWhProcureModelUserServiceImpl lWhProcureModelUserService;
+ private LWhProcureModelUserService lWhProcureModelUserService;
@Autowired
private LWhProcureModelUserRecordService lWhProcureModelUserRecordService;
@Autowired
private BaseWarehouseManagerService baseWarehouseManagerService;
- private static String QUERY_FORM_TRANSFER_LIST =
- "SELECT ft.* FROM l_wh_form_transfer ft " + "left join L_WH_PROCURE_MODEL pm on pm.BUSINESS_ID = ft.id "
- + "LEFT JOIN BASE_GOODS_MODELS bgm ON pm.BASE_GOODS_MODELS_ID=bgm.ID "
- + "LEFT JOIN BASE_GOODS_TEMPLATE bgt ON bgm.GOODS_TEMPLATES_ID=bgt.id WHERE 1 = 1 ";
+ private static final String QUERY_FORM_TRANSFER_LIST = "SELECT DISTINCT ft.* FROM l_wh_form_transfer ft "
+ + "left join L_WH_PROCURE_MODEL pm on pm.BUSINESS_ID = ft.id "
+ + "LEFT JOIN BASE_GOODS_MODELS bgm ON pm.BASE_GOODS_MODELS_ID=bgm.ID "
+ + "LEFT JOIN BASE_GOODS_TEMPLATE bgt ON bgm.GOODS_TEMPLATES_ID=bgt.id WHERE 1 = 1 ";
/**
* @Description 鏂板
@@ -97,23 +101,20 @@
lWhFormTransfer.setId(lWhFormTransferId);
Integer businessType = param.getTransferBusinessType();
- // 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
- // TODO 鏋氫妇瀛楀吀
+ // 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂
lWhFormTransfer.setBusinessType(businessType);
CodeGeneratorEnum codeGeneratorEnum = null;
- if (businessType == 0) {
+ if (businessType == TransferBusinessType.STOCK_TRANSFER.getValue()) {
codeGeneratorEnum = CodeGeneratorEnum.Transfer;
- } else if (businessType == 1) {
+ } else if (businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue()) {
codeGeneratorEnum = CodeGeneratorEnum.Distribute;
- } else if (businessType == 2) {
- codeGeneratorEnum = CodeGeneratorEnum.GOBACK;
}
lWhFormTransfer.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(codeGeneratorEnum));
Long warehouseId = param.getInWarehouseId();
// 璋冩嫧绫诲瀷鍗曟嵁
- if (businessType == 0) {
+ if (businessType == TransferBusinessType.STOCK_TRANSFER.getValue()) {
// 鍏ュ簱浠撳簱涓哄綋鍓嶇敤鎴风殑榛樿浠撳簱
String tenantId = sysInfo.getTenantId();
String tenantName = sysInfo.getTenantName();
@@ -128,42 +129,40 @@
lWhFormTransfer.setInAgencyName(tenantName);
}
// 褰撲笟鍔＄被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
- if (businessType == 1) {
+ if (businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue()) {
// 閮ㄩ棬鍒嗗彂绫诲瀷 鍑哄簱浠撳簱绫诲瀷0鏈烘瀯1閮ㄩ棬
// 浠庡綋鍓嶇櫥褰曞簱绠′汉浠庡簱涓嚭搴擄紝鍏ュ埌鎵�閫夐儴闂ㄧ殑涓�
// 鏌ヨ搴撶鍛樹俊鎭拰鐩稿叧浠撳簱
- Long id = sysInfo.getId();
+ Long sysUserId = sysInfo.getSysUserId();
BaseWarehouseManager manager = new BaseWarehouseManager();
- manager.setManagerId(id);
- List<BaseWarehouseManager> managerList = baseWarehouseManagerService.selectAll(manager);
+ manager.setManagerId(sysUserId);
+ List<BaseWarehouseManager> managerList = baseWarehouseManagerService.select(manager);
if (CollectionUtils.isEmpty(managerList)) {
log.error("璇ョ敤鎴蜂笉鏄簱绠″憳");
throw new Exception("璇ョ敤鎴蜂笉鏄簱绠″憳");
}
- Optional<BaseWarehouseManager> first = managerList.stream().findFirst();
- if (first.isPresent()) {
- BaseWarehouseManager baseWarehouseManager = first.get();
- Long baseWarehouseId = baseWarehouseManager.getBaseWarehouseId();
- BaseWarehouse baseWarehouse = new BaseWarehouse();
- baseWarehouse.setId(baseWarehouseId);
- BaseWarehouse warehouse = baseWarehouseService.get(baseWarehouse);
+ BaseWarehouseManager baseWarehouseManager = managerList.stream().findFirst().orElse(null);
+ Long baseWarehouseId = baseWarehouseManager.getBaseWarehouseId();
+ BaseWarehouse baseWarehouse = new BaseWarehouse();
+ baseWarehouse.setId(baseWarehouseId);
+ BaseWarehouse warehouse = baseWarehouseService.get(baseWarehouse);
- lWhFormTransfer.setInWarehouseType(1);
- lWhFormTransfer.setInWarehouseId(param.getDepartmentId());
- lWhFormTransfer.setInWarehouseName(param.getDepartmentName());
- lWhFormTransfer.setInOperatorName(param.getOperatorName());
- lWhFormTransfer.setInTime(param.getCreateTime());
+ lWhFormTransfer.setInWarehouseType(1);
+ lWhFormTransfer.setInWarehouseId(param.getDepartmentId());
+ lWhFormTransfer.setInWarehouseName(param.getDepartmentName());
+ lWhFormTransfer.setInOperatorName(param.getOperatorName());
+ lWhFormTransfer.setInTime(param.getCreateTime());
- lWhFormTransfer.setOutWarehouseType(0);
- lWhFormTransfer.setOutWarehouseId(warehouse.getId());
- lWhFormTransfer.setOutWarehouseName(warehouse.getWarehouseName());
+ lWhFormTransfer.setOutWarehouseType(0);
+ lWhFormTransfer.setOutWarehouseId(warehouse.getId());
+ lWhFormTransfer.setOutWarehouseName(warehouse.getWarehouseName());
- lWhFormTransfer.setOutOperatorId(sysInfo.getId());
- lWhFormTransfer.setOutOperatorName(sysInfo.getUserName());
- lWhFormTransfer.setOutputTime(param.getCreateTime());
- lWhFormTransfer.setTel(param.getTel());
- }
+ lWhFormTransfer.setOutOperatorId(sysInfo.getId());
+ lWhFormTransfer.setOutOperatorName(sysInfo.getUserName());
+ lWhFormTransfer.setOutputTime(param.getCreateTime());
+ lWhFormTransfer.setTel(param.getTel());
+
}
// 鏍规嵁鏈烘瀯id鏌ヨ璋冩嫧鏈烘瀯
@@ -188,6 +187,23 @@
// 2.鏂板鐗╁搧鍨嬪彿璁板綍
List<LWhFormTransferGoodsInfoParam> transferGoods = param.getTransferGoods();
List<LWhProcureModel> modelList = new ArrayList<>();
+
+ // 鍒ゆ柇娣诲姞涓�娆′娇鐢ㄤ汉璁板綍
+ List<LWhFormTransferGoodsInfoParam> recordType = transferGoods.stream()
+ .filter(
+ item -> businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue() && item.getModels().stream()
+ .anyMatch(model -> baseGoodsModelsService.queryGoodsModelInfo(model.getBaseGoodsModelsId()).stream()
+ .findFirst().orElse(null).get("type").equals(CategoryType.TYPE_A.getValue())))
+ .collect(Collectors.toList());
+ LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
+ if (!CollectionUtils.isEmpty(recordType)) {
+ lWhProcureModelUserRecord.setId(IdUtil.generateId());
+ lWhProcureModelUserRecord.setTransBusinessId(lWhFormTransferId);
+ lWhProcureModelUserRecord.setOperatorId(sysInfo.getId());
+ lWhProcureModelUserRecord.setOperatorName(sysInfo.getUserName());
+ lWhProcureModelUserRecord.setDealTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+ lWhProcureModelUserRecordService.insert(lWhProcureModelUserRecord);
+ }
for (LWhFormTransferGoodsInfoParam transferGoodsInfo : transferGoods) {
for (LWhTransferModelParam model : transferGoodsInfo.getModels()) {
LWhProcureModel lWhProcureModel = new LWhProcureModel();
@@ -195,13 +211,13 @@
// 璋冩嫧涓氬姟绫诲瀷杞崲鍒扮墿鍝佺被鍨�
// 鐗╁搧绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂
Long baseGoodsModelsId = model.getBaseGoodsModelsId();
- if (businessType == 0) {
+ if (businessType == TransferBusinessType.STOCK_TRANSFER.getValue()) {
lWhProcureModel.setBusinessType(2);
// 鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
+ int goodsNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
}
- if (businessType == 1) {
+ if (businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue()) {
lWhProcureModel.setBusinessType(4);
}
lWhProcureModel.setCounts(model.getCounts());
@@ -221,14 +237,8 @@
// 3.褰撲笟鍔＄被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
// 鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂
// 閮ㄩ棬鍒嗗彂绫诲瀷
- if (businessType == 1 && "A".equals(baseModelMap.get("type"))) {
- LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
- lWhProcureModelUserRecord.setId(IdUtil.generateId());
- lWhProcureModelUserRecord.setTransBusinessId(lWhFormTransferId);
- lWhProcureModelUserRecord.setOperatorId(sysInfo.getId());
- lWhProcureModelUserRecord.setOperatorName(sysInfo.getUserName());
- lWhProcureModelUserRecordService.insert(lWhProcureModelUserRecord);
-
+ if (businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue()
+ && CategoryType.TYPE_A.getValue().equals(baseModelMap.get("type"))) {
List<LWhProcureModelUser> procureModelUserList = Lists.newArrayList();
for (LWhProcureModelUserParam lWhProcureModelUserParam : model.getProcureModelUserList()) {
LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
@@ -248,7 +258,6 @@
log.error("鏂板鐗╁搧浣跨敤淇℃伅澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
-
}
modelList.add(lWhProcureModel);
@@ -285,6 +294,11 @@
sql.append("AND bgt.GOODS_NAME LIKE :goodsTemplateName ");
paramts.put("goodsTemplateName",
StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ }
+ // 鐗╁搧id
+ if (param.getGoodsTemplateId() != null) {
+ sql.append("AND bgt.id = :goodsTemplateId ");
+ paramts.put("goodsTemplateId", param.getGoodsTemplateId());
}
// 璋冩嫧鏈烘瀯
if (param.getOutAgencyId() != null) {
@@ -325,9 +339,9 @@
paramts.put("inTimeEnd", param.getEndTime() * 1000000 + 240000);
}
// 鍒嗗彂閮ㄩ棬
- if (param.getInWarehouseId() != null) {
+ if (param.getDepartmentId() != null) {
sql.append("and ft.IN_WAREHOUSE_ID = :inWarehouseId ");
- paramts.put("inWarehouseId", param.getInWarehouseId());
+ paramts.put("inWarehouseId", param.getDepartmentId());
}
sql.append(" ORDER BY ft.CREATE_TIME DESC");
@@ -350,45 +364,53 @@
result.setDepartmentName(lWhFormTransfer.getInWarehouseName());
}
- String sql = "SELECT bgt.id, CATEGORY_ID, CATEGORY_NAME, GOODS_NAME,bgt.CLASSIFICATION type "
- + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
- + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
- + "WHERE pm.BUSINESS_ID =:id GROUP BY bgt.id ";
- Map<String, Object> paramMap = new HashMap<>();
- paramMap.put("id", result.getId());
- List<Map<String, Object>> procureModelList = lWhFormOutputService.select(sql, paramMap, new MapperUtil());
+ List<GoodModelInfoDTO> goodsModelInfo =
+ lWhProcureModelService.getGoodsModelListByBusinessId(result.getId(), null);
+ if (CollectionUtils.isEmpty(goodsModelInfo)) {
+ return result;
+ }
- String queryRecord =
- "SELECT * FROM l_wh_procure_model_user_record where TRANS_BUSINESS_ID = :id order by DEAL_TIME desc limit 1";
- LWhProcureModelUserRecord lWhProcureModelUserRecord =
- lWhProcureModelUserRecordService.get(queryRecord, paramMap, new LWhProcureModelUserRecord());
- List<FormTransferGoodsVO> formTransferGoods = Lists.newArrayList();
- for (Map<String, Object> map : procureModelList) {
- FormTransferGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormTransferGoodsVO.class);
- Long baseGoodsTemplateId = procureTemplateInfoVO.getId();
- // 鏌ヨ鍨嬪彿鏁伴噺
- List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
- String sql2 = "SELECT pm.id,pm.BASE_GOODS_MODELS_NAME,bgm.UNIT,COUNTS,total_amount "
- + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
- + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
- + "WHERE pm.BUSINESS_ID =:id and bgt.id =:baseGoodsTemplateId";
- Map<String, Object> goodsModelParamMap = new HashMap<>();
- goodsModelParamMap.put("id", result.getId());
- goodsModelParamMap.put("baseGoodsTemplateId", baseGoodsTemplateId);
- List<Map<String, Object>> modelList =
- lWhFormOutputService.select(sql2, goodsModelParamMap, new MapperUtil());
- modelList.forEach(item -> {
- GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class);
- Integer businessType = result.getBusinessType();
- String type = procureTemplateInfoVO.getType();
+ Map<Long, List<GoodModelInfoDTO>> collect =
+ goodsModelInfo.stream().filter(Objects::nonNull).filter(dto -> dto.getBaseGoodsTemplateId() != null)
+ .collect(Collectors.groupingBy(GoodModelInfoDTO::getBaseGoodsTemplateId));
+ List<GoodsTemplateInfoVO> goodsTemplateInfoList = Lists.newArrayList();
+ for (Map.Entry<Long, List<GoodModelInfoDTO>> entry : collect.entrySet()) {
+ List<GoodModelInfoDTO> value = entry.getValue();
+ GoodModelInfoDTO goodModelInfoDTO = value.stream().findFirst().orElse(null);
+ GoodsTemplateInfoVO goodsTemplateInfoVO = new GoodsTemplateInfoVO();
+ if (goodModelInfoDTO != null) {
+ goodsTemplateInfoVO.setId(goodModelInfoDTO.getId());
+ goodsTemplateInfoVO.setCategoryName(goodModelInfoDTO.getCategoryName());
+ goodsTemplateInfoVO.setGoodsName(goodModelInfoDTO.getBaseGoodsName());
+ goodsTemplateInfoVO.setType(goodModelInfoDTO.getType());
+ }
+
+ List<GoodsModelVO> goodsModelList = Lists.newArrayList();
+ for (GoodModelInfoDTO goodModelInfo : value) {
+ GoodsModelVO goodsModelVO = new GoodsModelVO();
+ goodsModelVO.setId(goodModelInfo.getId());
+ goodsModelVO.setBaseGoodsModelsName(goodModelInfo.getBaseGoodsModelsName());
+ goodsModelVO.setUnit(goodModelInfo.getUnit());
+ goodsModelVO.setCounts(goodModelInfo.getCounts());
+ goodsModelVO.setTotalAmount(CurrencyUtil.convertFenToYuan(goodModelInfo.getTotalAmount()));
// 閮ㄩ棬鍒嗗彂闇�瑕佹煡璇娇鐢ㄤ俊鎭�
- if (businessType == 1 && "A".equals(type)) {
+ Integer businessType = result.getBusinessType();
+ String type = goodsTemplateInfoVO.getType();
+ if (businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue()
+ && CategoryType.TYPE_A.getValue().equals(type)) {
Long procureModelId = goodsModelVO.getId();
+
+ LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
+ lWhProcureModelUserRecord.setTransBusinessId(id);
+ List<LWhProcureModelUserRecord> select = lWhProcureModelUserRecordService
+ .select(lWhProcureModelUserRecord, DESC().setField("DEAL_TIME"));
+ LWhProcureModelUserRecord record = select.stream().findFirst().orElse(null);
LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
lWhProcureModelUser.setWhProcureModelId(procureModelId);
- lWhProcureModelUser.setProcureModelUserRecordId(lWhProcureModelUserRecord.getId());
+ lWhProcureModelUser.setProcureModelUserRecordId(record.getId());
List<LWhProcureModelUser> procureModelUserList =
this.lWhProcureModelUserService.select(lWhProcureModelUser);
+
if (!CollectionUtils.isEmpty(procureModelUserList)) {
List<DepartGoodsUseInfo> departGoodsUseInfoList = Lists.newArrayList();
procureModelUserList.forEach(useInfo -> {
@@ -403,14 +425,74 @@
});
goodsModelVO.setUseInfo(departGoodsUseInfoList);
}
-
}
- goodsModelVOList.add(goodsModelVO);
- procureTemplateInfoVO.setModels(goodsModelVOList);
- });
- formTransferGoods.add(procureTemplateInfoVO);
+ goodsModelList.add(goodsModelVO);
+ }
+ goodsTemplateInfoVO.setModels(goodsModelList);
+ goodsTemplateInfoList.add(goodsTemplateInfoVO);
}
- result.setFormTransferGoods(formTransferGoods);
+ result.setFormTransferGoods(goodsTemplateInfoList);
+
+ // String sql = "SELECT bgt.id, CATEGORY_ID, CATEGORY_NAME, GOODS_NAME,bgt.CLASSIFICATION type "
+ // + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
+ // + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
+ // + "WHERE pm.BUSINESS_ID =:id GROUP BY bgt.id ";
+ // Map<String, Object> paramMap = new HashMap<>();
+ // paramMap.put("id", result.getId());
+ // List<Map<String, Object>> procureModelList = this.select(sql, paramMap, new MapperUtil());
+ //
+ // String queryRecord =
+ // "SELECT * FROM l_wh_procure_model_user_record where TRANS_BUSINESS_ID = :id order by DEAL_TIME desc limit 1";
+ // LWhProcureModelUserRecord lWhProcureModelUserRecord =
+ // lWhProcureModelUserRecordService.get(queryRecord, paramMap, new LWhProcureModelUserRecord());
+ // List<FormTransferGoodsVO> formTransferGoods = Lists.newArrayList();
+ // for (Map<String, Object> map : procureModelList) {
+ // FormTransferGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormTransferGoodsVO.class);
+ // Long baseGoodsTemplateId = procureTemplateInfoVO.getId();
+ // // 鏌ヨ鍨嬪彿鏁伴噺
+ // List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
+ // String sql2 = "SELECT pm.id,pm.BASE_GOODS_MODELS_NAME,bgm.UNIT,COUNTS,total_amount "
+ // + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
+ // + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
+ // + "WHERE pm.BUSINESS_ID =:id and bgt.id =:baseGoodsTemplateId";
+ // Map<String, Object> goodsModelParamMap = new HashMap<>();
+ // goodsModelParamMap.put("id", result.getId());
+ // goodsModelParamMap.put("baseGoodsTemplateId", baseGoodsTemplateId);
+ // List<Map<String, Object>> modelList = this.select(sql2, goodsModelParamMap, new MapperUtil());
+ // modelList.forEach(item -> {
+ // GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class);
+ // Integer businessType = result.getBusinessType();
+ // String type = procureTemplateInfoVO.getType();
+ // // 閮ㄩ棬鍒嗗彂闇�瑕佹煡璇娇鐢ㄤ俊鎭�
+ // if (businessType == 1 && "A".equals(type)) {
+ // Long procureModelId = goodsModelVO.getId();
+ // LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
+ // lWhProcureModelUser.setWhProcureModelId(procureModelId);
+ // lWhProcureModelUser.setProcureModelUserRecordId(lWhProcureModelUserRecord.getId());
+ // List<LWhProcureModelUser> procureModelUserList =
+ // this.lWhProcureModelUserService.select(lWhProcureModelUser);
+ // if (!CollectionUtils.isEmpty(procureModelUserList)) {
+ // List<DepartGoodsUseInfo> departGoodsUseInfoList = Lists.newArrayList();
+ // procureModelUserList.forEach(useInfo -> {
+ // Integer goodsNum = useInfo.getGoodsNum();
+ // Long nowUserPhone = useInfo.getNowUserPhone();
+ // String nowUserName = useInfo.getNowUserName();
+ // DepartGoodsUseInfo departGoodsUseInfo = new DepartGoodsUseInfo();
+ // departGoodsUseInfo.setName(nowUserName);
+ // departGoodsUseInfo.setNum(goodsNum);
+ // departGoodsUseInfo.setTel(nowUserPhone);
+ // departGoodsUseInfoList.add(departGoodsUseInfo);
+ // });
+ // goodsModelVO.setUseInfo(departGoodsUseInfoList);
+ // }
+ //
+ // }
+ // goodsModelVOList.add(goodsModelVO);
+ // procureTemplateInfoVO.setModels(goodsModelVOList);
+ // });
+ // formTransferGoods.add(procureTemplateInfoVO);
+ // }
+ // result.setFormTransferGoods(formTransferGoods);
return result;
}
@@ -482,6 +564,11 @@
paramts.put("goodsName",
StringUtils.CHAR_PERCENT + transferQry.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
+ // 鐗╁搧id
+ if (transferQry.getGoodsTemplateId() != null) {
+ sql.append("AND bgt.id =:goodsTemplateId ");
+ paramts.put("goodsTemplateId", transferQry.getGoodsTemplateId());
+ }
// 瑙勬牸鍨嬪彿
if (transferQry.getBaseGoodsModelsId() != null) {
sql.append("AND bgm.id =:goodsModelId ");
@@ -489,13 +576,13 @@
}
// 璋冩嫧鏈烘瀯
if (transferQry.getOutAgencyId() != null) {
- sql.append("AND OUT_AGENCY_ID = :OUT_AGENCY_ID ");
- paramts.put("OUT_AGENCY_ID", transferQry.getOutAgencyId());
+ sql.append("AND OUT_AGENCY_ID like :OUT_AGENCY_ID ");
+ paramts.put("OUT_AGENCY_ID", transferQry.getOutAgencyId() + StringUtils.CHAR_PERCENT);
}
// 鍒嗗彂閮ㄩ棬
- if (transferQry.getInWarehouseId() != null) {
+ if (transferQry.getDepartmentId() != null) {
sql.append("and ft.IN_WAREHOUSE_ID = :inWarehouseId ");
- paramts.put("inWarehouseId", transferQry.getInWarehouseId());
+ paramts.put("inWarehouseId", transferQry.getDepartmentId());
}
// 鍒涘缓浜�
if (StringUtils.isNotEmpty(transferQry.getOperatorName())) {
@@ -529,7 +616,7 @@
+ " ft.OUT_OPERATOR_NAME,\n" + " ft.OUTPUT_TIME\n" + "FROM l_wh_form_transfer ft\n"
+ " LEFT JOIN l_wh_procure_model pm ON ft.ID = pm.BUSINESS_ID\n"
+ " LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID\n"
- + " LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID where 1=1 ");
+ + " LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID where ft.BUSINESS_TYPE =0 ");
if (StringUtils.isNotEmpty(param.getBusinessFormCode())) {
sql.append("AND ft.BUSINESS_FORM_CODE = :businessFormCode ");
params.put("businessFormCode", param.getBusinessFormCode());
@@ -538,6 +625,10 @@
sql.append("AND bgt.GOODS_NAME like :goodsName ");
params.put("goodsName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
+ if (param.getGoodsTemplateId() != null) {
+ sql.append("AND bgt.id = :goodsTemplateId ");
+ params.put("goodsTemplateId", param.getGoodsTemplateId());
+ }
if (param.getBaseGoodsModelsId() != null) {
sql.append("AND bgm.id = :goodsModelId ");
params.put("goodsModelId", param.getBaseGoodsModelsId());
--
Gitblit v1.9.1