From fd95223d9703b9c038ed3c782474c885052dda08 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 22 十二月 2023 17:05:25 +0800
Subject: [PATCH] 代码整理
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 133 +++++++++++++++++---------------------------
1 files changed, 52 insertions(+), 81 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 c333fa9..931b13b 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,5 +1,7 @@
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;
@@ -17,7 +19,10 @@
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;
@@ -35,7 +40,7 @@
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.FinSysTenantService;
import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
@@ -67,7 +72,7 @@
@Autowired
private CodeGeneratorService codeGeneratorService;
@Autowired
- private FinSysTenantServiceImpl finSysTenantService;
+ private FinSysTenantService finSysTenantService;
@Autowired
private LWhGoodsService lWhGoodsService;
@Autowired
@@ -110,13 +115,12 @@
lWhFormTransfer.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(codeGeneratorEnum));
- Long warehouseId = param.getInWarehouseId();
// 璋冩嫧绫诲瀷鍗曟嵁
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("浠撳簱涓嶅瓨鍦�");
@@ -146,13 +150,13 @@
baseWarehouse.setId(baseWarehouseId);
BaseWarehouse warehouse = baseWarehouseService.get(baseWarehouse);
- lWhFormTransfer.setInWarehouseType(1);
+ lWhFormTransfer.setInWarehouseType(WareHouseType.DEPARTMENT.getValue());
lWhFormTransfer.setInWarehouseId(param.getDepartmentId());
lWhFormTransfer.setInWarehouseName(param.getDepartmentName());
lWhFormTransfer.setInOperatorName(param.getOperatorName());
lWhFormTransfer.setInTime(param.getCreateTime());
- lWhFormTransfer.setOutWarehouseType(0);
+ lWhFormTransfer.setOutWarehouseType(WareHouseType.TENANT.getValue());
lWhFormTransfer.setOutWarehouseId(warehouse.getId());
lWhFormTransfer.setOutWarehouseName(warehouse.getWarehouseName());
@@ -167,14 +171,16 @@
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);
+ lWhFormTransfer.setStates(TransferStatesType.OUT_PENDING.getValue());
lWhFormTransfer.setProcureDoc(param.getProcureDoc());
int flag1 = this.insert(lWhFormTransfer);
@@ -212,7 +218,13 @@
if (businessType == TransferBusinessType.STOCK_TRANSFER.getValue()) {
lWhProcureModel.setBusinessType(2);
// 鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = 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 == TransferBusinessType.DEPARTMENT_PROCURE.getValue()) {
@@ -293,6 +305,11 @@
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 ");
@@ -332,9 +349,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");
@@ -393,8 +410,14 @@
&& 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(record.getId());
List<LWhProcureModelUser> procureModelUserList =
this.lWhProcureModelUserService.select(lWhProcureModelUser);
@@ -419,67 +442,6 @@
goodsTemplateInfoList.add(goodsTemplateInfoVO);
}
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;
}
@@ -523,7 +485,7 @@
*/
public int updateStatus(Long id) {
LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(id);
- lWhFormTransfer.setStates(4);
+ lWhFormTransfer.setStates(TransferStatesType.CANCEL.getValue());
return this.update(lWhFormTransfer);
}
@@ -551,6 +513,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 ");
@@ -558,13 +525,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())) {
@@ -607,17 +574,21 @@
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 ");
--
Gitblit v1.9.1