From b4adff68a07b783fc90da1c9370d8be5f383e700 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期三, 08 五月 2024 13:46:34 +0800
Subject: [PATCH] 20240528修改: bug41、42、43修改 领用单(分发单)，调拨单，流程优化
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 429 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 240 insertions(+), 189 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 3484855..9977d08 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,7 +1,29 @@
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.Objects;
+import java.util.stream.Collectors;
+
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.CollectionUtils;
+
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.StatesType;
+import com.consum.base.core.type.TransferBusinessType;
+import com.consum.base.core.type.TransferStatesType;
+import com.consum.base.core.type.WareHouseType;
import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
@@ -9,22 +31,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.LWhProcureModelUserRecordServiceImpl;
-import com.consum.base.service.LWhProcureModelUserServiceImpl;
+import com.consum.base.service.LWhProcureModelUserRecordService;
+import com.consum.base.service.LWhProcureModelUserService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.BaseWarehouseManager;
import com.consum.model.po.FinSysTenant;
@@ -34,19 +56,9 @@
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;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.util.CollectionUtils;
/**
* @Description 璋冩嫧绠＄悊
@@ -61,122 +73,125 @@
@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 LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
+ private LWhProcureModelUserRecordService lWhProcureModelUserRecordService;
@Autowired
private BaseWarehouseManagerService baseWarehouseManagerService;
- private static String QUERY_FORM_TRANSFER_LIST = "SELECT ft.* FROM l_wh_form_transfer ft "
+ 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 鏂板
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
- public long add(LWhFormTransferParam param, FinSysTenantUser sysInfo) throws Exception {
- //1.鏂板璋冩嫧鍗曡褰�
+ @Transactional(rollbackFor = Exception.class)
+ public long add(LWhFormTransferParam param, FinSysTenantUser sysInfo,boolean isHaveDoc) throws Exception {
+ // 1.鏂板璋冩嫧鍗曡褰�
LWhFormTransfer lWhFormTransfer = new LWhFormTransfer();
- //璋冩嫧鍗昳d
+ // 璋冩嫧鍗昳d
long lWhFormTransferId = IdUtil.generateId();
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();
- BaseWarehouse warehouse = baseWarehouseService.getDefaultWarehouseByAgencyId(Long.valueOf(tenantId));
+ BaseWarehouse warehouse = baseWarehouseService.getWarehouseByAgencyId(Long.valueOf(tenantId), null);
if (warehouse == null) {
log.error("浠撳簱涓嶅瓨鍦�");
- throw new Exception("浠撳簱涓嶅瓨鍦�");
+ //throw new Exception("浠撳簱涓嶅瓨鍦�");
+ return -2L;
}
lWhFormTransfer.setInWarehouseId(warehouse.getId());
lWhFormTransfer.setInWarehouseName(warehouse.getWarehouseName());
lWhFormTransfer.setInAgencyId(Long.valueOf(tenantId));
lWhFormTransfer.setInAgencyName(tenantName);
}
- //褰撲笟鍔＄被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
- if (businessType == 1) {
- //閮ㄩ棬鍒嗗彂绫诲瀷 鍑哄簱浠撳簱绫诲瀷0鏈烘瀯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("璇ョ敤鎴蜂笉鏄簱绠″憳");
+ //throw new Exception("璇ョ敤鎴蜂笉鏄簱绠″憳");
+ return -1L;
}
- 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.setInWarehouseType(WareHouseType.DEPARTMENT.getValue());
+ lWhFormTransfer.setInWarehouseId(param.getDepartmentId());
+ lWhFormTransfer.setInWarehouseName(param.getDepartmentName());
+ lWhFormTransfer.setInOperatorName(param.getOperatorName());
+
+ if(!isHaveDoc){
lWhFormTransfer.setInTime(param.getCreateTime());
-
- 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.setOutWarehouseType(WareHouseType.TENANT.getValue());
+ lWhFormTransfer.setOutWarehouseId(warehouse.getId());
+ lWhFormTransfer.setOutWarehouseName(warehouse.getWarehouseName());
+
+ lWhFormTransfer.setOutOperatorId(sysInfo.getId());
+ lWhFormTransfer.setOutOperatorName(sysInfo.getUserName());
+
+ if(!isHaveDoc) {
+ lWhFormTransfer.setOutputTime(param.getCreateTime());
+ }
+ lWhFormTransfer.setTel(param.getTel());
+
}
- //鏍规嵁鏈烘瀯id鏌ヨ璋冩嫧鏈烘瀯
+ // 鏍规嵁鏈烘瀯id鏌ヨ璋冩嫧鏈烘瀯
FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(param.getOutAgencyId()));
if (finSysTenant == null) {
log.error("璋冩嫧鏈烘瀯涓嶅瓨鍦�");
+ throw new Exception("璋冩嫧鏈烘瀯涓嶅瓨鍦�");
}
- lWhFormTransfer.setOutAgencyId(finSysTenant.getId());
+ Long outAgencyId = finSysTenant.getId();
+ lWhFormTransfer.setOutAgencyId(outAgencyId);
lWhFormTransfer.setOutAgencyName(finSysTenant.getName());
lWhFormTransfer.setOperatorId(sysInfo.getId());
lWhFormTransfer.setOperatorName(sysInfo.getUserName());
lWhFormTransfer.setCreateTime(param.getCreateTime());
- //0=寰呭嚭搴擄紱1=寰呮帴鏀讹紱2=宸插叆搴撳簱:4=宸叉挙閿�
- lWhFormTransfer.setStates(0);
+ // 0=寰呭嚭搴擄紱1=寰呮帴鏀讹紱2=宸插叆搴撳簱:4=宸叉挙閿�
+ lWhFormTransfer.setStates(TransferStatesType.OUT_PENDING.getValue());
lWhFormTransfer.setProcureDoc(param.getProcureDoc());
int flag1 = this.insert(lWhFormTransfer);
@@ -184,9 +199,26 @@
log.error("鏂板璋冩嫧鍗曞け璐�");
}
- //2.鏂板鐗╁搧鍨嬪彿璁板綍
+ // 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();
@@ -194,21 +226,28 @@
// 璋冩嫧涓氬姟绫诲瀷杞崲鍒扮墿鍝佺被鍨�
// 鐗╁搧绫诲瀷 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);
+ // 鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
+ // 璋冩嫧鐢宠鏃舵病鏈変粨搴搃d 鏌ヨ涓婄骇鏈烘瀯鐨勬墍鏈変粨搴�
+ List<BaseWarehouse> baseWareHouseList =
+ baseWarehouseService.getBaseWareHouseList(outAgencyId, StatesType.NORMAL.getValue());
+ List<Long> warehouseIdList =
+ baseWareHouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toList());
+ int goodsNum = lWhGoodsService.queryGoodsModelNum(WareHouseType.TENANT.getValue(), warehouseIdList,
+ baseGoodsModelsId, 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
}
- if (businessType == 1) {
+ if (businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue()) {
lWhProcureModel.setBusinessType(4);
}
lWhProcureModel.setCounts(model.getCounts());
lWhProcureModel.setUseCount(model.getCounts());
lWhProcureModel.setBusinessId(lWhFormTransferId);
lWhProcureModel.setBaseGoodsModelsId(baseGoodsModelsId);
- //鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
- List<Map<String, Object>> baseGoodsModels = this.baseGoodsModelsService.queryGoodsModelInfo(baseGoodsModelsId);
+ // 鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
+ List<Map<String, Object>> baseGoodsModels =
+ this.baseGoodsModelsService.queryGoodsModelInfo(baseGoodsModelsId);
Map<String, Object> baseModelMap = baseGoodsModels.get(0);
if (baseGoodsModels != null && !CollectionUtils.isEmpty(baseModelMap)) {
Object modelName = baseModelMap.get("modelName");
@@ -216,17 +255,11 @@
}
lWhProcureModel.setSupplier(transferGoodsInfo.getSupplier());
- //3.褰撲笟鍔＄被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
+ // 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();
@@ -246,7 +279,6 @@
log.error("鏂板鐗╁搧浣跨敤淇℃伅澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
-
}
modelList.add(lWhProcureModel);
@@ -261,7 +293,6 @@
return lWhFormTransferId;
}
-
/**
* @Description 鍒楄〃鏌ヨ
* @Author 鍗㈠簡闃�
@@ -270,7 +301,7 @@
public GenericPager<LWhFormTransfer> queryFormTransferList(TransferQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(QUERY_FORM_TRANSFER_LIST);
- //璋冩嫧鍗曞彿
+ // 璋冩嫧鍗曞彿
if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
sql.append(" and BUSINESS_FORM_CODE = :businessFormCode ");
paramts.put("businessFormCode", param.getBusinessFormCode());
@@ -279,32 +310,38 @@
sql.append("and ft.BUSINESS_TYPE = :businessType ");
paramts.put("businessType", param.getQryType());
}
- //鐗╁搧鍚嶇О
+ // 鐗╁搧鍚嶇О
if (!StringUtils.isEmpty(param.getGoodsTemplateName())) {
sql.append("AND bgt.GOODS_NAME LIKE :goodsTemplateName ");
- paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ 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) {
sql.append(" and OUT_AGENCY_ID = :OUT_AGENCY_ID ");
paramts.put("OUT_AGENCY_ID", param.getOutAgencyId());
}
- //鎺ユ敹鏈烘瀯
+ // 鎺ユ敹鏈烘瀯
if (param.getInAgencyId() != null) {
sql.append(" and IN_AGENCY_ID = :IN_AGENCY_ID ");
paramts.put("IN_AGENCY_ID", param.getInAgencyId());
}
- //鐘舵��
+ // 鐘舵��
if (param.getStates() != null) {
sql.append(" and ft.states =:states ");
paramts.put("states", param.getStates());
}
- //鍒涘缓浜�
+ // 鍒涘缓浜�
if (!StringUtils.isEmpty(param.getOperatorName())) {
sql.append(" and OPERATOR_NAME =:OPERATOR_NAME ");
paramts.put("OPERATOR_NAME", param.getOperatorName());
}
- //鐢宠鏃堕棿
+ // 鐢宠鏃堕棿
if (param.getCreateTimeStart() != null) {
sql.append(" and ft.CREATE_TIME >=:createTimeStart ");
paramts.put("createTimeStart", param.getCreateTimeStart() * 1000000);
@@ -313,7 +350,7 @@
sql.append(" and ft.CREATE_TIME <:createTimeEnd ");
paramts.put("createTimeEnd", param.getCreateTimeEnd() * 1000000 + 240000);
}
- //鎺ユ敹鏃堕棿
+ // 鎺ユ敹鏃堕棿
if (param.getStartTime() != null) {
sql.append(" and IN_TIME >=:inTimeStart ");
paramts.put("inTimeStart", param.getStartTime() * 1000000);
@@ -322,10 +359,10 @@
sql.append(" and IN_TIME <:inTimeEnd ");
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");
@@ -341,46 +378,60 @@
*/
public LWHFromTransferExtendVO getById(Long id) {
LWHFromTransferExtendVO result = new LWHFromTransferExtendVO();
- //1.鏌ヨ璋冩嫧鍗�
+ // 1.鏌ヨ璋冩嫧鍗�
LWhFormTransfer lWhFormTransfer = this.get(new LWhFormTransfer(id));
if (lWhFormTransfer != null) {
BeanUtils.copyProperties(lWhFormTransfer, result);
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);
+ 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()));
+ // 閮ㄩ棬鍒嗗彂闇�瑕佹煡璇娇鐢ㄤ俊鎭�
Integer businessType = result.getBusinessType();
- String type = procureTemplateInfoVO.getType();
- //閮ㄩ棬鍒嗗彂闇�瑕佹煡璇娇鐢ㄤ俊鎭�
- if (businessType == 1 && "A".equals(type)) {
+ 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());
- List<LWhProcureModelUser> procureModelUserList = this.lWhProcureModelUserService.select(lWhProcureModelUser);
+ lWhProcureModelUser.setProcureModelUserRecordId(record.getId());
+ List<LWhProcureModelUser> procureModelUserList =
+ this.lWhProcureModelUserService.select(lWhProcureModelUser);
+
if (!CollectionUtils.isEmpty(procureModelUserList)) {
List<DepartGoodsUseInfo> departGoodsUseInfoList = Lists.newArrayList();
procureModelUserList.forEach(useInfo -> {
@@ -395,18 +446,16 @@
});
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);
return result;
}
-
/**
* @Description 瀵煎嚭璋冩嫧鍑哄簱鍗�
@@ -414,24 +463,13 @@
* @Date 2023/10/31
*/
public List<TransferExcelTemplate> export(Long id, Integer type) {
- String sql = "SELECT\n"
- + "\tft.BUSINESS_FORM_CODE,\n"
- + "\tft.OPERATOR_NAME,\n"
- + "\tft.CREATE_TIME,\n"
- + "\tft.IN_AGENCY_NAME,\n"
- + "\tft.OUT_AGENCY_NAME,\n"
- + "\tGOODS_NAME templateName,\n"
- + "\tpm.BASE_GOODS_MODELS_NAME baseModelName,\n"
- + "\tpm.COUNTS num,\n"
- + "\tpm.total_amount,\n"
- + "\tft.BEIZ1 remark\n"
- + "FROM\n"
- + "\tl_wh_form_transfer ft\n"
+ String sql = "SELECT\n" + "\tft.BUSINESS_FORM_CODE,\n" + "\tft.OPERATOR_NAME,\n" + "\tft.CREATE_TIME,\n"
+ + "\tft.IN_AGENCY_NAME,\n" + "\tft.OUT_AGENCY_NAME,\n" + "\tGOODS_NAME templateName,\n"
+ + "\tpm.BASE_GOODS_MODELS_NAME baseModelName,\n" + "\tpm.COUNTS num,\n" + "\tpm.total_amount,\n"
+ + "\tft.BEIZ1 remark\n" + "FROM\n" + "\tl_wh_form_transfer ft\n"
+ "\tINNER JOIN l_wh_procure_model pm ON ft.ID = pm.BUSINESS_ID\n"
+ "\tINNER JOIN base_goods_models bgm ON bgm.ID = pm.BASE_GOODS_MODELS_ID\n"
- + "\tINNER JOIN base_goods_template bgt ON bgt.ID = bgm.GOODS_TEMPLATES_ID\n"
- + "WHERE\n"
- + "\tft.id = :id";
+ + "\tINNER JOIN base_goods_template bgt ON bgt.ID = bgm.GOODS_TEMPLATES_ID\n" + "WHERE\n" + "\tft.id = :id";
Map<String, Object> paramts = new HashMap<>();
paramts.put("id", id);
List<Map<String, Object>> select = this.select(sql, paramts, new MapperUtil());
@@ -458,7 +496,7 @@
*/
public int updateStatus(Long id) {
LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(id);
- lWhFormTransfer.setStates(4);
+ lWhFormTransfer.setStates(TransferStatesType.CANCEL.getValue());
return this.update(lWhFormTransfer);
}
@@ -468,42 +506,50 @@
StringBuilder sql = new StringBuilder(
"SELECT ft.id,ft.BUSINESS_FORM_CODE,bgt.GOODS_NAME,bgt.CLASSIFICATION type,bgm.id goodsModelId,bgm.MODEL_NAME goodsModelName,pm.COUNTS goodsCount,fst.`name` tenantName,"
+ "ft.IN_WAREHOUSE_NAME departmentName,ft.OPERATOR_ID,ft.CREATE_TIME,ft.OPERATOR_NAME FROM l_wh_form_transfer ft "
- + "inner JOIN l_wh_procure_model pm ON ft.ID = pm.BUSINESS_ID " + "inner JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
+ + "inner JOIN l_wh_procure_model pm ON ft.ID = pm.BUSINESS_ID "
+ + "inner JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
+ "inner JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
+ "inner JOIN fin_sys_tenant_user fstu ON fstu.id = ft.OPERATOR_ID "
+ "inner JOIN fin_sys_tenant_department fstd ON fstu.SYS_DEPT_ID = fstd.ID "
+ "inner JOIN fin_sys_tenant fst ON fst.id = fstd.TENANT_ID where ft.BUSINESS_TYPE =1 ");
- //鍗曞彿
+ // 鍗曞彿
if (StringUtils.isNotEmpty(transferQry.getBusinessFormCode())) {
sql.append("AND BUSINESS_FORM_CODE like :businessFormCode ");
- paramts.put("businessFormCode", StringUtils.CHAR_PERCENT + transferQry.getBusinessFormCode() + StringUtils.CHAR_PERCENT);
+ paramts.put("businessFormCode",
+ StringUtils.CHAR_PERCENT + transferQry.getBusinessFormCode() + StringUtils.CHAR_PERCENT);
}
- //鐗╁搧鍚嶇О
+ // 鐗╁搧鍚嶇О
if (StringUtils.isNotEmpty(transferQry.getGoodsTemplateName())) {
sql.append("AND bgt.GOODS_NAME like:goodsName ");
- paramts.put("goodsName", StringUtils.CHAR_PERCENT + transferQry.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ 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 ");
paramts.put("goodsModelId", transferQry.getBaseGoodsModelsId());
}
- //璋冩嫧鏈烘瀯
+ // 璋冩嫧鏈烘瀯
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())) {
sql.append("AND ft.OPERATOR_NAME =:OPERATOR_NAME ");
paramts.put("OPERATOR_NAME", transferQry.getOperatorName());
}
- //鐢宠鏃堕棿
+ // 鐢宠鏃堕棿
if (transferQry.getStartTime() != null) {
sql.append("AND ft.CREATE_TIME >=:createTimeStart ");
paramts.put("createTimeStart", transferQry.getStartTime() * 1000000);
@@ -514,23 +560,23 @@
}
sql.append("ORDER BY ft.CREATE_TIME DESC");
- GenericPager<Map<String, Object>> mapGenericPager = this.selectSplit(sql.toString(), paramts, transferQry.getPageNum(), transferQry.getPageSize(),
- new MapperUtil());
+ GenericPager<Map<String, Object>> mapGenericPager = this.selectSplit(sql.toString(), paramts,
+ transferQry.getPageNum(), transferQry.getPageSize(), new MapperUtil());
return mapGenericPager;
}
-
public GenericPager<Map<String, Object>> queryFormTransferDetailList(TransferQry param) {
HashMap<String, Object> params = new HashMap<>();
- StringBuilder sql = new StringBuilder(
- "SELECT ft.id,\n" + " ft.BUSINESS_FORM_CODE,\n" + " bgt.GOODS_NAME,\n" + " bgt.CLASSIFICATION,\n"
- + " pm.BASE_GOODS_MODELS_NAME,\n" + " pm.COUNTS,\n" + " ft.IN_AGENCY_NAME,\n" + " ft.OPERATOR_NAME,\n"
- + " ft.CREATE_TIME,\n" + " ft.IN_TIME,\n" + " ft.OUT_AGENCY_NAME,\n" + " 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 ");
+ StringBuilder sql = new StringBuilder("SELECT ft.id,\n" + " ft.BUSINESS_FORM_CODE,\n"
+ + " bgt.GOODS_NAME,\n" + " bgt.CLASSIFICATION,\n" + " pm.BASE_GOODS_MODELS_NAME,\n"
+ + " pm.COUNTS,\n" + " ft.IN_AGENCY_NAME,\n" + " ft.OPERATOR_NAME,\n"
+ + " ft.CREATE_TIME,\n" + " ft.IN_TIME,\n" + " ft.OUT_AGENCY_NAME,\n"
+ + " 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 ft.BUSINESS_TYPE =0 ");
if (StringUtils.isNotEmpty(param.getBusinessFormCode())) {
sql.append("AND ft.BUSINESS_FORM_CODE = :businessFormCode ");
params.put("businessFormCode", param.getBusinessFormCode());
@@ -539,23 +585,27 @@
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());
}
if (param.getOutAgencyId() != null) {
sql.append("AND ft.OUT_AGENCY_ID like :outAgencyId ");
- params.put("outAgencyId", param.getOutAgencyId());
+ params.put("outAgencyId", param.getOutAgencyId() + StringUtils.CHAR_PERCENT);
}
- if (param.getOutAgencyId() != null) {
+ if (param.getInAgencyId() != null) {
sql.append("AND ft.IN_AGENCY_ID like :inAgencyId ");
- params.put("inAgencyId", param.getInAgencyId());
+ params.put("inAgencyId", param.getInAgencyId() + StringUtils.CHAR_PERCENT);
}
if (StringUtils.isNotEmpty(param.getOperatorName())) {
sql.append("AND ft.OPERATOR_NAME = :operatorName ");
params.put("operatorName", param.getOperatorName());
}
- //鐢宠鍒涘缓鏃堕棿
+ // 鐢宠鍒涘缓鏃堕棿
if (param.getCreateTimeStart() != null) {
sql.append("AND ft.CREATE_TIME >= :createTimeStart ");
params.put("createTimeStart", param.getCreateTimeStart() * 1000000);
@@ -564,7 +614,7 @@
sql.append("AND ft.CREATE_TIME < :createTimeEnd ");
params.put("createTimeEnd", param.getCreateTimeEnd() * 1000000 + 240000);
}
- //鎺ユ敹鏃堕棿
+ // 鎺ユ敹鏃堕棿
if (param.getStartTime() != null) {
sql.append("AND ft.IN_TIME >= :createTimeStart ");
params.put("createTimeStart", param.getStartTime() * 1000000);
@@ -573,19 +623,20 @@
sql.append("AND ft.IN_TIME < :createTimeEnd ");
params.put("createTimeEnd", param.getEndTime() * 1000000 + 240000);
}
- GenericPager<Map<String, Object>> mapGenericPager = this.selectSplit(sql.toString(), params, param.getPageNum(), param.getPageSize(), new MapperUtil());
+ GenericPager<Map<String, Object>> mapGenericPager =
+ this.selectSplit(sql.toString(), params, param.getPageNum(), param.getPageSize(), new MapperUtil());
return mapGenericPager;
}
public List<Map<String, Object>> queryDepartmentTransferOrder() {
- String sql =
- "SELECT ft.id,\n" + " ft.BUSINESS_FORM_CODE,\n" + " gr.GOODS_TEMPLATE_NAME,\n" + " gr.BASE_GOODS_TEMPLATE_ID goodsTemplateId,\n"
- + " ft.CREATE_TIME\n" + "\n" + "FROM l_wh_form_transfer ft\n" + " LEFT JOIN L_WAREHOUSE_FLOW wf ON ft.id = wf.BUSINESS_FORM_ID\n"
- + " left join L_WH_GOODS_RECORD gr on gr.WAREHOUSE_FLOW_ID = wf.id\n"
- + " LEFT JOIN L_GOODS_WH_RECORD gwr on gwr.WAREHOUSE_FLOW_ID = wf.id\n"
- + " left join L_WH_GOODS g on g.id = gwr.WH_GOODS_ID where ft.BUSINESS_TYPE = 1 GROUP BY gr.BASE_GOODS_TEMPLATE_ID \n";
+ String sql = "SELECT ft.id,\n" + " ft.BUSINESS_FORM_CODE,\n" + " gr.GOODS_TEMPLATE_NAME,\n"
+ + " gr.BASE_GOODS_TEMPLATE_ID goodsTemplateId,\n" + " ft.CREATE_TIME\n" + "\n"
+ + "FROM l_wh_form_transfer ft\n" + " LEFT JOIN L_WAREHOUSE_FLOW wf ON ft.id = wf.BUSINESS_FORM_ID\n"
+ + " left join L_WH_GOODS_RECORD gr on gr.WAREHOUSE_FLOW_ID = wf.id\n"
+ + " LEFT JOIN L_GOODS_WH_RECORD gwr on gwr.WAREHOUSE_FLOW_ID = wf.id\n"
+ + " left join L_WH_GOODS g on g.id = gwr.WH_GOODS_ID where ft.BUSINESS_TYPE = 1 GROUP BY gr.BASE_GOODS_TEMPLATE_ID \n";
HashMap<String, Object> param = new HashMap<>();
List<Map<String, Object>> select = this.select(sql, param, new MapperUtil());
select.forEach(item -> {
--
Gitblit v1.9.1