From b0841619e23dd01b8fba9561ad9036c7c3d6aa08 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 14 十一月 2023 14:05:20 +0800
Subject: [PATCH] 出库单管理
---
consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 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 c13593f..6cda935 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,12 +2,12 @@
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.pojo.LWhFormTransferParam;
import com.consum.base.pojo.LWhProcureModelParams;
import com.consum.base.pojo.LWhProcureModelUserDTO;
-import com.consum.base.pojo.query.TransferQryDto;
-import com.consum.base.core.utils.IdUtil;
+import com.consum.base.pojo.query.TransferQry;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenant;
@@ -182,7 +182,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
- public GenericPager<LWhFormTransfer> queryFormTransferList(TransferQryDto param) {
+ public GenericPager<LWhFormTransfer> queryFormTransferList(TransferQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(QUERY_FORM_TRANSFER_LIST);
//璋冩嫧鍗曞彿
@@ -226,13 +226,13 @@
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");
@@ -324,7 +324,7 @@
return this.update(lWhFormTransfer);
}
- public GenericPager<Map<String, Object>> queryTransferInfo(TransferQryDto transferQryDto) {
+ public GenericPager<Map<String, Object>> queryTransferInfo(TransferQry transferQry) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder("SELECT\n"
@@ -348,43 +348,43 @@
+ "\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 ");
//鍗曞彿
- if (StringUtils.isNotEmpty(transferQryDto.getBusinessFormCode())) {
+ if (StringUtils.isNotEmpty(transferQry.getBusinessFormCode())) {
sql.append("AND BUSINESS_FORM_CODE like :businessFormCode ");
- paramts.put("businessFormCode", StringUtils.CHAR_PERCENT + transferQryDto.getBusinessFormCode() + StringUtils.CHAR_PERCENT);
+ paramts.put("businessFormCode", StringUtils.CHAR_PERCENT + transferQry.getBusinessFormCode() + StringUtils.CHAR_PERCENT);
}
//鐗╁搧鍚嶇О
- if (StringUtils.isNotEmpty(transferQryDto.getGoodsTemplateName())) {
+ if (StringUtils.isNotEmpty(transferQry.getGoodsTemplateName())) {
sql.append("AND bgt.GOODS_NAME like:goodsName ");
- paramts.put("goodsName", StringUtils.CHAR_PERCENT + transferQryDto.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ paramts.put("goodsName", StringUtils.CHAR_PERCENT + transferQry.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
// 瑙勬牸鍨嬪彿
- if (transferQryDto.getBaseGoodsTemplateId() != null) {
+ if (transferQry.getBaseGoodsTemplateId() != null) {
sql.append("AND bgm.id =:goodsModelId ");
- paramts.put("goodsModelId", transferQryDto.getBaseGoodsTemplateId());
+ paramts.put("goodsModelId", transferQry.getBaseGoodsTemplateId());
}
//璋冩嫧鏈烘瀯
- if (transferQryDto.getOutAgencyId() != null) {
+ if (transferQry.getOutAgencyId() != null) {
sql.append("AND OUT_AGENCY_ID = :OUT_AGENCY_ID ");
- paramts.put("OUT_AGENCY_ID", transferQryDto.getOutAgencyId());
+ paramts.put("OUT_AGENCY_ID", transferQry.getOutAgencyId());
}
//鍒涘缓浜�
- if (StringUtils.isNotEmpty(transferQryDto.getOperatorName())) {
+ if (StringUtils.isNotEmpty(transferQry.getOperatorName())) {
sql.append("AND ft.OPERATOR_NAME =:OPERATOR_NAME ");
- paramts.put("OPERATOR_NAME", transferQryDto.getOperatorName());
+ paramts.put("OPERATOR_NAME", transferQry.getOperatorName());
}
//鐢宠鏃堕棿
- if (transferQryDto.getCreateTimeStart() != null) {
+ if (transferQry.getCreateTimeStart() != null) {
sql.append("AND ft.CREATE_TIME >=:createTimeStart ");
- paramts.put("createTimeStart", transferQryDto.getCreateTimeStart() * 1000000);
+ paramts.put("createTimeStart", transferQry.getCreateTimeStart() * 1000000);
}
- if (transferQryDto.getCreateTimeEnd() != null) {
+ if (transferQry.getCreateTimeEnd() != null) {
sql.append("AND ft.CREATE_TIME <:createTimeEnd ");
- paramts.put("createTimeEnd", transferQryDto.getCreateTimeEnd() * 1000000 + 240000);
+ paramts.put("createTimeEnd", transferQry.getCreateTimeEnd() * 1000000 + 240000);
}
sql.append("ORDER BY ft.CREATE_TIME DESC");
- GenericPager<Map<String, Object>> mapGenericPager = this.selectSplit(sql.toString(), paramts, transferQryDto.getPageNum(), transferQryDto.getPageSize(),
+ GenericPager<Map<String, Object>> mapGenericPager = this.selectSplit(sql.toString(), paramts, transferQry.getPageNum(), transferQry.getPageSize(),
new MapRowMapper());
return mapGenericPager;
--
Gitblit v1.9.1