From 763055b5a4e337ac6d11b9e7cee45d2894988fde Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 1 Mar 2024 16:48:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=AE=B0=E5=BD=95=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6=20=E7=A7=BB=E9=99=A4=20=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=87=BA=E5=BA=93=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=20=E7=A7=BB=E9=99=A4=20=E5=85=A5=E5=BA=93=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=A0=87=E8=AF=86=201=E4=B8=BA=E5=85=A5=E5=BA=93=20-1=E4=B8=BA?= =?UTF-8?q?=E5=87=BA=E5=BA=93=20=E5=95=86=E5=93=81=E5=8D=95=E4=BD=8DId=20?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=20=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/productInfo/product/domain/TbProductVo.java | 2 +- .../productInfo/productStock/domain/TbProductStockDetail.java | 2 +- .../productStock/rest/TbProductStockDetailController.java | 2 +- .../productStock/service/dto/TbProductStockDetailDto.java | 2 +- .../service/impl/TbProductStockDetailServiceImpl.java | 2 +- .../rest/TbProductStockOperateController.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/domain/TbProductVo.java b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/domain/TbProductVo.java index 1c36cea6..5c38ed0d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/domain/TbProductVo.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/domain/TbProductVo.java @@ -39,7 +39,7 @@ public class TbProductVo { private BigDecimal lowPrice; - private Integer unitId; + private String unitId; private String coverImg; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/domain/TbProductStockDetail.java b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/domain/TbProductStockDetail.java index 65c28704..3f316db2 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/domain/TbProductStockDetail.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/domain/TbProductStockDetail.java @@ -89,7 +89,7 @@ public class TbProductStockDetail implements Serializable { @Column(name = "`sub_type`",nullable = false) @NotNull - @ApiModelProperty(value = " 1入库2出库") + @ApiModelProperty(value = " 1入库 -1出库") private Integer subType; @Column(name = "`type`",nullable = false) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/rest/TbProductStockDetailController.java b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/rest/TbProductStockDetailController.java index f3e20761..9b3de685 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/rest/TbProductStockDetailController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/rest/TbProductStockDetailController.java @@ -62,7 +62,7 @@ public class TbProductStockDetailController { @PostMapping("/stock") @Log("查询/product/Stock") @ApiOperation("查询/product/Stock") - @PreAuthorize("@el.check('tbProductStockDetail:list')") +// @PreAuthorize("@el.check('tbProductStockDetail:list')") public ResponseEntity queryPage(@RequestBody TbProductStockDetailQueryCriteria criteria){ return new ResponseEntity<>(tbProductStockDetailService.queryPage(criteria),HttpStatus.OK); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/dto/TbProductStockDetailDto.java b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/dto/TbProductStockDetailDto.java index c18dba4d..b822f0da 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/dto/TbProductStockDetailDto.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/dto/TbProductStockDetailDto.java @@ -62,7 +62,7 @@ public class TbProductStockDetailDto implements Serializable { /** 关联订单Id */ private String orderId; - /** 1入库2出库 */ + /** 1入库 -1出库 */ private Integer subType; /** purchase采购入库 transfer调拔入库 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/impl/TbProductStockDetailServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/impl/TbProductStockDetailServiceImpl.java index 2dade512..7333bb43 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/impl/TbProductStockDetailServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/impl/TbProductStockDetailServiceImpl.java @@ -133,7 +133,7 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ map.put("操作批次号", tbProductStockDetail.getBatchNumber()); map.put("库存操作来源：收银端调用 CASHIER 系统后台调用SHOP", tbProductStockDetail.getSourcePath()); map.put("关联订单Id", tbProductStockDetail.getOrderId()); - map.put(" 1入库2出库", tbProductStockDetail.getSubType()); + map.put(" 1入库-1出库", tbProductStockDetail.getSubType()); map.put("purchase采购入库 transfer调拔入库 ", tbProductStockDetail.getType()); map.put("上次剩余数量", tbProductStockDetail.getLeftNumber()); map.put("出入库时间", tbProductStockDetail.getStockTime()); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/rest/TbProductStockOperateController.java b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/rest/TbProductStockOperateController.java index bbcb3087..f7960bb1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/rest/TbProductStockOperateController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/rest/TbProductStockOperateController.java @@ -80,7 +80,7 @@ public class TbProductStockOperateController { @PostMapping("/outAndOn") @Log("新增/product/StockOperate") @ApiOperation("新增/product/StockOperate") - @PreAuthorize("@el.check('tbProductStockOperate:add')") +// @PreAuthorize("@el.check('tbProductStockOperate:add')") public ResponseEntity createOutAndONOperate(@RequestBody OutAndOnDto outAndOnDto){ return new ResponseEntity<>(tbProductStockOperateService.createOutAndONOperate(outAndOnDto),HttpStatus.CREATED); }