diff --git a/blade-biz-common/pom.xml b/blade-biz-common/pom.xml index 0f518d43c..34dcaa4e2 100644 --- a/blade-biz-common/pom.xml +++ b/blade-biz-common/pom.xml @@ -34,6 +34,27 @@ hutool-all 5.8.16 + + com.google.zxing + core + 3.3.3 + + + + com.google.zxing + javase + 3.3.3 + + + commons-lang + commons-lang + 2.6 + + + + org.springframework.boot + spring-boot-starter-data-redis + diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java b/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java index 550295f28..593c93427 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java +++ b/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java @@ -65,4 +65,6 @@ public class CommonUtil { return null; } + + } diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicTenantCodeClient.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicTenantCodeClient.java index 7ef5c593f..7b5e5abc5 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicTenantCodeClient.java +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicTenantCodeClient.java @@ -35,7 +35,7 @@ import java.util.List; * @since 2023-05-08 */ @FeignClient( - value = ModuleNameConstant.APPLICATION_BASIC_NAME + value = ModuleNameConstant.APPLICATION_BASIC_NAME+"-tjj" ) public interface IBasicTenantCodeClient { @@ -43,7 +43,7 @@ public interface IBasicTenantCodeClient { String TOP = API_PREFIX + "/top"; /** - * 获取pda信息列表 + * 获取租户编码规则列表 * * @param current 页号 * @param size 页数 @@ -56,4 +56,13 @@ public interface IBasicTenantCodeClient { @GetMapping(TOP+"/list") List list(@ApiIgnore BasicTenantCodeEntity basicTenantCodeEntity) throws IllegalAccessException; + /** + * 获取指定用户编码规则 + * @param tenantId 用户编号 + * @return + * @throws IllegalAccessException + */ + @GetMapping(TOP+"/shelfCode") + String shelfCode(@RequestParam String tenantId,@RequestParam String codeType); + } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsAllocationEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsAllocationEntity.java index 10e5a2616..44c8dcd0c 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsAllocationEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsAllocationEntity.java @@ -82,10 +82,10 @@ public class BasicdataGoodsAllocationEntity extends TenantEntity { @ApiModelProperty(value = "货架编号") private String goodsShelfId; /** - * 列编码 + * 所在列 */ - @ApiModelProperty(value = "列编码") - private String rowNum; + @ApiModelProperty(value = "所在列") + private String columnNum; /** * 启用状态;1-启用；2-禁用 */ @@ -97,10 +97,10 @@ public class BasicdataGoodsAllocationEntity extends TenantEntity { @ApiModelProperty(value = "货位状态;1-空闲；2-有货；3-满货") private String allocationStatuc; /** - * 层编码 + * 所在层 */ - @ApiModelProperty(value = "层编码") - private String storeyNum; + @ApiModelProperty(value = "所在层") + private String layerNum; /** * 层编码 diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsShelfEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsShelfEntity.java index 9ebe974e1..38ab3bd21 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsShelfEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsShelfEntity.java @@ -97,4 +97,28 @@ public class BasicdataGoodsShelfEntity extends TenantEntity { @ApiModelProperty(value = "备注") private String remarks; + /** + * 列数 + */ + @ApiModelProperty(value = "列数") + private Integer rowNum; + + /** + * 层数 + */ + @ApiModelProperty(value = "层数") + private Integer storeyNum; + + /** + * 货架二维码 + */ + @ApiModelProperty(value = "货架二维码") + private String qrCode; + + /** + * 货架二维码 + */ + @ApiModelProperty(value = "货架二维码地址") + private String qrCodeUrl; + } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPrintTemplateController.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPrintTemplateController.java index e70fc56f3..1d46145dc 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPrintTemplateController.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPrintTemplateController.java @@ -18,6 +18,7 @@ package com.logpm.basic.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basic.dto.BasicPrintTemplateDTO; import com.logpm.basic.entity.BasicPrintTemplateEntity; import com.logpm.basic.excel.BasicPrintTemplateExcel; import com.logpm.basic.service.IBasicPrintTemplateService; @@ -97,8 +98,9 @@ public class BasicPrintTemplateController extends BladeController { @PostMapping("/save") @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入basicPrintTemplate") - public R save(@Valid @RequestBody BasicPrintTemplateEntity basicPrintTemplate) { - return R.status(basicPrintTemplateService.save(basicPrintTemplate)); + public R save(@Valid @RequestBody BasicPrintTemplateDTO basicPrintTemplateDTO) { + boolean result = basicPrintTemplateService.insertPrintTemplate(basicPrintTemplateDTO); + return R.status(result); } /** diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/dto/BasicPrintTemplateDTO.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/dto/BasicPrintTemplateDTO.java new file mode 100644 index 000000000..b3bd6862b --- /dev/null +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/dto/BasicPrintTemplateDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basic.dto; + +import com.logpm.basic.entity.BasicPrintTemplateEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 打印模板信息 数据传输对象实体类 + * + * @author tjj + * @since 2023-06-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicPrintTemplateDTO extends BasicPrintTemplateEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicBasicTenantCodeClient.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicTenantCodeClient.java similarity index 86% rename from blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicBasicTenantCodeClient.java rename to blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicTenantCodeClient.java index 8562e98b1..af50642dd 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicBasicTenantCodeClient.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicTenantCodeClient.java @@ -39,7 +39,7 @@ import java.util.List; @ApiIgnore() @RestController @AllArgsConstructor -public class BasicBasicTenantCodeClient implements IBasicTenantCodeClient { +public class BasicTenantCodeClient implements IBasicTenantCodeClient { private final IBasicTenantCodeService basicTenantCodeService; @@ -54,10 +54,18 @@ public class BasicBasicTenantCodeClient implements IBasicTenantCodeClient { } @Override - @GetMapping(TOP+"/list") - public List list(BasicTenantCodeEntity basicTenantCodeEntity) throws IllegalAccessException { + @GetMapping(TOP + "/list") + public List list(BasicTenantCodeEntity basicTenantCodeEntity) { List list = basicTenantCodeService.list(Condition.getQueryWrapper(basicTenantCodeEntity)); return list; } + @Override + @GetMapping(TOP + "/shelfCode") + public String shelfCode(String tenantId,String codeType) { + String shelfCode = basicTenantCodeService.shelfCode(tenantId,codeType); + return shelfCode; + } + + } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicPrintTemplateMapper.xml b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicPrintTemplateMapper.xml index 14ce7d030..ed1fcb7b8 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicPrintTemplateMapper.xml +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicPrintTemplateMapper.xml @@ -35,4 +35,5 @@ SELECT * FROM logpm_basic_print_template ${ew.customSqlSegment} + diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicTenantCodeMapper.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicTenantCodeMapper.java index 264205980..dc615ac27 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicTenantCodeMapper.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicTenantCodeMapper.java @@ -60,5 +60,8 @@ public interface BasicTenantCodeMapper extends BaseMapper */ IPage selectTenantCodeList(IPage page,@Param("po") Map basicTenantCode); + BasicTenantCodeEntity selectTenantCodeDetail(Long id); + + String shelfCode(@Param("po")Map map); } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicTenantCodeMapper.xml b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicTenantCodeMapper.xml index cd042d2fb..e9b6d83e1 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicTenantCodeMapper.xml +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicTenantCodeMapper.xml @@ -40,10 +40,10 @@ is_deleted = 0 - and code_type = #{po.input} + and code_type = #{po.codeType} - and show_type = #{po.type} + and show_type = #{po.showType} @@ -75,5 +75,17 @@ + diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPrintTemplateService.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPrintTemplateService.java index 5948edc96..57d5af48a 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPrintTemplateService.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPrintTemplateService.java @@ -19,6 +19,7 @@ package com.logpm.basic.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basic.dto.BasicPrintTemplateDTO; import com.logpm.basic.entity.BasicPrintTemplateEntity; import com.logpm.basic.excel.BasicPrintTemplateExcel; import com.logpm.basic.vo.BasicPrintTemplateVO; @@ -51,4 +52,6 @@ public interface IBasicPrintTemplateService extends BaseService exportBasicPrintTemplate(Wrapper queryWrapper); + boolean insertPrintTemplate(BasicPrintTemplateDTO basicPrintTemplateDTO); + } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicTenantCodeService.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicTenantCodeService.java index 29fc8fd77..2f7e28400 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicTenantCodeService.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicTenantCodeService.java @@ -70,4 +70,5 @@ public interface IBasicTenantCodeService extends BaseService implements IBasicPrintTemplateService { + private BasicPrintTemplateMapper printTemplateMapper; + + @Override public IPage selectBasicPrintTemplatePage(IPage page, BasicPrintTemplateVO basicPrintTemplate) { return page.setRecords(baseMapper.selectBasicPrintTemplatePage(page, basicPrintTemplate)); @@ -57,6 +66,30 @@ public class BasicPrintTemplateServiceImpl extends BaseServiceImpl list(Map basicTenantCode, IPage page) { IPage basicTenantCodeEntityIPage = basicTenantCodeMapper.selectTenantCodeList(page,basicTenantCode); @@ -64,6 +64,15 @@ public class BasicTenantCodeServiceImpl extends BaseServiceImpl map = new HashMap<>(); + map.put("tenantId",tenantId); + map.put("codeType",codeType); + String shelfCode = basicTenantCodeMapper.shelfCode(map); + return shelfCode; + } + @Override public IPage selectBasicTenantCodePage(IPage page, BasicTenantCodeVO basicTenantCode) { return page.setRecords(baseMapper.selectBasicTenantCodePage(page, basicTenantCode)); diff --git a/blade-service/logpm-basicdata/pom.xml b/blade-service/logpm-basicdata/pom.xml index 43a8b15a2..14f800c4b 100644 --- a/blade-service/logpm-basicdata/pom.xml +++ b/blade-service/logpm-basicdata/pom.xml @@ -49,6 +49,11 @@ io.minio minio + + org.springblade + logpm-basic-api + 3.1.0.RELEASE + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java index 59fa302ac..de55f2a35 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java @@ -27,6 +27,9 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; + +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import org.springblade.core.secure.BladeUser; @@ -42,6 +45,10 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; import springfox.documentation.annotations.ApiIgnore; + +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; import java.util.Map; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -162,4 +169,16 @@ public class BasicdataGoodsAllocationController extends BladeController { return R.data(pages); } + + /** + * 货位 自定义分页 + */ + @GetMapping("/qrCode") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "二维码生成", notes = "传入构建好的二维码值") + public R qrCode(@ApiIgnore @RequestParam String qrCode,HttpServletResponse response) { + boolean result = basicdataGoodsAllocationService.getQrCodeImg(qrCode,response); + return R.status(result); + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java index cabff7b48..63e446f96 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java @@ -76,25 +76,13 @@ public class BasicdataGoodsAreaController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入warehouseGoodsArea") - public R> list(@ApiIgnore @RequestParam Map basicdataGoodsArea, Query query) { + public R> list(@ApiIgnore @RequestParam Map basicdataGoodsArea, Query query) { IPage page = Condition.getPage(query); -// IPage list = basicdataGoodsAreaService.getBasicdataGoodsAreaList(basicdataGoodsArea,page); - IPage pages = basicdataGoodsAreaService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataGoodsArea, BasicdataGoodsAreaEntity.class)); - return R.data(pages); + IPage list = basicdataGoodsAreaService.getBasicdataGoodsAreaList(basicdataGoodsArea,page); +// IPage pages = basicdataGoodsAreaService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataGoodsArea, BasicdataGoodsAreaEntity.class)); + return R.data(list); } -// /** -// * 货区 分页 -// */ -// @GetMapping("/list") -// @ApiOperationSupport(order = 2) -// @ApiOperation(value = "分页", notes = "传入warehouseGoodsArea") -// public R> listInfo(@ApiIgnore Query query) { -// IPage page = Condition.getPage(query); -//// IPage list = basicdataGoodsAreaService.getBasicdataGoodsAreaList(basicdataGoodsArea,page); -// IPage pages = basicdataGoodsAreaService.page(Condition.getPage(query)); -// return R.data(pages); -// } /** * 货区 自定义分页 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java index 6ab64998b..8aa9d1a88 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java @@ -26,8 +26,12 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; + +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; +import org.springblade.common.utils.QRCodeUtil; import org.springblade.core.secure.BladeUser; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -42,6 +46,10 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; import springfox.documentation.annotations.ApiIgnore; + +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; import java.util.Map; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -101,7 +109,6 @@ public class BasicdataGoodsShelfController extends BladeController { @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入BasicdataGoodsShelf") public R save(@Valid @RequestBody BasicdataGoodsShelfDTO basicdataGoodsShelfDTO) { - return R.status(basicdataGoodsShelfService.insertGoodsshelf(basicdataGoodsShelfDTO)); } @@ -155,5 +162,22 @@ public class BasicdataGoodsShelfController extends BladeController { } + /** + * 货架 分页 + */ + @GetMapping("/qrCode") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "生成二维码图片返回前端渲染", notes = "传入BasicdataGoodsShelf") + public R qrCode(@ApiIgnore @RequestParam String qrCode,HttpServletResponse response) { + boolean result = basicdataGoodsShelfService.getQRCode(qrCode,response); + if (result){ + return R.status(result); + }else { + return R.fail("操作失败"); + } + } + + + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsAllocationDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsAllocationDTO.java index 6b1f8b0ee..6d786f3db 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsAllocationDTO.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsAllocationDTO.java @@ -33,6 +33,6 @@ import java.util.List; public class BasicdataGoodsAllocationDTO extends BasicdataGoodsAllocationEntity { private static final long serialVersionUID = 1L; - private List nodeInfo; +// private List nodeInfo; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml index ef6222433..d2bc4f205 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml @@ -22,10 +22,10 @@ - + + - @@ -78,10 +78,10 @@ goods_allocation.goods_allocation_name, goods_allocation.warehouse_id, goods_allocation.goods_shelf_id, - goods_allocation.row_num, + goods_allocation.column_num, goods_allocation.enable_status, goods_allocation.allocation_statuc, - goods_allocation.storey_num, + goods_allocation.layer_num, goods_allocation.qr_code, goods_allocation.qr_code_url, goods_shelf.goods_shelf_name AS goodsShelfName, diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml index e6655e193..cca5b71ea 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml @@ -25,6 +25,10 @@ + + + + UPDATE logpm_warehouse_goods_shelf @@ -68,6 +72,10 @@ goods_shelf.enable_status, goods_shelf.goods_allcation_id, goods_shelf.remarks, + goods_shelf.row_num, + goods_shelf.storey_num, + goods_shelf.qr_code, + goods_shelf.qr_code_url, warehouse.name AS warehouseName, goods_area.headline AS goodsAreaName FROM @@ -113,6 +121,9 @@ goods_shelf.enable_status, goods_shelf.goods_allcation_id, goods_shelf.remarks, + goods_shelf.row_num, + goods_shelf.storey_num, + goods_shelf.qr_code, goods_area.headline AS goodsAreaName FROM logpm_warehouse_goods_shelf AS goods_shelf diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAllocationService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAllocationService.java index 5c9788b39..53ba66bc7 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAllocationService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAllocationService.java @@ -26,6 +26,7 @@ import com.logpm.basicdata.vo.BasicdataNodeVO; import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.support.Query; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -77,4 +78,7 @@ public interface IBasicdataGoodsAllocationService extends BaseService ids); + + /** + * 二维码生成 + * @param qrCode + * @param response + * @return + */ + boolean getQRCode(String qrCode, HttpServletResponse response); + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java index a46582513..c9a65c3c0 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java @@ -73,6 +73,11 @@ public interface IBasicdataWarehouseService extends BaseService ids); + /** + * + * @param name + * @return + */ List pageListName(String name); /** * 查询仓库字典 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java index 9c2adac15..71eac554d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java @@ -17,6 +17,7 @@ package com.logpm.basicdata.service.impl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; +import com.logpm.basic.feign.IBasicTenantCodeClient; import com.logpm.basicdata.dto.BasicdataGoodsAllocationDTO; import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity; import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel; @@ -27,6 +28,7 @@ import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO; import com.logpm.basicdata.vo.BasicdataNodeVO; import com.logpm.basicdata.vo.BasicdataWarehouseVO; import lombok.AllArgsConstructor; +import org.springblade.common.utils.QRCodeUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; @@ -37,7 +39,9 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; import java.util.Date; import java.util.List; import java.util.Map; @@ -56,6 +60,8 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl selectBasicdataGoodsAllocationPage(IPage page, BasicdataGoodsAllocationVO BasicdataGoodsAllocation) { return page.setRecords(baseMapper.selectBasicdataGoodsAllocationPage(page, BasicdataGoodsAllocation)); @@ -99,6 +105,7 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl selectBasicdataGoodsShelfPage(IPage page, BasicdataGoodsShelfVO basicdataGoodsShelfVO) { return page.setRecords(baseMapper.selectBasicdataGoodsShelfPage(page, basicdataGoodsShelfVO)); @@ -70,31 +91,35 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl getGoodsShelfList(IPage page, Map basicdataGoodsShelf) { + public IPage getGoodsShelfList(IPage page, Map basicdataGoodsShelf) { IPage basicdataGoodsShelfVOIPage=basicdataGoodsShelfMapper.getGoodsShelfList(page,basicdataGoodsShelf); - +// redisUtil.set("aaa","aaa"); +// WebUtil.getResponseEncodedHtmlEscape() return basicdataGoodsShelfVOIPage; } + @Override @Transactional(rollbackFor = Exception.class) public boolean insertGoodsshelf(BasicdataGoodsShelfDTO basicdataGoodsShelfDTO) { //维护仓库、货区数据 boolean result = false; - //这里新增货架必须有仓库和货区的信息 + //这里新增货架必须有仓库和货区的信息否则视为信息不合法 if (Func.isEmpty(basicdataGoodsShelfDTO) ){ return result; + } + if (Func.isBlank(basicdataGoodsShelfDTO.getWarehouseId())&Func.isBlank(basicdataGoodsShelfDTO.getGoodsAreaId())){ + log.error("仓库货区信息不合法"); + throw new RuntimeException("请完善货区信息!!!"); } BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = new BasicdataGoodsShelfEntity(); BeanUtils.copyProperties(basicdataGoodsShelfDTO,basicdataGoodsShelfEntity); BladeUser user = AuthUtil.getUser(); + Long userId = user.getUserId(); basicdataGoodsShelfEntity.setCreateTime(new Date()); basicdataGoodsShelfEntity.setCreateDept( Long.valueOf(user.getDeptId())); - basicdataGoodsShelfEntity.setCreateUser(user.getUserId()); - basicdataGoodsShelfEntity.setUpdateTime(new Date()); - basicdataGoodsShelfEntity.setUpdateUser(user.getUserId()); - basicdataGoodsShelfEntity.setCreateUser(user.getUserId()); + basicdataGoodsShelfEntity.setCreateUser(userId); //数据状态默认正常 basicdataGoodsShelfEntity.setStatus(1); //货架添加删除状态为正常 @@ -103,8 +128,15 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl implements IBasicdataZonePriceService { IBasicdataCostCorrelationService basicdataCostCorrelationService; + BasicdataCostCorrelationMapper basicdataCostCorrelationMapper;