From abc5baf903a2bd229fb7f2decd35b26536d86e13 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 29 十一月 2023 15:07:57 +0800
Subject: [PATCH] 部门分发增加出库和入库
---
consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java | 300 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 191 insertions(+), 109 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 a9be7ec..ca86152 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
@@ -3,19 +3,20 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.utils.IdUtil;
-import com.consum.base.core.utils.MapRowMapper;
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.LWhFormTransferParam;
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.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;
@@ -23,6 +24,7 @@
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;
@@ -34,6 +36,7 @@
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;
@@ -69,8 +72,15 @@
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 ";
/**
@@ -78,7 +88,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
@@ -89,26 +99,76 @@
// 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
// TODO 鏋氫妇瀛楀吀
lWhFormTransfer.setBusinessType(businessType);
-
- lWhFormTransfer.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Transfer));
- Long warehouseId = param.getInWarehouseId();
- lWhFormTransfer.setInWarehouseId(warehouseId);
- //鍏ュ簱浠撳簱涓哄綋鍓嶇敤鎴风殑榛樿浠撳簱
- String tenantId = sysInfo.getTenantId();
- BaseWarehouse warehouse = baseWarehouseService.getDefaultWarehouseByAgencyId(Long.valueOf(tenantId));
- if (warehouse == null) {
- log.error("浠撳簱涓嶅瓨鍦�");
- throw new Exception("浠撳簱涓嶅瓨鍦�");
+ CodeGeneratorEnum codeGeneratorEnum = null;
+ if (businessType == 0) {
+ codeGeneratorEnum = CodeGeneratorEnum.Transfer;
+ } else if (businessType == 1) {
+ codeGeneratorEnum = CodeGeneratorEnum.Distribute;
+ } else if (businessType == 2) {
+ codeGeneratorEnum = CodeGeneratorEnum.GOBACK;
}
- lWhFormTransfer.setInWarehouseId(warehouse.getId());
- lWhFormTransfer.setInWarehouseName(warehouse.getWarehouseName());
- lWhFormTransfer.setInAgencyId(Long.valueOf(tenantId));
- 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) {
log.error("璋冩嫧鏈烘瀯涓嶅瓨鍦�");
- return 0;
}
lWhFormTransfer.setOutAgencyId(finSysTenant.getId());
lWhFormTransfer.setOutAgencyName(finSysTenant.getName());
@@ -119,16 +179,9 @@
lWhFormTransfer.setStates(0);
lWhFormTransfer.setProcureDoc(param.getProcureDoc());
- //3.褰撲笟鍔＄被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
- if (businessType == 1) {
- //閮ㄩ棬鍒嗗彂绫诲瀷 鍑哄簱浠撳簱绫诲瀷0鏈烘瀯1閮ㄩ棬
- // TODO 鍑哄簱涓氬姟绫诲瀷 鑱旂郴鐢佃瘽
- lWhFormTransfer.setOutWarehouseType(1);
- }
int flag1 = this.insert(lWhFormTransfer);
if (flag1 == 0) {
log.error("鏂板璋冩嫧鍗曞け璐�");
- return 0;
}
//2.鏂板鐗╁搧鍨嬪彿璁板綍
@@ -138,52 +191,56 @@
for (LWhTransferModelParam model : transferGoodsInfo.getModels()) {
LWhProcureModel lWhProcureModel = new LWhProcureModel();
lWhProcureModel.setId(IdUtil.generateId());
- // 鐗╁搧鍨嬪彿涓氬姟绫诲瀷
+ // 鎸戞嫧涓氬姟绫诲瀷杞崲鍒扮墿鍝佺被鍨�
// 鐗╁搧绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂
- switch (businessType) {
- case 0:
- lWhProcureModel.setBusinessType(2);
- break;
- case 1:
- lWhProcureModel.setBusinessType(4);
- break;
- default:
- lWhProcureModel.setBusinessType(null);
+ Long baseGoodsModelsId = model.getBaseGoodsModelsId();
+ if (businessType == 0) {
+ lWhProcureModel.setBusinessType(2);
+ //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
+ lWhProcureModel.setWorehouseCount(goodsNum);
}
- lWhProcureModel.setBusinessId(lWhFormTransferId);
- lWhProcureModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
lWhProcureModel.setCounts(model.getCounts());
+ lWhProcureModel.setBusinessId(lWhFormTransferId);
+ lWhProcureModel.setBaseGoodsModelsId(baseGoodsModelsId);
//鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
- BaseGoodsModels baseGoodsModels = this.baseGoodsModelsService.get(new BaseGoodsModels(model.getBaseGoodsModelsId()));
+ BaseGoodsModels baseGoodsModels = this.baseGoodsModelsService.get(new BaseGoodsModels(baseGoodsModelsId));
if (baseGoodsModels != null) {
lWhProcureModel.setBaseGoodsModelsName(baseGoodsModels.getModelName());
}
- //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, model.getBaseGoodsModelsId(), 1, null);
- lWhProcureModel.setWorehouseCount(goodsNum);
+ lWhProcureModel.setSupplier(transferGoodsInfo.getSupplier());
//3.褰撲笟鍔＄被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
// 鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂
- //TODO 閮ㄩ棬鍒嗗彂绫诲瀷
+ //閮ㄩ棬鍒嗗彂绫诲瀷
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(model.getBaseGoodsModelsId());
+ 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);
@@ -194,10 +251,8 @@
if (flag2 != modelList.size()) {
log.error("鏂板鐗╁搧鍨嬪彿澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return 0;
}
-
- return 1;
+ return lWhFormTransferId;
}
@@ -214,10 +269,13 @@
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=2 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);
}
//璋冩嫧鏈烘瀯
@@ -232,7 +290,7 @@
}
//鐘舵��
if (param.getStates() != null) {
- sql.append(" and states =:states ");
+ sql.append(" and ft.states =:states ");
paramts.put("states", param.getStates());
}
//鍒涘缓浜�
@@ -242,11 +300,11 @@
}
//鐢宠鏃堕棿
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);
}
//鎺ユ敹鏃堕棿
@@ -258,8 +316,13 @@
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 CREATE_TIME DESC");
+ sql.append(" ORDER BY ft.CREATE_TIME DESC");
GenericPager genericPager = selectSplit(sql.toString(), paramts, new LWhFormTransfer());
return genericPager;
@@ -276,15 +339,18 @@
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 "
+ 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 ";
+ + "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);
@@ -293,36 +359,43 @@
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";
+ + "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);
}
result.setFormTransferGoods(formTransferGoods);
- /*//2.鏌ヨ鐗╁搧鍨嬪彿
- //List<LWhProcureModel> models = this.lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, id);
- List<LWhProcureModel> models = this.lWhProcureModelService.getModelByForm(null, id);
-
- if (!CollectionUtils.isEmpty(models)) {
- List<LWhProcureModelVo> lWhProcureModelVoList = Lists.newArrayList();
- for (LWhProcureModel model : models) {
- LWhProcureModelVo lWhProcureModelVo = new LWhProcureModelVo();
- BeanUtils.copyProperties(model, lWhProcureModelVo);
-
- LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
- lWhProcureModelUser.setWhProcureModelId(model.getId());
- List<LWhProcureModelUser> select = lWhProcureModelUserService.select(lWhProcureModelUser);
- lWhProcureModelVo.setProcureModelUsersList(select);
- lWhProcureModelVoList.add(lWhProcureModelVo);
- }
- vo.setModels(lWhProcureModelVoList);
- }*/
return result;
}
@@ -380,15 +453,13 @@
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(
- "SELECT\n" + "\tft.id,\n" + "\tft.BUSINESS_FORM_CODE businessCode,\n" + "\tbgt.GOODS_NAME goodsName,\n" + "\tbgt.CLASSIFICATION goodsType,\n"
- + "\tbgm.id goodsModelId,\n" + "\tbgm.MODEL_NAME goodsModelName,\n" + "\tpm.COUNTS goodsCount,\n" + "\tfst.`name` tennatName,\n"
- + "\tfstd.NAME departmentName,\n" + "\tft.OPERATOR_ID distributor,\n" + "\tft.CREATE_TIME TIME \n" + "FROM\n" + "\tl_wh_form_transfer ft\n"
- + "\tLEFT JOIN l_wh_procure_model pm ON ft.ID = pm.BUSINESS_ID\n"
- + "\tLEFT JOIN base_goods_models bgm ON bgm.GOODS_TEMPLATES_ID = pm.BASE_GOODS_MODELS_ID\n"
- + "\tLEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID\n"
- + "\tLEFT JOIN fin_sys_tenant_user fstu ON fstu.id = ft.OPERATOR_ID\n"
- + "\tLEFT JOIN fin_sys_tenant_department fstd ON fstu.SYS_DEPT_ID = fstd.ID \n"
- + "\tLEFT JOIN fin_sys_tenant fst ON fst.id = fstd.TENANT_ID where 1=1 ");
+ "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 ");
@@ -409,25 +480,29 @@
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.getCreateTimeStart() != null) {
+ if (transferQry.getStartTime() != null) {
sql.append("AND ft.CREATE_TIME >=:createTimeStart ");
- paramts.put("createTimeStart", transferQry.getCreateTimeStart() * 1000000);
+ paramts.put("createTimeStart", transferQry.getStartTime() * 1000000);
}
- if (transferQry.getCreateTimeEnd() != null) {
+ if (transferQry.getEndTime() != null) {
sql.append("AND ft.CREATE_TIME <:createTimeEnd ");
- paramts.put("createTimeEnd", transferQry.getCreateTimeEnd() * 1000000 + 240000);
+ 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 MapRowMapper());
+ new MapperUtil());
return mapGenericPager;
}
@@ -436,23 +511,13 @@
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());
@@ -499,4 +564,21 @@
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