From b477ecb515017f4cda0c4b95b87ef92287f1e9ff Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期二, 21 十一月 2023 16:15:25 +0800
Subject: [PATCH] feat: 机构台账查询
---
consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java | 72 ++++++++++++++
consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java | 16 +++
consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java | 29 +++++
consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java | 5
consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java | 1
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java | 125 +++++++++++++++++++++++-
6 files changed, 237 insertions(+), 11 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
index f9e8b0b..5177428 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
@@ -1,21 +1,24 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.pojo.LWarehouseFlowParam;
import com.consum.base.pojo.response.WarehouseFlowVO;
import com.consum.base.service.LWarehouseFlowService;
+import com.consum.model.po.FinSysTenantUser;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.web.ResponseValue;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Map;
-import javax.annotation.Resource;
import org.apache.commons.compress.utils.Lists;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Map;
/**
* @ClassName lWarehouseFlowController
@@ -64,4 +67,22 @@
return ResponseValue.success(genericPager);
}
+ @GetMapping("/getTaiZhangList")
+ public ResponseValue getTaiZhangList( ) {
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ LWarehouseFlowParam param = CommonUtil.getObjFromReq(LWarehouseFlowParam.class);
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ String tenantId = sysInfo.getTenantId();
+ Long paramAgencyId = param.getAgencyId();
+ if (paramAgencyId == null || !paramAgencyId.toString().startsWith(tenantId)) {
+ param.setAgencyId(Long.valueOf(tenantId));
+ }
+ GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryTaiZhangList(param);
+ return ResponseValue.success(genericPager);
+ }
+
}
diff --git a/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java b/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java
index 2e6445f..4c19f65 100644
--- a/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java
+++ b/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java
@@ -1,5 +1,8 @@
package com.consum.base.core;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @ClassName WhBusinessEnum
* @Date 2023/10/24
@@ -46,4 +49,73 @@
public short getValue() {
return value;
}
+
+ /**
+ * flowType杞负 杩涘嚭搴撴祦姘存�昏〃[L_WAREHOUSE_FLOW] 鐨� THIS_TYPE锛氭湰娆¤皟鏁寸被鍨� 鍜� BUSINESS_TYPE锛氬崟鎹被鍨�
+ *
+ * @param flowType 鍚岀爜琛紝1閲囪喘鍏ュ簱 2閫�杩樺叆搴� 3璋冩嫧鍏ュ簱 4鐩樼泩鍏ュ簱 5鐢抽鍑哄簱 6璋冩嫧鍑哄簱 7鐩樹簭鍑哄簱 8鎶ュ簾鍑哄簱 9鍏朵粬鍑哄簱
+ * @return flowThisType锛氭湰娆¤皟鏁寸被鍨嬶紙1=璋冨锛�2=璋冨噺锛�
+ * flowBusinessType锛氬崟鎹被鍨� 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
+ */
+ public static Map<String, Short> getTypeByFlowType(Short flowType) {
+ //鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
+ Short flowBusinessType = null;
+ //1=璋冨锛�2=璋冨噺
+ Short flowThisType = null;
+ //鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
+ Short transferBusinessType = null;
+ switch (flowType) {
+ //1閲囪喘鍏ュ簱
+ case 1:
+ flowThisType = 1;
+ flowBusinessType = 1;
+ break;
+ //2閫�杩樺叆搴�
+ case 2:
+ flowThisType = 1;
+ flowBusinessType = 2;
+ break;
+ //3璋冩嫧鍏ュ簱
+ case 3:
+ flowThisType = 1;
+ flowBusinessType = 3;
+ break;
+ // 4鐩樼泩鍏ュ簱
+ case 4:
+ flowThisType = 1;
+ flowBusinessType = 7;
+ break;
+ //5鐢抽鍑哄簱
+ case 5:
+ flowThisType = 2;
+ flowBusinessType = 4;
+// transferBusinessType = 1;
+ break;
+ // 6璋冩嫧鍑哄簱
+ case 6:
+ flowThisType = 2;
+ flowBusinessType = 2;
+// transferBusinessType = 1;
+ break;
+ //7鐩樹簭鍑哄簱
+ case 7:
+ flowThisType = 2;
+ flowBusinessType = 7;
+ break;
+ // 8鎶ュ簾鍑哄簱
+ case 8:
+ flowThisType = 2;
+ flowBusinessType = 5;
+ break;
+ // 9鍏朵粬鍑哄簱
+ case 9:
+ flowThisType = 2;
+ flowBusinessType = 3;
+ break;
+ }
+ Map<String, Short> rtnMap = new HashMap<>();
+ rtnMap.put("flowBusinessType", flowBusinessType);
+ rtnMap.put("flowThisType", flowThisType);
+ return rtnMap;
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java b/consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java
index 47d3d85..dbfcc29 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java
@@ -24,6 +24,7 @@
//鐗╁搧鍚嶇О
@ApiModelProperty(value = "鐗╁搧鍚嶇О")
private String goodsTemplateName;
+ private Long goodsTemplateId;
//瑙勬牸鍨嬪彿
@ApiModelProperty(value = "瑙勬牸鍨嬪彿")
private String baseGoodsModelsName;
@@ -32,6 +33,21 @@
@ApiModelProperty(value = "鏈烘瀯")
private Long agencyId;
+ @ApiModelProperty("浠撳簱绫诲瀷")
+ private Long warehouseType;
+
+ @ApiModelProperty("浠撳簱id")
+ private Long baseWarehouseId;
+
+ @ApiModelProperty("瑙勬牸鍨嬪彿")
+ private Long baseGoodsModelsId;
+
+ @ApiModelProperty("浠峰�肩被鍨�")
+ private Short costType;
+
+ @ApiModelProperty("鍚岀爜琛紝1閲囪喘鍏ュ簱 2閫�杩樺叆搴� 3璋冩嫧鍏ュ簱 4鐩樼泩鍏ュ簱 5鐢抽鍑哄簱 6璋冩嫧鍑哄簱 7鐩樹簭鍑哄簱 8鎶ュ簾鍑哄簱 9鍏朵粬鍑哄簱")
+ private Short flowType;
+
//鍒涘缓浜�
@ApiModelProperty(value = "鍒涘缓浜�")
private String createdName;
diff --git a/consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java b/consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java
index 3c608a6..3b8b474 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java
@@ -17,6 +17,7 @@
public class WhWarningQry extends ParamRequest {
@ApiModelProperty("鐗╁搧鍚嶇О")
private String goodsTemplateName;
+ private String goodsTemplateId;
@ApiModelProperty("瑙勬牸鍨嬪彿")
private Long baseGoodsModelsId;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
index 8e4e322..1ca6edb 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
@@ -1,5 +1,6 @@
package com.consum.base.service;
+import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.utils.MapRowMapper;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.LWarehouseFlowParam;
@@ -7,9 +8,10 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
import java.util.HashMap;
import java.util.Map;
-import org.springframework.stereotype.Service;
/**
* @ClassName LWarehouseFlowService
@@ -26,7 +28,7 @@
* @param param
* @return
*/
- private static String QUERY_BUSINESS_FLOW = "SELECT flow.BUSINESS_TYPE,flow.BUSINESS_FORM_ID,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.BUSINESS_FORM_CODE END BUSINESS_FORM_CODE,record.GOODS_TEMPLATE_NAME,record.BASE_GOODS_MODELS_NAME,record.THIS_COUNT,record.THIS_TYPE,record.total_price,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.AGENCY_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.AGENCY_NAME END AGENCY_NAME,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUYER_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.OPERATOR_NAME END created_Name,flow.DEAL_TIME deal_Time FROM L_WAREHOUSE_FLOW flow LEFT JOIN L_WH_GOODS_RECORD record ON flow.id=record.WAREHOUSE_FLOW_ID LEFT JOIN L_WH_FORM_PROCURE tCaiGou ON flow.BUSINESS_TYPE=1 AND tCaiGou.id=flow.BUSINESS_FORM_ID LEFT JOIN L_WH_FORM_OUTPUT tFormOut ON flow.BUSINESS_TYPE=3 AND tFormOut.id=flow.BUSINESS_FORM_ID WHERE 1=1 ";
+ private String QUERY_BUSINESS_FLOW = "SELECT flow.BUSINESS_TYPE,flow.BUSINESS_FORM_ID,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.BUSINESS_FORM_CODE END BUSINESS_FORM_CODE,record.GOODS_TEMPLATE_NAME,record.BASE_GOODS_MODELS_NAME,record.THIS_COUNT,record.THIS_TYPE,record.total_price,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.AGENCY_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.AGENCY_NAME END AGENCY_NAME,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUYER_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.OPERATOR_NAME END created_Name,flow.DEAL_TIME deal_Time FROM L_WAREHOUSE_FLOW flow LEFT JOIN L_WH_GOODS_RECORD record ON flow.id=record.WAREHOUSE_FLOW_ID LEFT JOIN L_WH_FORM_PROCURE tCaiGou ON flow.BUSINESS_TYPE=1 AND tCaiGou.id=flow.BUSINESS_FORM_ID LEFT JOIN L_WH_FORM_OUTPUT tFormOut ON flow.BUSINESS_TYPE=3 AND tFormOut.id=flow.BUSINESS_FORM_ID WHERE 1=1 ";
public GenericPager<Map<String, Object>> queryBusinessFlow(LWarehouseFlowParam param) {
StringBuilder sql = new StringBuilder(QUERY_BUSINESS_FLOW);
@@ -40,7 +42,7 @@
}
if (StringUtils.isNotEmpty(param.getBusinessFormCode())) {
sql.append(" AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUSINESS_FORM_CODE=:businessFormCode"
- + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE=:businessFormCode END");
+ + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE=:businessFormCode END");
paramts.put("businessFormCode", param.getBusinessFormCode());
// sql.append(" AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN flow.BUSINESS_FORM_CODE=?");
// params.add(param.getBusinessFormCode());
@@ -61,7 +63,7 @@
}
if (param.getCreatedName() != null) {
sql.append(" AND CASE" + " WHEN flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUYER_NAME LIKE :createdName"
- + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.OPERATOR_NAME LIKE :createdName END");
+ + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.OPERATOR_NAME LIKE :createdName END");
paramts.put("createdName", StringUtils.CHAR_PERCENT + param.getCreatedName() + StringUtils.CHAR_PERCENT);
}
if (param.getDealTimeStart() != null) {
@@ -80,7 +82,7 @@
Map<String, Object> paramts = new HashMap<>();
if (StringUtils.isNotEmpty(param.getBusinessFormCode())) {
sql.append("AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUSINESS_FORM_CODE=:businessFormCode"
- + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE=:businessFormCode END ");
+ + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE=:businessFormCode END ");
paramts.put("businessFormCode", param.getBusinessFormCode());
}
if (StringUtils.isNotEmpty(param.getGoodsName())) {
@@ -99,7 +101,7 @@
if (StringUtils.isNotEmpty(param.getCreateName())) {
sql.append("AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUYER_NAME = :createdName"
- + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.OPERATOR_NAME = :createdName END ");
+ + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.OPERATOR_NAME = :createdName END ");
paramts.put("createdName", param.getCreateName());
}
if (param.getStartTime() != null) {
@@ -132,4 +134,115 @@
return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
}
+
+ /**
+ * 鍙拌处鏌ヨ
+ *
+ * @param param
+ * @return
+ */
+ private String QUERY_TAIZHANG_LIST_QUERY = "SELECT CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.AGENCY_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.AGENCY_NAME END AGENCY_NAME,ware.WAREHOUSE_NAME,record.GOODS_TEMPLATE_NAME,record.BASE_GOODS_MODELS_NAME,record.THIS_TYPE,flow.BUSINESS_TYPE,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=2 THEN tTrans.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.BUSINESS_FORM_CODE END BUSINESS_FORM_CODE,record.THIS_COUNT,record.INITIAL_COUNT,record.END_COUNT,flow.DEAL_TIME,CASE WHEN flow.BUSINESS_TYPE=2 AND tTrans.STATES=1 THEN record.THIS_COUNT ELSE 0 END zai_Tu_Count FROM (SELECT*FROM BASE_WAREHOUSE WHERE 1=1 ";
+ private String QUERY_TAIZHANG_LIST_RECORD = ")ware LEFT JOIN L_WAREHOUSE_FLOW flow ON ware.id=flow.WAREHOUSE_ID AND flow.WAREHOUSE_TYPE=0 LEFT JOIN L_WH_GOODS_RECORD record ON flow.id=record.WAREHOUSE_FLOW_ID ";
+ private String QUERY_TAIZHANG_LIST_END = " WHERE flow.id IS NOT NULL";
+ private String QUERY_TAIZHANG_LIST_CAIGOU = " LEFT JOIN L_WH_FORM_PROCURE tCaiGou ON flow.BUSINESS_TYPE=1 AND tCaiGou.id=flow.BUSINESS_FORM_ID ";
+ private String QUERY_TAIZHANG_LIST_DIAOBO = " LEFT JOIN L_WH_FORM_TRANSFER tTrans ON (flow.BUSINESS_TYPE=2 or flow.BUSINESS_TYPE=4 or flow.BUSINESS_TYPE=6) AND tTrans.id=flow.BUSINESS_FORM_ID ";
+ private String QUERY_TAIZHANG_LIST_CHUKU = " LEFT JOIN L_WH_FORM_OUTPUT tFormOut ON flow.BUSINESS_TYPE=3 AND tFormOut.id=flow.BUSINESS_FORM_ID ";
+ private String QUERY_TAIZHANG_LIST_PANDIAN = " LEFT JOIN L_WH_FORM_INVENTORY tInventory ON flow.BUSINESS_TYPE=7 AND tInventory.id=flow.BUSINESS_FORM_ID ";
+ private String QUERY_TAIZHANG_LIST_BAOFEI = " LEFT JOIN L_WH_FORM_SCRAPPED tScrapped ON flow.BUSINESS_TYPE=5 AND tScrapped.id=flow.BUSINESS_FORM_ID ";
+
+ public GenericPager<Map<String, Object>> queryTaiZhangList(LWarehouseFlowParam param) {
+ StringBuilder sqlQuery = new StringBuilder(QUERY_TAIZHANG_LIST_QUERY);
+ StringBuilder sqlEndRecord = new StringBuilder(QUERY_TAIZHANG_LIST_RECORD);
+ StringBuilder sqlCaiGou = new StringBuilder(QUERY_TAIZHANG_LIST_CAIGOU);
+ StringBuilder sqlDiaoBo = new StringBuilder(QUERY_TAIZHANG_LIST_DIAOBO);
+ StringBuilder sqlChuKu = new StringBuilder(QUERY_TAIZHANG_LIST_CHUKU);
+ StringBuilder sqlBaoFei = new StringBuilder(QUERY_TAIZHANG_LIST_BAOFEI);
+ StringBuilder sqlPanDian = new StringBuilder(QUERY_TAIZHANG_LIST_PANDIAN);
+ StringBuilder sqlEnd = new StringBuilder(QUERY_TAIZHANG_LIST_END);
+
+ HashMap<String, Object> paramts = new HashMap<>();
+ //鏈烘瀯
+ if (param.getAgencyId() != null) {
+ sqlQuery.append(" AND left(AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
+ paramts.put("lengthAgencyId", param.getAgencyId());
+ paramts.put("agencyId", param.getAgencyId());
+ }
+ //浠撳簱绫诲瀷
+ if (param.getWarehouseType() != null) {
+ sqlQuery.append(" AND WAREHOUSE_TYPE = :warehouseType");
+ paramts.put("warehouseType", param.getWarehouseType());
+ }
+ if (param.getBaseWarehouseId() != null) {
+ sqlQuery.append(" AND id = :warehouseId");
+ paramts.put("warehouseId", param.getBaseWarehouseId());
+ }
+ //鐗╁搧鍚嶇О
+ if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
+ sqlEnd.append(" AND record.GOODS_TEMPLATE_NAME like :goodsTemplateName");
+ paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ }
+ if (param.getGoodsTemplateId() != null) {
+ sqlEnd.append(" AND record.BASE_GOODS_TEMPLATE_ID=:goodsTemplateId");
+ paramts.put("goodsTemplateId", param.getGoodsTemplateId());
+ }
+ //瑙勬牸鍨嬪彿
+ if (param.getBaseGoodsModelsId() != null) {
+ sqlEnd.append(" AND record.BASE_GOODS_MODELS_ID=:baseGoodsModelsId");
+ paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
+ }
+ // 鍚岀爜琛紝1閲囪喘鍏ュ簱 2閫�杩樺叆搴� 3璋冩嫧鍏ュ簱 4鐩樼泩鍏ュ簱 5鐢抽鍑哄簱 6璋冩嫧鍑哄簱 7鐩樹簭鍑哄簱 8鎶ュ簾鍑哄簱 9鍏朵粬鍑哄簱
+ Short flowType = param.getFlowType();
+ if (flowType != null) {
+ Map<String, Short> typeByFlowType = WhBusinessEnum.getTypeByFlowType(flowType);
+ //鏈璋冩暣绫诲瀷锛�1=璋冨锛�2=璋冨噺锛�
+ Short flowThisType = typeByFlowType.get("flowThisType");
+ //鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
+ Short flowBusinessType = typeByFlowType.get("flowBusinessType");
+ if (flowThisType != null) {
+ sqlEnd.append(" AND flow.THIS_TYPE=:flowThisType");
+ paramts.put("flowThisType", flowThisType);
+ }
+ if (flowBusinessType != null) {
+ sqlEnd.append(" AND flow.BUSINESS_TYPE=:flowBusinessType");
+ paramts.put("flowBusinessType", flowBusinessType);
+ }
+ }
+ // 鍗曞彿
+ String businessFormCode = param.getBusinessFormCode();
+ if (StringUtils.isNotEmpty(businessFormCode)) {
+ sqlCaiGou.append(" and tCaiGou.BUSINESS_FORM_CODE = :caoGouBusinessFormCode");
+ paramts.put("caoGouBusinessFormCode", businessFormCode);
+ sqlDiaoBo.append(" and tTrans.BUSINESS_FORM_CODE = :diaoBoBusinessFormCode");
+ paramts.put("diaoBoBusinessFormCode", businessFormCode);
+ sqlChuKu.append(" and tFormOut.BUSINESS_FORM_CODE = :chuKuBusinessFormCode");
+ paramts.put("chuKuBusinessFormCode", businessFormCode);
+ sqlBaoFei.append(" and tScrapped.BUSINESS_FORM_CODE = :baoFeiBusinessFormCode");
+ paramts.put("baoFeiBusinessFormCode", businessFormCode);
+ sqlPanDian.append(" and tInventory.BUSINESS_FORM_CODE = :panDianBusinessFormCode");
+ paramts.put("panDianBusinessFormCode", businessFormCode);
+ }
+ // 鎿嶄綔鏃堕棿
+ if (param.getDealTimeStart() != null) {
+ sqlEnd.append(" and flow.DEAL_TIME >=:dealTimeStart ");
+ paramts.put("dealTimeStart", param.getDealTimeStart() * 1000000);
+ }
+ if (param.getDealTimeEnd() != null) {
+ sqlEnd.append(" and flow.DEAL_TIME <:dealTimeEnd ");
+ paramts.put("dealTimeEnd", param.getDealTimeEnd() * 1000000 + 240000);
+ }
+ sqlEnd.append(" ORDER BY record.DEAL_TIME desc,record.id DESC ");
+
+ StringBuilder sql = new StringBuilder();
+ sql.append(sqlQuery)
+ .append(sqlEndRecord)
+ .append(sqlCaiGou)
+ .append(sqlDiaoBo)
+ .append(sqlChuKu)
+ .append(sqlBaoFei)
+ .append(sqlPanDian)
+
+ .append(sqlEnd);
+
+ return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java
index 667e46a..446e11e 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java
@@ -25,7 +25,7 @@
public GenericPager<Map<String, Object>> getListWithPage(WhWarningQry param) {
StringBuilder sql = new StringBuilder(GET_LIST_WITH_PAGE);
HashMap<String, Object> paramts = new HashMap<>();
- if (param.getStates() != null){
+ if (param.getStates() != null) {
sql.append(" AND wareWarn.states = :states");
paramts.put("states", param.getStates());
}
@@ -49,6 +49,9 @@
sql.append(" AND goodsTemp.GOODS_NAME like :goodsTemplateName");
paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
+ if (param.getGoodsTemplateId() != null) {
+ sql.append(" AND goodsTemp.id=:goodsTemplateId");
+ paramts.put("goodsTemplateId", param.getGoodsTemplateId()); }
//鍒嗙被
if (param.getCategoryId() != null) {
sql.append(" AND cate.id=:categoryId");
--
Gitblit v1.9.1