From 01107e8aadfaf1e84a971d8eeb9ab37e1c5569f3 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 01 十二月 2023 09:38:56 +0800
Subject: [PATCH] feat: 部门退回/报废公用接口
---
consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java | 176 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 104 insertions(+), 72 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
index bcedeb0..50e486f 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
@@ -8,41 +8,26 @@
import com.consum.base.pojo.LWhFormTransferGoodsInfoParam;
import com.consum.base.pojo.LWhProcureModelUserParam;
import com.consum.base.pojo.LWhTransferModelParam;
+import com.consum.base.pojo.excel.TemplateExcelTransfer;
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.model.po.BaseGoodsModels;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.BaseWarehouseManager;
-import com.consum.model.po.FinSysTenant;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormOutput;
-import com.consum.model.po.LWhFormTransfer;
-import com.consum.model.po.LWhGoodsRecord;
-import com.consum.model.po.LWhProcureModel;
-import com.consum.model.po.LWhProcureModelUser;
-import com.consum.model.po.LWhProcureModelUserRecord;
-import com.consum.model.vo.LWhFormOutputVo;
-import com.consum.model.vo.LWhGoodsRecordVo;
-import com.iplatform.model.po.S_user_core;
+import com.consum.model.po.*;
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;
+
+import java.util.*;
/**
* @Description 璋冩嫧绠＄悊
@@ -75,7 +60,9 @@
@Autowired
private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
@Autowired
- private BaseWarehouseManagerServiceImpl baseWarehouseManagerService;
+ private BaseWarehouseManagerService baseWarehouseManagerService;
+ @Autowired
+ private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
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 "
@@ -88,7 +75,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
- public int add(LWhFormTransferParam param, FinSysTenantUser sysInfo) throws Exception {
+ public long add(LWhFormTransferParam param, FinSysTenantUser sysInfo) throws Exception {
//1.鏂板璋冩嫧鍗曡褰�
LWhFormTransfer lWhFormTransfer = new LWhFormTransfer();
//璋冩嫧鍗昳d
@@ -99,8 +86,16 @@
// 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
// TODO 鏋氫妇瀛楀吀
lWhFormTransfer.setBusinessType(businessType);
+ CodeGeneratorEnum codeGeneratorEnum = null;
+ if (businessType == 0) {
+ codeGeneratorEnum = CodeGeneratorEnum.Transfer;
+ } else if (businessType == 1) {
+ codeGeneratorEnum = CodeGeneratorEnum.Distribute;
+ } else if (businessType == 2) {
+ codeGeneratorEnum = CodeGeneratorEnum.GOBACK;
+ }
- lWhFormTransfer.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Transfer));
+ lWhFormTransfer.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(codeGeneratorEnum));
Long warehouseId = param.getInWarehouseId();
// 璋冩嫧绫诲瀷鍗曟嵁
@@ -124,13 +119,13 @@
//浠庡綋鍓嶇櫥褰曞簱绠′汉浠庡簱涓嚭搴擄紝鍏ュ埌鎵�閫夐儴闂ㄧ殑涓�
//鏌ヨ搴撶鍛樹俊鎭拰鐩稿叧浠撳簱
- Long id = sysInfo.getSysUserId();
+ Long id = sysInfo.getId();
BaseWarehouseManager manager = new BaseWarehouseManager();
manager.setManagerId(id);
- List<BaseWarehouseManager> managerList = baseWarehouseManagerService.select(manager);
+ List<BaseWarehouseManager> managerList = baseWarehouseManagerService.selectAll(manager);
if (CollectionUtils.isEmpty(managerList)) {
- log.error("搴撶鍛樹笉瀛樺湪");
- throw new Exception("搴撶鍛樹笉瀛樺湪");
+ log.error("璇ョ敤鎴蜂笉鏄簱绠″憳");
+ throw new Exception("璇ョ敤鎴蜂笉鏄簱绠″憳");
}
Optional<BaseWarehouseManager> first = managerList.stream().findFirst();
if (first.isPresent()) {
@@ -161,7 +156,6 @@
FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(param.getOutAgencyId()));
if (finSysTenant == null) {
log.error("璋冩嫧鏈烘瀯涓嶅瓨鍦�");
- return 0;
}
lWhFormTransfer.setOutAgencyId(finSysTenant.getId());
lWhFormTransfer.setOutAgencyName(finSysTenant.getName());
@@ -175,7 +169,6 @@
int flag1 = this.insert(lWhFormTransfer);
if (flag1 == 0) {
log.error("鏂板璋冩嫧鍗曞け璐�");
- return 0;
}
//2.鏂板鐗╁搧鍨嬪彿璁板綍
@@ -185,7 +178,7 @@
for (LWhTransferModelParam model : transferGoodsInfo.getModels()) {
LWhProcureModel lWhProcureModel = new LWhProcureModel();
lWhProcureModel.setId(IdUtil.generateId());
- // 鎸戞嫧涓氬姟绫诲瀷杞崲鍒扮墿鍝佺被鍨�
+ // 璋冩嫧涓氬姟绫诲瀷杞崲鍒扮墿鍝佺被鍨�
// 鐗╁搧绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂
Long baseGoodsModelsId = model.getBaseGoodsModelsId();
if (businessType == 0) {
@@ -194,21 +187,26 @@
int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
}
+ if (businessType == 1) {
+ lWhProcureModel.setBusinessType(4);
+ }
lWhProcureModel.setCounts(model.getCounts());
+ lWhProcureModel.setUseCount(model.getCounts());
lWhProcureModel.setBusinessId(lWhFormTransferId);
lWhProcureModel.setBaseGoodsModelsId(baseGoodsModelsId);
//鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
- BaseGoodsModels baseGoodsModels = this.baseGoodsModelsService.get(new BaseGoodsModels(baseGoodsModelsId));
- if (baseGoodsModels != null) {
- lWhProcureModel.setBaseGoodsModelsName(baseGoodsModels.getModelName());
+ 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");
+ lWhProcureModel.setBaseGoodsModelsName(modelName.toString());
}
lWhProcureModel.setSupplier(transferGoodsInfo.getSupplier());
//3.褰撲笟鍔＄被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
// 鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂
//閮ㄩ棬鍒嗗彂绫诲瀷
- if (businessType == 1) {
- lWhProcureModel.setBusinessType(4);
+ if (businessType == 1 && "A".equals(baseModelMap.get("type"))) {
LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
lWhProcureModelUserRecord.setId(IdUtil.generateId());
lWhProcureModelUserRecord.setTransBusinessId(lWhFormTransferId);
@@ -226,6 +224,7 @@
lWhProcureModelUser.setNowUserName(lWhProcureModelUserParam.getNowUserName());
lWhProcureModelUser.setNowUserPhone(lWhProcureModelUserParam.getNowUserPhone());
lWhProcureModelUser.setGoodsNum(lWhProcureModelUserParam.getGoodsNum());
+ lWhProcureModelUser.setUseCount(lWhProcureModelUser.getGoodsNum());
lWhProcureModelUser.setProcureModelUserRecordId(lWhProcureModelUserRecord.getId());
procureModelUserList.add(lWhProcureModelUser);
}
@@ -233,7 +232,6 @@
if (procureInsertNum != procureModelUserList.size()) {
log.error("鏂板鐗╁搧浣跨敤淇℃伅澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return 0;
}
}
@@ -246,10 +244,8 @@
if (flag2 != modelList.size()) {
log.error("鏂板鐗╁搧鍨嬪彿澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return 0;
}
-
- return 1;
+ return lWhFormTransferId;
}
@@ -287,7 +283,7 @@
}
//鐘舵��
if (param.getStates() != null) {
- sql.append(" and states =:states ");
+ sql.append(" and ft.states =:states ");
paramts.put("states", param.getStates());
}
//鍒涘缓浜�
@@ -313,6 +309,11 @@
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());
+ }
sql.append(" ORDER BY ft.CREATE_TIME DESC");
GenericPager genericPager = selectSplit(sql.toString(), paramts, new LWhFormTransfer());
@@ -331,6 +332,7 @@
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 "
@@ -377,8 +379,6 @@
});
goodsModelVO.setUseInfo(departGoodsUseInfoList);
}
- // TODO 閮ㄩ棬鍚嶇О
-// result.setDepartmentName();
}
goodsModelVOList.add(goodsModelVO);
@@ -398,36 +398,63 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
- public LWhFormOutputVo export(Long id, S_user_core currentUser) {
- LWhFormOutputVo result = new LWhFormOutputVo();
- long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
- //1.鏍规嵁璋冩嫧鍗曠敓鎴愬嚭搴撳崟
- Long outWarehouseFormId = this.lWhFormOutputCoreService.createOutFormByTransId(id, currentUser, dealTime);
- //2.鍑哄簱鍗昳d鏌ヨ鍑哄簱鍗�
- LWhFormOutput lWhFormOutput = this.lWhFormOutputService.get(new LWhFormOutput(outWarehouseFormId));
- if (lWhFormOutput != null) {
- BeanUtils.copyProperties(lWhFormOutput, result);
- }
- //3.鏍规嵁杩涘嚭搴撴祦姘存�昏〃id鏌ヨl_wh_goods_record
- LWhGoodsRecord record = new LWhGoodsRecord();
- record.setWarehouseFlowId(lWhFormOutput.getWarehouseFlowId());
- List<LWhGoodsRecord> recordList = this.lWhGoodsRecordService.select(record);
- List<LWhGoodsRecordVo> voList = new ArrayList<>();
- if (!CollectionUtils.isEmpty(recordList)) {
- for (LWhGoodsRecord lWhGoodsRecord : recordList) {
- LWhGoodsRecordVo vo = new LWhGoodsRecordVo();
- BeanUtils.copyProperties(lWhGoodsRecord, vo);
- //鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
- BaseGoodsModels baseGoodsModels = baseGoodsModelsService.get(new BaseGoodsModels(id));
- if (baseGoodsModels != null) {
- vo.setUnit(baseGoodsModels.getUnit());
- }
- voList.add(vo);
+ public Map<String, Object> 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,\n"
+ + "\tpm.BASE_GOODS_MODELS_NAME,\n"
+ + "\tpm.COUNTS num,\n"
+ + "\tpm.PRICE,\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";
+ Map<String, Object> paramts = new HashMap<>();
+ paramts.put("id", id);
+ List<Map<String, Object>> select = this.select(sql, paramts, new MapperUtil());
+ List<TemplateExcelTransfer> list = Lists.newArrayList();
+ select.forEach(item -> {
+ TemplateExcelTransfer templateExcelTransfer = MapUtils.convertMapToObj(item, TemplateExcelTransfer.class);
+ if (type == 1) {
+ templateExcelTransfer.setTenantName(templateExcelTransfer.getOutAgencyName());
+ } else {
+ templateExcelTransfer.setTenantName(templateExcelTransfer.getInAgencyName());
}
- }
- result.setRecordVoList(voList);
+ list.add(templateExcelTransfer);
+ });
- return result;
+ int countNum = list.stream().filter(item -> item.getNum() != null).mapToInt(TemplateExcelTransfer::getNum).sum();
+ int totalAmount = list.stream().filter(export -> export.getTotalAmount() != null).mapToInt(TemplateExcelTransfer::getTotalAmount).sum();
+ Optional<TemplateExcelTransfer> first = list.stream().findFirst();
+ TemplateExcelTransfer entity = first.get();
+ String businessFormCode = entity.getBusinessFormCode();
+ Long createTime = entity.getCreateTime();
+ String operatorName = entity.getOperatorName();
+ String tenantName;
+ if (type == 1) {
+ tenantName = entity.getInAgencyName();
+ } else {
+ tenantName = entity.getOutAgencyName();
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("code", businessFormCode);
+ map.put("date", DateUtils.toShowDate(createTime));
+ map.put("tenantName", tenantName);
+ map.put("name", operatorName);
+ map.put("countNum", countNum);
+ map.put("totalAmount", totalAmount);
+ map.put("data", list);
+
+ return map;
}
/**
@@ -447,9 +474,10 @@
HashMap<String, Object> paramts = new HashMap<>();
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,"
- + "fstd.NAME departmentName,ft.OPERATOR_ID,ft.CREATE_TIME FROM l_wh_form_transfer ft "
+ + "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 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 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 ");
//鍗曞彿
@@ -472,7 +500,11 @@
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 ");
--
Gitblit v1.9.1