From 76c7d995ac56b60880e998df5e9e3d82fea313f8 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 07 十二月 2023 11:58:15 +0800
Subject: [PATCH] 出库单金额处理
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 327 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 198 insertions(+), 129 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 7607610..c7a342f 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,24 @@
package com.consum.base.service.impl;
+import com.consum.base.pojo.response.GoodsTemplateInfoVO;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+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.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.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
@@ -9,22 +26,21 @@
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.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.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;
@@ -36,17 +52,6 @@
import com.walker.db.page.GenericPager;
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 璋冩嫧绠＄悊
@@ -67,21 +72,18 @@
@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 "
- + "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 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 鏂板
@@ -89,9 +91,9 @@
* @Date 2023/10/30
*/
public long add(LWhFormTransferParam param, FinSysTenantUser sysInfo) throws Exception {
- //1.鏂板璋冩嫧鍗曡褰�
+ // 1.鏂板璋冩嫧鍗曡褰�
LWhFormTransfer lWhFormTransfer = new LWhFormTransfer();
- //璋冩嫧鍗昳d
+ // 璋冩嫧鍗昳d
long lWhFormTransferId = IdUtil.generateId();
lWhFormTransfer.setId(lWhFormTransferId);
@@ -113,7 +115,7 @@
Long warehouseId = param.getInWarehouseId();
// 璋冩嫧绫诲瀷鍗曟嵁
if (businessType == 0) {
- //鍏ュ簱浠撳簱涓哄綋鍓嶇敤鎴风殑榛樿浠撳簱
+ // 鍏ュ簱浠撳簱涓哄綋鍓嶇敤鎴风殑榛樿浠撳簱
String tenantId = sysInfo.getTenantId();
String tenantName = sysInfo.getTenantName();
BaseWarehouse warehouse = baseWarehouseService.getDefaultWarehouseByAgencyId(Long.valueOf(tenantId));
@@ -126,12 +128,12 @@
lWhFormTransfer.setInAgencyId(Long.valueOf(tenantId));
lWhFormTransfer.setInAgencyName(tenantName);
}
- //褰撲笟鍔＄被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
+ // 褰撲笟鍔＄被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
if (businessType == 1) {
- //閮ㄩ棬鍒嗗彂绫诲瀷 鍑哄簱浠撳簱绫诲瀷0鏈烘瀯1閮ㄩ棬
- //浠庡綋鍓嶇櫥褰曞簱绠′汉浠庡簱涓嚭搴擄紝鍏ュ埌鎵�閫夐儴闂ㄧ殑涓�
+ // 閮ㄩ棬鍒嗗彂绫诲瀷 鍑哄簱浠撳簱绫诲瀷0鏈烘瀯1閮ㄩ棬
+ // 浠庡綋鍓嶇櫥褰曞簱绠′汉浠庡簱涓嚭搴擄紝鍏ュ埌鎵�閫夐儴闂ㄧ殑涓�
- //鏌ヨ搴撶鍛樹俊鎭拰鐩稿叧浠撳簱
+ // 鏌ヨ搴撶鍛樹俊鎭拰鐩稿叧浠撳簱
Long id = sysInfo.getId();
BaseWarehouseManager manager = new BaseWarehouseManager();
manager.setManagerId(id);
@@ -165,7 +167,7 @@
}
}
- //鏍规嵁鏈烘瀯id鏌ヨ璋冩嫧鏈烘瀯
+ // 鏍规嵁鏈烘瀯id鏌ヨ璋冩嫧鏈烘瀯
FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(param.getOutAgencyId()));
if (finSysTenant == null) {
log.error("璋冩嫧鏈烘瀯涓嶅瓨鍦�");
@@ -175,7 +177,7 @@
lWhFormTransfer.setOperatorId(sysInfo.getId());
lWhFormTransfer.setOperatorName(sysInfo.getUserName());
lWhFormTransfer.setCreateTime(param.getCreateTime());
- //0=寰呭嚭搴擄紱1=寰呮帴鏀讹紱2=宸插叆搴撳簱:4=宸叉挙閿�
+ // 0=寰呭嚭搴擄紱1=寰呮帴鏀讹紱2=宸插叆搴撳簱:4=宸叉挙閿�
lWhFormTransfer.setStates(0);
lWhFormTransfer.setProcureDoc(param.getProcureDoc());
@@ -184,7 +186,7 @@
log.error("鏂板璋冩嫧鍗曞け璐�");
}
- //2.鏂板鐗╁搧鍨嬪彿璁板綍
+ // 2.鏂板鐗╁搧鍨嬪彿璁板綍
List<LWhFormTransferGoodsInfoParam> transferGoods = param.getTransferGoods();
List<LWhProcureModel> modelList = new ArrayList<>();
for (LWhFormTransferGoodsInfoParam transferGoodsInfo : transferGoods) {
@@ -196,8 +198,8 @@
Long baseGoodsModelsId = model.getBaseGoodsModelsId();
if (businessType == 0) {
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) {
@@ -207,8 +209,9 @@
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,9 +219,9 @@
}
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());
@@ -261,7 +264,6 @@
return lWhFormTransferId;
}
-
/**
* @Description 鍒楄〃鏌ヨ
* @Author 鍗㈠簡闃�
@@ -270,7 +272,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 +281,33 @@
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);
}
- //璋冩嫧鏈烘瀯
+ // 璋冩嫧鏈烘瀯
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 +316,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,7 +325,7 @@
sql.append(" and IN_TIME <:inTimeEnd ");
paramts.put("inTimeEnd", param.getEndTime() * 1000000 + 240000);
}
- //鍒嗗彂閮ㄩ棬
+ // 鍒嗗彂閮ㄩ棬
if (param.getInWarehouseId() != null) {
sql.append("and ft.IN_WAREHOUSE_ID = :inWarehouseId ");
paramts.put("inWarehouseId", param.getInWarehouseId());
@@ -341,46 +344,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 ";
+ List<GoodModelInfoDTO> goodsModelInfo =
+ lWhProcureModelService.getGoodsModelListByBusinessId(result.getId(), null);
+ if (CollectionUtils.isEmpty(goodsModelInfo)) {
+ return result;
+ }
+ // 鏌ヨ閮ㄩ棬鐗╁搧浣跨敤淇℃伅
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("id", result.getId());
- List<Map<String, Object>> procureModelList = lWhFormOutputService.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());
- 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 == 1 && CategoryType.TYPE_A.getValue().equals(type)) {
Long procureModelId = goodsModelVO.getId();
LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
lWhProcureModelUser.setWhProcureModelId(procureModelId);
+
lWhProcureModelUser.setProcureModelUserRecordId(lWhProcureModelUserRecord.getId());
- List<LWhProcureModelUser> procureModelUserList = this.lWhProcureModelUserService.select(lWhProcureModelUser);
+ List<LWhProcureModelUser> procureModelUserList =
+ this.lWhProcureModelUserService.select(lWhProcureModelUser);
if (!CollectionUtils.isEmpty(procureModelUserList)) {
List<DepartGoodsUseInfo> departGoodsUseInfoList = Lists.newArrayList();
procureModelUserList.forEach(useInfo -> {
@@ -395,18 +412,77 @@
});
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;
}
-
/**
* @Description 瀵煎嚭璋冩嫧鍑哄簱鍗�
@@ -414,24 +490,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());
@@ -443,7 +508,7 @@
} else {
templateExcelTransfer.setTenantName(templateExcelTransfer.getInAgencyName());
}
- templateExcelTransfer.setTotalAmount(CurrencyUtil.convertFenToYuan(templateExcelTransfer.getTotalAmount()));
+ templateExcelTransfer.setAmount(CurrencyUtil.convertFenToYuan(templateExcelTransfer.getTotalAmount()));
list.add(templateExcelTransfer);
});
@@ -468,42 +533,45 @@
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);
}
// 瑙勬牸鍨嬪彿
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());
}
- //鍒嗗彂閮ㄩ棬
+ // 鍒嗗彂閮ㄩ棬
if (transferQry.getInWarehouseId() != null) {
sql.append("and ft.IN_WAREHOUSE_ID = :inWarehouseId ");
paramts.put("inWarehouseId", transferQry.getInWarehouseId());
}
- //鍒涘缓浜�
+ // 鍒涘缓浜�
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 +582,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 1=1 ");
if (StringUtils.isNotEmpty(param.getBusinessFormCode())) {
sql.append("AND ft.BUSINESS_FORM_CODE = :businessFormCode ");
params.put("businessFormCode", param.getBusinessFormCode());
@@ -555,7 +623,7 @@
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 +632,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 +641,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