From d6a442fa7c8b9be884870c030968786b8f04b2d6 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 29 十一月 2023 15:02:16 +0800
Subject: [PATCH] feat: 部门台账
---
consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java | 45 +++++++++++
consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java | 6 +
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 13 +++
consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java | 28 ++++++
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java | 135 +++++++++++++++++++++++++++++++--
5 files changed, 217 insertions(+), 10 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 b55681b..eef390c 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
@@ -79,7 +79,7 @@
}
@GetMapping("/getTaiZhangList")
- public ResponseValue getTaiZhangList( ) {
+ public ResponseValue getTaiZhangList() {
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -99,4 +99,30 @@
return ResponseValue.success(genericPager);
}
+ /**
+ * 閮ㄩ棬鍙拌处
+ *
+ * @return
+ */
+ @GetMapping("/getDeptTaiZhangList")
+ public ResponseValue getDeptTaiZhangList() {
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ LWarehouseFlowParam param = CommonUtil.getObjFromReq(LWarehouseFlowParam.class);
+ LWarehouseFlowParam param2 = new LWarehouseFlowParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ 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.queryDeptTaiZhangList(param);
+ return ResponseValue.success(genericPager);
+ }
+
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index 7b482b3..7630640 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -411,4 +411,17 @@
lWhFormTransferService.queryDepartmentTransferOrder();
return ResponseValue.success(transferInfoVO);
}
+
+ @ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")
+ })
+ @GetMapping("/query/transfList")
+ public ResponseValue queryDepartmentTransferOrderList() {
+
+ TransferInfoVO transferInfoVO = new TransferInfoVO();
+
+ lWhFormTransferService.queryDepartmentTransferOrder();
+ return ResponseValue.success(transferInfoVO);
+ }
}
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 4c19f65..bb81992 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
@@ -118,4 +118,49 @@
rtnMap.put("flowThisType", flowThisType);
return rtnMap;
}
+
+ /**
+ * flowType杞负 杩涘嚭搴撴祦姘存�昏〃[L_WAREHOUSE_FLOW] 鐨� THIS_TYPE锛氭湰娆¤皟鏁寸被鍨� 鍜� BUSINESS_TYPE锛氬崟鎹被鍨�
+ *
+ * @param deptFlowType // 鍚岀爜琛紝1 鐗╁搧鐢抽 2 鐗╁搧鍒嗗彂 3 鐗╁搧閫�杩� 4 鐗╁搧鎶ュ簾
+ * @return flowThisType锛氭湰娆¤皟鏁寸被鍨嬶紙1=璋冨锛�2=璋冨噺锛�
+ * flowBusinessType锛氬崟鎹被鍨� 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
+ */
+ public static Map<String, Short> getTypeByDeptFlowType(Short deptFlowType) {
+ //鍗曟嵁绫诲瀷 1 閲囪喘 2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
+ Short flowBusinessType = null;
+ //1=璋冨锛�2=璋冨噺
+ Short flowThisType = null;
+ //鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
+ Short transferBusinessType = null;
+ switch (deptFlowType) {
+ //鐗╁搧鐢抽
+ case 1:
+// flowThisType = 2;
+// flowBusinessType = 2;
+ break;
+ //2 鐗╁搧鍒嗗彂
+ case 2:
+ flowThisType = 1;
+ flowBusinessType = 4;
+// transferBusinessType = 1;
+ break;
+ //3 鐗╁搧閫�杩�
+ case 3:
+ flowThisType = 2;
+ flowBusinessType = 6;
+// transferBusinessType = 2;
+ break;
+ // 4 鐗╁搧鎶ュ簾
+ case 4:
+ flowThisType = 2;
+ flowBusinessType = 5;
+ break;
+ }
+ Map<String, Short> rtnMap = new HashMap<>();
+ rtnMap.put("flowBusinessType", flowBusinessType);
+ rtnMap.put("flowThisType", flowThisType);
+// rtnMap.put("transferBusinessType", transferBusinessType);
+ 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 dbfcc29..db950c9 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
@@ -33,6 +33,9 @@
@ApiModelProperty(value = "鏈烘瀯")
private Long agencyId;
+ @ApiModelProperty("閮ㄩ棬ID")
+ private Long departmentId;
+
@ApiModelProperty("浠撳簱绫诲瀷")
private Long warehouseType;
@@ -48,6 +51,9 @@
@ApiModelProperty("鍚岀爜琛紝1閲囪喘鍏ュ簱 2閫�杩樺叆搴� 3璋冩嫧鍏ュ簱 4鐩樼泩鍏ュ簱 5鐢抽鍑哄簱 6璋冩嫧鍑哄簱 7鐩樹簭鍑哄簱 8鎶ュ簾鍑哄簱 9鍏朵粬鍑哄簱")
private Short flowType;
+ @ApiModelProperty("鍚岀爜琛紝1 鐗╁搧鐢抽 2 鐗╁搧鍒嗗彂 3 鐗╁搧閫�杩� 4 鐗╁搧鎶ュ簾")
+ private Short depFlowType;
+
//鍒涘缓浜�
@ApiModelProperty(value = "鍒涘缓浜�")
private String createdName;
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 7b08e06..a81a4b2 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,22 +1,19 @@
package com.consum.base.service;
import com.consum.base.core.WhBusinessEnum;
-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.core.utils.MixType;
-import com.consum.base.core.utils.PageUtil;
+import com.consum.base.core.utils.*;
import com.consum.base.pojo.LWarehouseFlowParam;
import com.consum.base.pojo.query.LWhFormOutputQry;
import com.consum.base.pojo.response.OutAndInDetailVO;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.stereotype.Service;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.stereotype.Service;
/**
* @ClassName LWarehouseFlowService
@@ -111,8 +108,9 @@
HashMap<String, Object> paramts = new HashMap<>();
//鏈烘瀯
if (param.getAgencyId() != null) {
- sqlQuery.append(" AND left(AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
- paramts.put("lengthAgencyId", param.getAgencyId());
+// sqlQuery.append(" AND left(AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
+ sqlQuery.append(" AND AGENCY_ID=:agencyId");
+// paramts.put("lengthAgencyId", param.getAgencyId());
paramts.put("agencyId", param.getAgencyId());
}
//浠撳簱绫诲瀷
@@ -203,6 +201,125 @@
return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
}
+ /**
+ * 鍙拌处鏌ヨ
+ *
+ * @param param
+ * @return
+ */
+ private String QUERY_DEPT_TAIZHANG_LIST_QUERY = "SELECT CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.AGENCY_NAME WHEN (flow.BUSINESS_TYPE=2 OR flow.BUSINESS_TYPE=4 OR flow.BUSINESS_TYPE=6) THEN tTrans.OPERATOR_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.AGENCY_NAME WHEN flow.BUSINESS_TYPE=5 THEN tScrapped.AGENCY_NAME WHEN flow.BUSINESS_TYPE=7 THEN tInventory.AGENCY_NAME END AGENCY_NAME,ware.NAME as dept_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 OR flow.BUSINESS_TYPE=4 OR flow.BUSINESS_TYPE=6) THEN tTrans.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=5 THEN tScrapped.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=7 THEN tInventory.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 fin_sys_tenant_department WHERE 1=1 ";
+ private String QUERY_DEPT_TAIZHANG_LIST_RECORD = ")ware LEFT JOIN L_WAREHOUSE_FLOW flow ON ware.id=flow.WAREHOUSE_ID AND flow.WAREHOUSE_TYPE=1 LEFT JOIN L_WH_GOODS_RECORD record ON flow.id=record.WAREHOUSE_FLOW_ID ";
+ private String QUERY_DEPT_TAIZHANG_LIST_END = " WHERE record.id IS NOT NULL";
+ private String QUERY_DEPT_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_DEPT_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_DEPT_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_DEPT_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_DEPT_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>> queryDeptTaiZhangList(LWarehouseFlowParam param) {
+ StringBuilder sqlQuery = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_QUERY);
+ StringBuilder sqlEndRecord = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_RECORD);
+ StringBuilder sqlCaiGou = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_CAIGOU);
+ StringBuilder sqlDiaoBo = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_DIAOBO);
+ StringBuilder sqlChuKu = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_CHUKU);
+ StringBuilder sqlBaoFei = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_BAOFEI);
+ StringBuilder sqlPanDian = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_PANDIAN);
+ StringBuilder sqlEnd = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_END);
+
+ HashMap<String, Object> paramts = new HashMap<>();
+ //鏈烘瀯
+ if (param.getAgencyId() != null) {
+// sqlQuery.append(" AND left(AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
+ sqlQuery.append(" AND TENANT_ID=:agencyId");
+// paramts.put("lengthAgencyId", param.getAgencyId());
+ paramts.put("agencyId", param.getAgencyId());
+ }
+ // 閮ㄩ棬
+ if (param.getDepartmentId() != null) {
+ sqlQuery.append(" and ID= :departmentId");
+ paramts.put("departmentId", param.getDepartmentId());
+ }
+ //浠撳簱绫诲瀷
+ if (param.getWarehouseType() != null) {
+ sqlQuery.append(" AND WAREHOUSE_TYPE = :warehouseType");
+ paramts.put("warehouseType", param.getWarehouseType());
+ }
+ //鐗╁搧鍚嶇О
+ 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 鐗╁搧鎶ュ簾
+ Short flowType = param.getFlowType();
+ if (flowType != null) {
+ Map<String, Short> typeByFlowType = WhBusinessEnum.getTypeByDeptFlowType(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);
+
+ sqlEnd.append(" and case when flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUSINESS_FORM_CODE" +
+ " WHEN ( flow.BUSINESS_TYPE = 2 OR flow.BUSINESS_TYPE = 4 OR flow.BUSINESS_TYPE = 6 ) THEN tTrans.BUSINESS_FORM_CODE" +
+ " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE" +
+ " WHEN flow.BUSINESS_TYPE = 5 THEN tScrapped.BUSINESS_FORM_CODE" +
+ " WHEN flow.BUSINESS_TYPE = 7 THEN tInventory.BUSINESS_FORM_CODE end =:whereBusinessFormCode");
+ paramts.put("whereBusinessFormCode", 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());
+ }
public PageUtil queryAllBusinessFlow(LWhFormOutputQry param) {
StringBuilder sql = new StringBuilder("SELECT\n"
--
Gitblit v1.9.1