From 24fc98301c0b38a76b7d5aa704fe79a2e385e584 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 14:20:41 +0800
Subject: [PATCH] feat: 1、物品分发部门查询 2、分发新增数量校验
---
consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java | 440 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 377 insertions(+), 63 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 da88dcb..4a10dbc 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
@@ -2,28 +2,34 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.pojo.LWhFormTransferParam;
-import com.consum.base.pojo.LWhProcureModelParams;
-import com.consum.base.util.IdUtil;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.base.core.utils.MapUtils;
+import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.pojo.LWhFormTransferGoodsInfoParam;
+import com.consum.base.pojo.LWhProcureModelUserParam;
+import com.consum.base.pojo.LWhTransferModelParam;
+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.*;
import com.consum.model.vo.LWhFormOutputVo;
-import com.consum.model.vo.LWhFormTransferVo;
import com.consum.model.vo.LWhGoodsRecordVo;
import com.iplatform.model.po.S_user_core;
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 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.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
/**
* @Description 璋冩嫧绠＄悊
@@ -51,33 +57,101 @@
private LWhGoodsRecordService lWhGoodsRecordService;
@Autowired
private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ @Autowired
+ private LWhProcureModelUserServiceImpl lWhProcureModelUserService;
+ @Autowired
+ private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
+ @Autowired
+ private BaseWarehouseManagerServiceImpl baseWarehouseManagerService;
- private static String QUERY_FORM_TRANSFER_LIST = "SELECT * FROM l_wh_form_transfer WHERE 1 = 1";
+ 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 ";
+
/**
* @Description 鏂板
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
- public int add(LWhFormTransferParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
+ public int add(LWhFormTransferParam param, FinSysTenantUser sysInfo) throws Exception {
//1.鏂板璋冩嫧鍗曡褰�
LWhFormTransfer lWhFormTransfer = new LWhFormTransfer();
//璋冩嫧鍗昳d
long lWhFormTransferId = IdUtil.generateId();
lWhFormTransfer.setId(lWhFormTransferId);
- lWhFormTransfer.setBusinessType(0);
- lWhFormTransfer.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Transfer));
- Long warehouseId = param.getInWarehouseId();
- lWhFormTransfer.setInWarehouseId(warehouseId);
- //鏍规嵁浠撳簱id鏌ヨ浠撳簱
- BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);
- if (warehouse == null) {
- log.error("浠撳簱涓嶅瓨鍦�");
- return 0;
+
+ Integer businessType = param.getTransferBusinessType();
+ // 鍗曟嵁绫诲瀷銆�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.setInWarehouseName(warehouse.getWarehouseName());
- lWhFormTransfer.setInAgencyId(Long.valueOf(sysInfo.getTenantId()));
- lWhFormTransfer.setInAgencyName(sysInfo.getTenantName());
+
+ lWhFormTransfer.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(codeGeneratorEnum));
+
+ Long warehouseId = param.getInWarehouseId();
+ // 璋冩嫧绫诲瀷鍗曟嵁
+ if (businessType == 0) {
+ //鍏ュ簱浠撳簱涓哄綋鍓嶇敤鎴风殑榛樿浠撳簱
+ String tenantId = sysInfo.getTenantId();
+ String tenantName = sysInfo.getTenantName();
+ BaseWarehouse warehouse = baseWarehouseService.getDefaultWarehouseByAgencyId(Long.valueOf(tenantId));
+ if (warehouse == null) {
+ log.error("浠撳簱涓嶅瓨鍦�");
+ throw new Exception("浠撳簱涓嶅瓨鍦�");
+ }
+ lWhFormTransfer.setInWarehouseId(warehouse.getId());
+ lWhFormTransfer.setInWarehouseName(warehouse.getWarehouseName());
+ lWhFormTransfer.setInAgencyId(Long.valueOf(tenantId));
+ lWhFormTransfer.setInAgencyName(tenantName);
+ }
+ //褰撲笟鍔＄被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
+ if (businessType == 1) {
+ //閮ㄩ棬鍒嗗彂绫诲瀷 鍑哄簱浠撳簱绫诲瀷0鏈烘瀯1閮ㄩ棬
+ //浠庡綋鍓嶇櫥褰曞簱绠′汉浠庡簱涓嚭搴擄紝鍏ュ埌鎵�閫夐儴闂ㄧ殑涓�
+
+ //鏌ヨ搴撶鍛樹俊鎭拰鐩稿叧浠撳簱
+ Long id = sysInfo.getId();
+ BaseWarehouseManager manager = new BaseWarehouseManager();
+ manager.setManagerId(id);
+ 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);
+
+ 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.setOutOperatorId(sysInfo.getId());
+ lWhFormTransfer.setOutOperatorName(sysInfo.getUserName());
+ lWhFormTransfer.setOutputTime(param.getCreateTime());
+ lWhFormTransfer.setTel(param.getTel());
+ }
+ }
+
//鏍规嵁鏈烘瀯id鏌ヨ璋冩嫧鏈烘瀯
FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(param.getOutAgencyId()));
if (finSysTenant == null) {
@@ -89,68 +163,126 @@
lWhFormTransfer.setOperatorId(sysInfo.getId());
lWhFormTransfer.setOperatorName(sysInfo.getUserName());
lWhFormTransfer.setCreateTime(param.getCreateTime());
+ //0=寰呭嚭搴擄紱1=寰呮帴鏀讹紱2=宸插叆搴撳簱:4=宸叉挙閿�
lWhFormTransfer.setStates(0);
lWhFormTransfer.setProcureDoc(param.getProcureDoc());
+
int flag1 = this.insert(lWhFormTransfer);
if (flag1 == 0) {
log.error("鏂板璋冩嫧鍗曞け璐�");
return 0;
}
+
//2.鏂板鐗╁搧鍨嬪彿璁板綍
- List<LWhProcureModelParams> models = param.getModels();
+ List<LWhFormTransferGoodsInfoParam> transferGoods = param.getTransferGoods();
List<LWhProcureModel> modelList = new ArrayList<>();
- for (LWhProcureModelParams model : models) {
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- lWhProcureModel.setId(IdUtil.generateId());
- lWhProcureModel.setBusinessType(2);
- lWhProcureModel.setBusinessId(lWhFormTransferId);
- lWhProcureModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
- lWhProcureModel.setCounts(model.getCounts());
- //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0,warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
- lWhProcureModel.setWorehouseCount(goodsNum);
- modelList.add(lWhProcureModel);
+ for (LWhFormTransferGoodsInfoParam transferGoodsInfo : transferGoods) {
+ for (LWhTransferModelParam model : transferGoodsInfo.getModels()) {
+ LWhProcureModel lWhProcureModel = new LWhProcureModel();
+ lWhProcureModel.setId(IdUtil.generateId());
+ // 鎸戞嫧涓氬姟绫诲瀷杞崲鍒扮墿鍝佺被鍨�
+ // 鐗╁搧绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂
+ Long baseGoodsModelsId = model.getBaseGoodsModelsId();
+ if (businessType == 0) {
+ lWhProcureModel.setBusinessType(2);
+ //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
+ lWhProcureModel.setWorehouseCount(goodsNum);
+ }
+ lWhProcureModel.setCounts(model.getCounts());
+ lWhProcureModel.setBusinessId(lWhFormTransferId);
+ lWhProcureModel.setBaseGoodsModelsId(baseGoodsModelsId);
+ //鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
+ BaseGoodsModels baseGoodsModels = this.baseGoodsModelsService.get(new BaseGoodsModels(baseGoodsModelsId));
+ if (baseGoodsModels != null) {
+ lWhProcureModel.setBaseGoodsModelsName(baseGoodsModels.getModelName());
+ }
+ lWhProcureModel.setSupplier(transferGoodsInfo.getSupplier());
+
+ //3.褰撲笟鍔＄被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
+ // 鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂
+ //閮ㄩ棬鍒嗗彂绫诲瀷
+ if (businessType == 1) {
+ lWhProcureModel.setBusinessType(4);
+ LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
+ lWhProcureModelUserRecord.setId(IdUtil.generateId());
+ lWhProcureModelUserRecord.setTransBusinessId(lWhFormTransferId);
+ lWhProcureModelUserRecord.setOperatorId(sysInfo.getId());
+ lWhProcureModelUserRecord.setOperatorName(sysInfo.getUserName());
+ lWhProcureModelUserRecordService.insert(lWhProcureModelUserRecord);
+
+ List<LWhProcureModelUser> procureModelUserList = Lists.newArrayList();
+ for (LWhProcureModelUserParam lWhProcureModelUserParam : model.getProcureModelUserList()) {
+ LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
+ lWhProcureModelUser.setId(IdUtil.generateId());
+ lWhProcureModelUser.setTransBusinessId(lWhFormTransferId);
+ lWhProcureModelUser.setWhProcureModelId(lWhProcureModel.getId());
+ lWhProcureModelUser.setBaseGoodsModelsId(baseGoodsModelsId);
+ lWhProcureModelUser.setNowUserName(lWhProcureModelUserParam.getNowUserName());
+ lWhProcureModelUser.setNowUserPhone(lWhProcureModelUserParam.getNowUserPhone());
+ lWhProcureModelUser.setGoodsNum(lWhProcureModelUserParam.getGoodsNum());
+ lWhProcureModelUser.setProcureModelUserRecordId(lWhProcureModelUserRecord.getId());
+ procureModelUserList.add(lWhProcureModelUser);
+ }
+ int procureInsertNum = lWhProcureModelUserService.insert(procureModelUserList);
+ if (procureInsertNum != procureModelUserList.size()) {
+ log.error("鏂板鐗╁搧浣跨敤淇℃伅澶辫触");
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return 0;
+ }
+
+ }
+
+ modelList.add(lWhProcureModel);
+ }
}
+
int flag2 = this.lWhProcureModelService.insert(modelList);
if (flag2 != modelList.size()) {
log.error("鏂板鐗╁搧鍨嬪彿澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return 0;
}
+
return 1;
}
+
/**
- * @Description 鍒楄〃鏌ヨ
+ * @Description 鍒楄〃鏌ヨ
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
- public GenericPager<LWhFormTransfer> queryFormTransferList(LWhFormTransferParam param) {
+ 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 like :businessFormCode ");
- paramts.put("businessFormCode", StringUtils.CHAR_PERCENT + param.getBusinessFormCode() + StringUtils.CHAR_PERCENT);
+ sql.append(" and BUSINESS_FORM_CODE = :businessFormCode ");
+ paramts.put("businessFormCode", param.getBusinessFormCode());
+ }
+ if (param.getQryType() != null) {
+ sql.append("and ft.BUSINESS_TYPE = :businessType ");
+ paramts.put("businessType", param.getQryType());
}
//鐗╁搧鍚嶇О
if (!StringUtils.isEmpty(param.getGoodsTemplateName())) {
- sql.append(" AND id IN (SELECT BUSINESS_ID FROM L_WH_PROCURE_MODEL procureModel LEFT JOIN BASE_GOODS_MODELS baseModel ON procureModel.BASE_GOODS_MODELS_ID=baseModel.ID LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseModel.GOODS_TEMPLATES_ID=baseTemp.id WHERE procureModel.BUSINESS_TYPE=1 AND baseTemp.GOODS_NAME LIKE :goodsTemplateName)");
+ sql.append("AND bgt.GOODS_NAME LIKE :goodsTemplateName ");
paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
//璋冩嫧鏈烘瀯
- if (param.getOutAgencyId() != null){
+ if (param.getOutAgencyId() != null) {
sql.append(" and OUT_AGENCY_ID = :OUT_AGENCY_ID ");
paramts.put("OUT_AGENCY_ID", param.getOutAgencyId());
}
//鎺ユ敹鏈烘瀯
- if (param.getInAgencyId() != null){
+ if (param.getInAgencyId() != null) {
sql.append(" and IN_AGENCY_ID = :IN_AGENCY_ID ");
- paramts.put("IN_AGENCY_ID", param.getInAgencyId() );
+ paramts.put("IN_AGENCY_ID", param.getInAgencyId());
}
//鐘舵��
if (param.getStates() != null) {
- sql.append(" and states =:states ");
+ sql.append(" and ft.states =:states ");
paramts.put("states", param.getStates());
}
//鍒涘缓浜�
@@ -160,51 +292,103 @@
}
//鐢宠鏃堕棿
if (param.getCreateTimeStart() != null) {
- sql.append(" and CREATE_TIME >=:createTimeStart ");
+ sql.append(" and ft.CREATE_TIME >=:createTimeStart ");
paramts.put("createTimeStart", param.getCreateTimeStart() * 1000000);
}
if (param.getCreateTimeEnd() != null) {
- sql.append(" and CREATE_TIME <:createTimeEnd ");
+ sql.append(" and ft.CREATE_TIME <:createTimeEnd ");
paramts.put("createTimeEnd", param.getCreateTimeEnd() * 1000000 + 240000);
}
//鎺ユ敹鏃堕棿
- if (param.getInTimeStart() != null) {
+ if (param.getStartTime() != null) {
sql.append(" and IN_TIME >=:inTimeStart ");
- paramts.put("inTimeStart", param.getInTimeStart() * 1000000);
+ paramts.put("inTimeStart", param.getStartTime() * 1000000);
}
- if (param.getInTimeEnd() != null) {
+ if (param.getEndTime() != null) {
sql.append(" and IN_TIME <:inTimeEnd ");
- paramts.put("inTimeEnd", param.getInTimeEnd() * 1000000 + 240000);
+ paramts.put("inTimeEnd", param.getEndTime() * 1000000 + 240000);
}
- sql.append(" ORDER BY CREATE_TIME DESC");
+ sql.append(" ORDER BY ft.CREATE_TIME DESC");
GenericPager genericPager = selectSplit(sql.toString(), paramts, new LWhFormTransfer());
return genericPager;
}
/**
- * @Description 鏍规嵁id鏌ヨ璇︽儏
+ * @Description 鏍规嵁id鏌ヨ璇︽儏
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
- public LWhFormTransferVo getById(Long id) {
- LWhFormTransferVo vo = new LWhFormTransferVo();
+ public LWHFromTransferExtendVO getById(Long id) {
+ LWHFromTransferExtendVO result = new LWHFromTransferExtendVO();
//1.鏌ヨ璋冩嫧鍗�
LWhFormTransfer lWhFormTransfer = this.get(new LWhFormTransfer(id));
if (lWhFormTransfer != null) {
- BeanUtils.copyProperties(lWhFormTransfer,vo);
+ BeanUtils.copyProperties(lWhFormTransfer, result);
+ result.setDepartmentName(lWhFormTransfer.getInWarehouseName());
}
- //2.鏌ヨ鐗╁搧鍨嬪彿
- List<LWhProcureModel> models = this.lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, id);
- if (!CollectionUtils.isEmpty(models)) {
- vo.setModels(models);
+
+ 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());
+
+ 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);
+
+ // 鏌ヨ鍨嬪彿鏁伴噺
+ 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";
+ List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, paramMap, 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);
}
- return vo;
+ result.setFormTransferGoods(formTransferGoods);
+
+ return result;
}
+
/**
- * @Description 瀵煎嚭璋冩嫧鍑哄簱鍗�
+ * @Description 瀵煎嚭璋冩嫧鍑哄簱鍗�
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
@@ -215,8 +399,8 @@
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);
+ if (lWhFormOutput != null) {
+ BeanUtils.copyProperties(lWhFormOutput, result);
}
//3.鏍规嵁杩涘嚭搴撴祦姘存�昏〃id鏌ヨl_wh_goods_record
LWhGoodsRecord record = new LWhGoodsRecord();
@@ -226,7 +410,7 @@
if (!CollectionUtils.isEmpty(recordList)) {
for (LWhGoodsRecord lWhGoodsRecord : recordList) {
LWhGoodsRecordVo vo = new LWhGoodsRecordVo();
- BeanUtils.copyProperties(lWhGoodsRecord,vo);
+ BeanUtils.copyProperties(lWhGoodsRecord, vo);
//鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
BaseGoodsModels baseGoodsModels = baseGoodsModelsService.get(new BaseGoodsModels(id));
if (baseGoodsModels != null) {
@@ -242,6 +426,7 @@
/**
* 鎾ら攢
+ *
* @author 鍗㈠簡闃�
* @date 2023/10/31
*/
@@ -250,4 +435,133 @@
lWhFormTransfer.setStates(4);
return this.update(lWhFormTransfer);
}
+
+ public GenericPager<Map<String, Object>> queryTransferInfo(TransferQry transferQry) {
+
+ 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,"
+ + "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 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);
+ }
+ //鐗╁搧鍚嶇О
+ if (StringUtils.isNotEmpty(transferQry.getGoodsTemplateName())) {
+ sql.append("AND bgt.GOODS_NAME like:goodsName ");
+ 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 (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);
+ }
+ if (transferQry.getEndTime() != null) {
+ sql.append("AND ft.CREATE_TIME <:createTimeEnd ");
+ paramts.put("createTimeEnd", transferQry.getEndTime() * 1000000 + 240000);
+ }
+ sql.append("ORDER BY ft.CREATE_TIME DESC");
+
+ 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 ");
+ if (StringUtils.isNotEmpty(param.getBusinessFormCode())) {
+ sql.append("AND ft.BUSINESS_FORM_CODE = :businessFormCode ");
+ params.put("businessFormCode", param.getBusinessFormCode());
+ }
+ if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
+ sql.append("AND bgt.GOODS_NAME like :goodsName ");
+ params.put("goodsName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ }
+ 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());
+ }
+ if (param.getOutAgencyId() != null) {
+ sql.append("AND ft.IN_AGENCY_ID like :inAgencyId ");
+ params.put("inAgencyId", param.getInAgencyId());
+ }
+ 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);
+ }
+ if (param.getCreateTimeEnd() != null) {
+ 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);
+ }
+ if (param.getEndTime() != null) {
+ 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());
+ 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";
+ HashMap<String, Object> param = new HashMap<>();
+ List<Map<String, Object>> select = this.select(sql, param, new MapperUtil());
+ select.forEach(item -> {
+
+ });
+ return select;
+
+ }
}
--
Gitblit v1.9.1