From dc1800d4d2d252b7b37d80d9f54285200c94ff3c Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 15 十一月 2023 19:34:40 +0800
Subject: [PATCH] 出库单管理
---
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java | 80 ++++++++++++++++++++++++++++++++++------
1 files changed, 68 insertions(+), 12 deletions(-)
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 f1eb117..8e4e322 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,18 +1,18 @@
package com.consum.base.service;
-import com.consum.base.core.tools.MapRowMapper;
+import com.consum.base.core.utils.MapRowMapper;
+import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.LWarehouseFlowParam;
+import com.consum.base.pojo.query.LWhFormOutputQry;
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
- * @Author cy
* @Date 2023/10/25
* @Description
* @Version 1.0
@@ -26,7 +26,7 @@
* @param param
* @return
*/
- private static String QUERY_BUSINESS_FLOW = "SELECT flow.BUSINESS_TYPE businessType,flow.BUSINESS_FORM_ID businessFormId,tCaiGou.BUSINESS_FORM_CODE businessFormCode,record.GOODS_TEMPLATE_NAME goodsTemplateName,record.BASE_GOODS_MODELS_NAME baseGoodsModelsName,record.THIS_COUNT thisCount,record.THIS_TYPE thisType,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.AGENCY_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.AGENCY_NAME END AS agencyName,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUYER_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.OPERATOR_NAME END AS createdName,flow.DEAL_TIME dealTime 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 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 ";
public GenericPager<Map<String, Object>> queryBusinessFlow(LWarehouseFlowParam param) {
StringBuilder sql = new StringBuilder(QUERY_BUSINESS_FLOW);
@@ -38,9 +38,9 @@
// sql.append(" and flow.BUSINESS_TYPE =?");
// params.add(param.getBusinessType());
}
- if (param.getBusinessFormCode() != null) {
- sql.append(" AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUSINESS_FORM_CODE=:businessFormCode" +
- " WHEN flow.BUSINESS_TYPE = 3 THEN tCaiGou.BUSINESS_FORM_CODE=:businessFormCode");
+ 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");
paramts.put("businessFormCode", param.getBusinessFormCode());
// sql.append(" AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN flow.BUSINESS_FORM_CODE=?");
// params.add(param.getBusinessFormCode());
@@ -60,10 +60,8 @@
paramts.put("agencyId", param.getAgencyId());
}
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 tCaiGou.OPERATOR_NAME LIKE :createdName END"
- );
+ 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");
paramts.put("createdName", StringUtils.CHAR_PERCENT + param.getCreatedName() + StringUtils.CHAR_PERCENT);
}
if (param.getDealTimeStart() != null) {
@@ -76,4 +74,62 @@
}
return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapRowMapper());
}
+
+ public GenericPager<Map<String, Object>> queryBusinessFlowDetail(LWhFormOutputQry param) {
+ StringBuilder sql = new StringBuilder(QUERY_BUSINESS_FLOW);
+ 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 ");
+ paramts.put("businessFormCode", param.getBusinessFormCode());
+ }
+ if (StringUtils.isNotEmpty(param.getGoodsName())) {
+ sql.append("AND record.GOODS_TEMPLATE_NAME like :goodsTemplateName ");
+ paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsName() + StringUtils.CHAR_PERCENT);
+ }
+
+ if (param.getBaseGoodsModelsId() != null) {
+ sql.append("AND record.BASE_GOODS_MODELS_ID =:baseGoodsModelsId ");
+ paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
+ }
+ if (param.getAgencyId() != null) {
+ sql.append("AND tCaiGou.AGENCY_id=:agencyId ");
+ paramts.put("agencyId", param.getAgencyId());
+ }
+
+ 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 ");
+ paramts.put("createdName", param.getCreateName());
+ }
+ if (param.getStartTime() != null) {
+ sql.append("and flow.DEAL_TIME >=:dealTimeStart ");
+ paramts.put("dealTimeStart", param.getStartTime() * 1000000);
+ }
+ if (param.getEndTime() != null) {
+ sql.append("and flow.DEAL_TIME <:dealTimeEnd ");
+ paramts.put("dealTimeEnd", param.getEndTime() * 1000000 + 240000);
+ }
+ if (param.getStates() != null) {
+
+ switch (param.getStates()) {
+ case 1:
+ sql.append("and flow.BUSINESS_TYPE =:businessType");
+ break;
+ case 2:
+ sql.append("and flow.FLOW_STATE = 2 ");
+ break;
+ default:
+ sql.append("and flow.FLOW_STATE = 3 ");
+ }
+
+ }
+
+// if (param.getBusinessType() != null) {
+// sql.append(" and flow.BUSINESS_TYPE =:businessType");
+// paramts.put("businessType", param.getBusinessType());
+// }
+
+ return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
+ }
}
--
Gitblit v1.9.1