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æ¶ä¼è¾åºè¯·æ±æ¥å¿ }; 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: { consum-base/doc/¸üÐÂÕýʽ»·¾³ÐèÒªÌí¼Ó.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); 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 è°æ¨ç®¡ç 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()); 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; 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); 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("è¯¥ç¨æ·ä¸æ¯åºç®¡å"); 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)