From 62b6a7fac3f2acde70b578431147c4a01f19c182 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期一, 15 四月 2024 09:07:05 +0800
Subject: [PATCH] bug修改
---
consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java | 97 ++++++++++++++----------------------------------
1 files changed, 28 insertions(+), 69 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java
index 5b8b6e3..d277ec3 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java
@@ -1,89 +1,48 @@
package com.consum.base.service;
-import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.utils.MapperUtil;
-import com.consum.model.po.LWhProcureModel;
-import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
-/**
- * @ClassName LWhProcureModelService
- * @Date 2023/10/24
- * @Description
- * @Version 1.0
- **/
-@Service
-public class LWhProcureModelService extends BaseServiceImpl {
+import com.consum.base.core.WhBusinessEnum;
+import com.consum.base.pojo.dto.GoodModelInfoDTO;
+import com.consum.base.pojo.response.GoodsTemplateCountVO;
+import com.consum.model.po.LWhProcureModel;
+import com.walker.jdbc.service.BaseService;
- private static String GET_MODEL_BY_FORM = "SELECT * FROM L_WH_PROCURE_MODEL WHERE 1=1 ";
+public interface LWhProcureModelService extends BaseService {
+
+ List<LWhProcureModel> getModelByForm(WhBusinessEnum businessType, Long businessId);
+
+ List<Map<String, Object>> getFfOrderByGoodsIdAndDept(Long goodsTemplateId, Long departmentId);
+
+ List<Map<String, Object>> getGoodsUseInfoByFfOrderAndGoodId(Long goodsTemplateId, Long transBusinessId);
/**
- * 閫氳繃鍗曟嵁绫诲瀷 鍗曟嵁ID鏌ヨ璇ヨ鍗曞叧鑱旂殑璁惧鍨嬪彿浠ュ強鏁伴噺
- *
+ * 缁熻鍟嗗搧鍨嬪彿鏁伴噺
+ *
+ * @param businessId
* @return
*/
- public List<LWhProcureModel> getModelByForm(WhBusinessEnum businessType, Long businessId) {
- StringBuilder sql = new StringBuilder(GET_MODEL_BY_FORM);
- HashMap<String, Object> paramts = new HashMap<>();
- //椤圭洰闃舵id
- if (businessType != null) {
- sql.append(" and BUSINESS_TYPE=:businessType ");
- paramts.put("businessType", businessType.getValue());
- }
- if (businessId != null) {
- sql.append(" and BUSINESS_ID=:businessId ");
- paramts.put("businessId", businessId);
- }
- return this.select(sql.toString(), paramts, new LWhProcureModel());
- }
+ List<GoodsTemplateCountVO> getGoodsTemplateCountByBusinessId(Long businessId);
/**
- * 鏍规嵁閮ㄩ棬銆佺墿鍝佹煡璇㈣皟鎷ㄥ崟
- *
- * @param goodsTemplateId 鐗╁搧ID
- * @param departmentId 閮ㄩ棬ID
+ * 缁熻閲囪喘鍗曠墿鍝佸瀷鍙锋暟閲�
+ *
+ * @param businessId
* @return
*/
- private static String GET_FF_ORDER_BY_GOODS_ID_AND_DEPT = "SELECT trans.ID TRANS_BUSINESS_ID,trans.BUSINESS_FORM_CODE,baseTemp.ID BASE_GOODS_TEMPLATE_ID,baseTemp.GOODS_NAME BASE_GOODS_TEMPLATE_NAME,sum(proModel.COUNTS) total_count,sum(proModel.USE_COUNT) use_count,trans.IN_TIME FROM L_WH_FORM_TRANSFER trans LEFT JOIN L_WH_PROCURE_MODEL proModel ON proModel.BUSINESS_ID=trans.id LEFT JOIN BASE_GOODS_MODELS baseModel ON proModel.BASE_GOODS_MODELS_ID=baseModel.id LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseTemp.id=baseModel.GOODS_TEMPLATES_ID WHERE proModel.BUSINESS_TYPE=4 AND proModel.USE_COUNT> 0 ";
- private static String GET_FF_ORDER_BY_GOODS_ID_AND_DEPT_END = " GROUP BY trans.ID,trans.BUSINESS_FORM_CODE,baseTemp.ID,baseTemp.GOODS_NAME,trans.IN_TIME";
+ List<GoodsTemplateCountVO> getProcureCountByBusinessId(Long businessId);
- public List<Map<String, Object>> getFfOrderByGoodsIdAndDept(Long goodsTemplateId, Long departmentId) {
- StringBuilder sql = new StringBuilder(GET_FF_ORDER_BY_GOODS_ID_AND_DEPT);
- HashMap<String, Object> paramts = new HashMap<>();
- //椤圭洰闃舵id
- if (goodsTemplateId != null) {
- sql.append(" AND baseTemp.ID=:goodsTemplateId ");
- paramts.put("goodsTemplateId", goodsTemplateId);
- }
- if (departmentId != null) {
- sql.append(" AND trans.IN_WAREHOUSE_TYPE=1 and trans.IN_WAREHOUSE_ID=:departmentId ");
- paramts.put("departmentId", departmentId);
- }
- return select(sql.append(GET_FF_ORDER_BY_GOODS_ID_AND_DEPT_END).toString(), paramts, new MapperUtil());
- } /**
- * 鏍规嵁閮ㄩ棬銆佺墿鍝佹煡璇㈣皟鎷ㄥ崟
+ /**
+ * 鏍规嵁涓氬姟id鏌ヨ鍨嬪彿淇℃伅鍒楄〃
*
- * @param goodsTemplateId 鐗╁搧ID
- * @param departmentId 鍒嗗彂鍗旾D
+ * @param businessId
+ * @param procureGoodId
* @return
*/
- private static String GET_GOODS_USE_INFO_BY_FF_ORDER_AND_GOOD_ID = "SELECT baseModel.GOODS_TEMPLATES_ID,proModel.BASE_GOODS_MODELS_ID,baseModel.MODEL_NAME,baseModel.UNIT,CONCAT(baseCate.CLASSIFICATION,'绫�') CLASSIFICATION,modelUser.id MODEL_USER_id,modelUser.NOW_USER_PHONE,modelUser.NOW_USER_NAME,CASE WHEN modelUser.id IS NULL THEN proModel.USE_COUNT ELSE modelUser.USE_COUNT END AS user_Use_Count,CASE WHEN modelUser.id IS NULL THEN proModel.COUNTS ELSE modelUser.GOODS_NUM END AS GOODS_NUM FROM L_WH_PROCURE_MODEL proModel LEFT JOIN BASE_GOODS_MODELS baseModel ON proModel.BASE_GOODS_MODELS_ID=baseModel.id LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseTemp.id=baseModel.GOODS_TEMPLATES_ID LEFT JOIN BASE_CATEGORY baseCate ON baseCate.id=baseTemp.CATEGORY_ID LEFT JOIN L_WH_PROCURE_MODEL_USER modelUser ON modelUser.WH_PROCURE_MODEL_ID=proModel.id WHERE proModel.BUSINESS_TYPE=4 AND proModel.USE_COUNT> 0 ";
+ List<GoodModelInfoDTO> getGoodsModelListByBusinessId(Long businessId, Long procureGoodId);
- public List<Map<String, Object>> getGoodsUseInfoByFfOrderAndGoodId(Long goodsTemplateId, Long transBusinessId) {
- StringBuilder sql = new StringBuilder(GET_GOODS_USE_INFO_BY_FF_ORDER_AND_GOOD_ID);
- HashMap<String, Object> paramts = new HashMap<>();
- if (goodsTemplateId != null) {
- sql.append(" AND baseModel.GOODS_TEMPLATES_ID=:goodsTemplateId ");
- paramts.put("goodsTemplateId", goodsTemplateId);
- }
- if (transBusinessId != null) {
- sql.append(" AND proModel.BUSINESS_ID=:transBusinessId ");
- paramts.put("transBusinessId", transBusinessId);
- }
- return select(sql.toString(), paramts, new MapperUtil());
- }
+ List<LWhProcureModel> getModelByForm1(WhBusinessEnum whBusinessEnum, Long whFormProcureId);
+
+
}
--
Gitblit v1.9.1