From 84060a9e25145f2677caeaece8b85196463d9a7b Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 07 十二月 2023 16:26:12 +0800
Subject: [PATCH] feat: bug
---
admin-web/src/views/departmentitem/ledgerquy/ledQuy/index.vue | 2
deploy-jar-single/src/main/resources/application-dev.yml | 2
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 53 ++++++-----------
consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java | 16 ++---
consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java | 6 +-
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 46 ++++-----------
consum-base/doc/更新正式环境需要添加.sql | 3 +
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java | 29 +++------
admin-web/public/static/config.js | 8 +-
9 files changed, 60 insertions(+), 105 deletions(-)
diff --git a/admin-web/public/static/config.js b/admin-web/public/static/config.js
index 3735938..fbba299 100644
--- a/admin-web/public/static/config.js
+++ b/admin-web/public/static/config.js
@@ -2,13 +2,11 @@
const SettingIplatform = {
// 鏈嶅姟鍣ㄥ湴鍧�
// 涓婁紶璺緞
- // ftpUrl: 'https://yqzx.jinmingyuan.com/lowConsum',//娴嬭瘯
- ftpUrl: protocol + '//'+ host + '/lowConsum',// 姝ｅ紡,
+ ftpUrl: 'https://yqzx.jinmingyuan.com/lowConsum',//寮�鍙�
// 鎺ュ彛璇锋眰鍦板潃
- // apiBaseURL: 'https://yqzx.jinmingyuan.com/lowConsum',//娴嬭瘯
- // apiBaseURL: 'http://172.16.20.2:8083/lowConsum',//寮�鍙�
+ apiBaseURL: 'http://127.0.0.1:8083/lowConsum',//寮�鍙�
// apiBaseURL: 'http://172.16.60.155:8083/lowConsum',//寮�鍙�
- apiBaseURL: protocol + '//'+ host + '/lowConsum',// 姝ｅ紡,
+ // apiBaseURL: 'https://yqzx.jinmingyuan.com/lowConsum',//寮�鍙�
debug: false //璋冭瘯寮�鍏� true鏃朵細杈撳嚭璇锋眰鏃ュ織
};
diff --git a/admin-web/src/views/departmentitem/ledgerquy/ledQuy/index.vue b/admin-web/src/views/departmentitem/ledgerquy/ledQuy/index.vue
index bd7ea12..5ba46fe 100644
--- a/admin-web/src/views/departmentitem/ledgerquy/ledQuy/index.vue
+++ b/admin-web/src/views/departmentitem/ledgerquy/ledQuy/index.vue
@@ -164,7 +164,7 @@
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
- url: SettingIplatform.apiBaseURL + '/pc/warehouse/flow/getTaiZhangList', // 璇锋眰鍦板潃
+ url: SettingIplatform.apiBaseURL + '/pc/warehouse/flow/getDeptTaiZhangList', // 璇锋眰鍦板潃
// 宸ュ叿鏉�
tools: {
columnsCtrl: {
diff --git "a/consum-base/doc/\346\233\264\346\226\260\346\255\243\345\274\217\347\216\257\345\242\203\351\234\200\350\246\201\346\267\273\345\212\240.sql" "b/consum-base/doc/\346\233\264\346\226\260\346\255\243\345\274\217\347\216\257\345\242\203\351\234\200\350\246\201\346\267\273\345\212\240.sql"
index e7db072..acba5e1 100644
--- "a/consum-base/doc/\346\233\264\346\226\260\346\255\243\345\274\217\347\216\257\345\242\203\351\234\200\350\246\201\346\267\273\345\212\240.sql"
+++ "b/consum-base/doc/\346\233\264\346\226\260\346\255\243\345\274\217\347\216\257\345\242\203\351\234\200\350\246\201\346\267\273\345\212\240.sql"
@@ -24,3 +24,6 @@
INSERT INTO L_WH_GOODS_RECORD_DETAILS (WH_GOODS_RECORD_ID,WH_GOODS_ID,THIS_TYPE) VALUES (WH_GOODS_RECORD_ID,WH_GOODS_ID,THIS_TYPE);
SET i=i+1; END WHILE; END
-- 鍒涘缓瀛樺偍杩囩▼缁撴潫 -----------
+
+# 2023 12 07
+alter table base_category modify d_user_id BIGINT(16);
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 8ba6b3d..c5bc418 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
@@ -1,25 +1,8 @@
package com.consum.base.controller;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.compress.utils.Lists;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.util.ReflectUtil;
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.IdUtil;
@@ -37,31 +20,31 @@
import com.consum.base.pojo.response.GoodsTemplateCountVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.pojo.response.TransferInfoVO;
-import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.LGoodsUserRecordCoreService;
-import com.consum.base.service.LWhFormTransferService;
-import com.consum.base.service.LWhProcureModelService;
-import com.consum.base.service.LWhProcureModelUserRecordService;
-import com.consum.base.service.LWhProcureModelUserService;
+import com.consum.base.service.*;
import com.consum.base.service.impl.LWhFormTransferCoreService;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormTransfer;
-import com.consum.model.po.LWhProcureModelUser;
-import com.consum.model.po.LWhProcureModelUserRecord;
+import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.web.ResponseValue;
-
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
-import cn.hutool.core.util.ReflectUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.compress.utils.Lists;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Field;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description 璋冩嫧绠＄悊
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 bd56ed2..6d59316 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,25 +1,20 @@
package com.consum.base.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;
-
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.type.MixType;
-import com.consum.base.core.utils.CurrencyUtil;
-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.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;
/**
* @ClassName LWarehouseFlowService
@@ -302,13 +297,10 @@
paramts.put("chuKuBusinessFormCode", businessFormCode);
sqlBaoFei.append(" and tScrapped.BUSINESS_FORM_CODE = :baoFeiBusinessFormCode");
paramts.put("baoFeiBusinessFormCode", businessFormCode);
-
- sqlBaoFei.append(" and tDepScrapped.BUSINESS_FORM_CODE = :deptBaoFeiBusinessFormCode");
+ sqlDepBaoFei.append(" and tDepScrapped.BUSINESS_FORM_CODE = :deptBaoFeiBusinessFormCode");
paramts.put("deptBaoFeiBusinessFormCode", businessFormCode);
- sqlBaoFei.append(" and tBack.BUSINESS_FORM_CODE = :deptBackBusinessFormCode");
+ sqlDepTuiHui.append(" and tBack.BUSINESS_FORM_CODE = :deptBackBusinessFormCode");
paramts.put("deptBackBusinessFormCode", businessFormCode);
-
-
sqlPanDian.append(" and tInventory.BUSINESS_FORM_CODE = :panDianBusinessFormCode");
paramts.put("panDianBusinessFormCode", businessFormCode);
@@ -340,7 +332,8 @@
.append(sqlChuKu)
.append(sqlBaoFei)
.append(sqlPanDian)
-
+ .append(sqlDepBaoFei)
+ .append(sqlDepTuiHui)
.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/LWhFormTransferService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java
index cc30fac..a80af48 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java
@@ -1,8 +1,5 @@
package com.consum.base.service;
-import java.util.List;
-import java.util.Map;
-
import com.consum.base.pojo.excel.TransferExcelTemplate;
import com.consum.base.pojo.query.TransferQry;
import com.consum.base.pojo.request.LWhFormTransferParam;
@@ -12,6 +9,9 @@
import com.walker.db.page.GenericPager;
import com.walker.jdbc.service.BaseService;
+import java.util.List;
+import java.util.Map;
+
public interface LWhFormTransferService extends BaseService {
long add(LWhFormTransferParam param, FinSysTenantUser sysInfo) throws Exception;
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
index 31f86de..ef29012 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
@@ -1,5 +1,6 @@
package com.consum.base.service.impl;
+import cn.hutool.core.convert.Convert;
import com.consum.base.Constants;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.utils.IdUtil;
@@ -7,24 +8,21 @@
import com.consum.base.service.BaseCategoryService;
import com.consum.base.service.BaseGoodsModelsService;
import com.consum.base.service.BaseGoodsTemplateService;
-import com.consum.model.po.BaseCategory;
-import com.consum.model.po.BaseGoodsModels;
-import com.consum.model.po.BaseGoodsTemplate;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.SDictData;
+import com.consum.model.po.*;
import com.consum.model.vo.BaseGoodsTemplateVo;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @Description 鐗╁搧妯℃澘
@@ -81,7 +79,7 @@
baseGoodsTemplate.setCategoryName(baseCategory.getCategoryName());
String classification = baseCategory.getClassification();
//鐗╁搧缂栫爜
- String goodsCode = codeGeneratorService.createGoodsTemplateCode(classification);
+ String goodsCode = codeGeneratorService.createGoodsTemplateCode(Convert.toStr(classification,"C"));
baseGoodsTemplate.setGoodsCode(goodsCode);
//绫诲埆
baseGoodsTemplate.setClassification(classification);
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
index 473f57a..9a70d19 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
@@ -1,21 +1,5 @@
package com.consum.base.service.impl;
-import com.consum.base.pojo.response.GoodsTemplateInfoVO;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.util.CollectionUtils;
-
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.type.CategoryType;
@@ -32,26 +16,22 @@
import com.consum.base.pojo.request.LWhFormTransferParam;
import com.consum.base.pojo.response.DepartGoodsUseInfo;
import com.consum.base.pojo.response.GoodsModelVO;
+import com.consum.base.pojo.response.GoodsTemplateInfoVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
-import com.consum.base.service.BaseWarehouseManagerService;
-import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.FinSysTenantServiceImpl;
-import com.consum.base.service.LWhFormTransferService;
-import com.consum.base.service.LWhGoodsService;
-import com.consum.base.service.LWhProcureModelService;
-import com.consum.base.service.LWhProcureModelUserRecordService;
-import com.consum.base.service.LWhProcureModelUserService;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.BaseWarehouseManager;
-import com.consum.model.po.FinSysTenant;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormTransfer;
-import com.consum.model.po.LWhProcureModel;
-import com.consum.model.po.LWhProcureModelUser;
-import com.consum.model.po.LWhProcureModelUserRecord;
+import com.consum.base.service.*;
+import com.consum.model.po.*;
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.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description 璋冩嫧绠＄悊
@@ -137,7 +117,7 @@
Long id = sysInfo.getId();
BaseWarehouseManager manager = new BaseWarehouseManager();
manager.setManagerId(id);
- List<BaseWarehouseManager> managerList = baseWarehouseManagerService.selectAll(manager);
+ List<BaseWarehouseManager> managerList = baseWarehouseManagerService.select(manager);
if (CollectionUtils.isEmpty(managerList)) {
log.error("璇ョ敤鎴蜂笉鏄簱绠″憳");
throw new Exception("璇ョ敤鎴蜂笉鏄簱绠″憳");
diff --git a/deploy-jar-single/src/main/resources/application-dev.yml b/deploy-jar-single/src/main/resources/application-dev.yml
index 08d7122..7eb32f5 100644
--- a/deploy-jar-single/src/main/resources/application-dev.yml
+++ b/deploy-jar-single/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@
# 鏄惁鏄剧ずdao涓墦鍗扮殑SQL璇彞
show-sql: true
# 鏁版嵁搴撻摼鎺�
- dataBaseName: low_consum_manage_dev
+ dataBaseName: low_consum_manage_dev2
username: root
# Bjjmy_2020
password: ENC(V7lFKlYcHfEzTbXsbBQhSUswgxLsbS5z)
--
Gitblit v1.9.1