库存记录权限控制 移除
入库出库权限控制 移除 入库出库标识 1为入库 -1为出库 商品单位Id 类型为 字符串
This commit is contained in:
@@ -39,7 +39,7 @@ public class TbProductVo {
|
|||||||
private BigDecimal lowPrice;
|
private BigDecimal lowPrice;
|
||||||
|
|
||||||
|
|
||||||
private Integer unitId;
|
private String unitId;
|
||||||
|
|
||||||
|
|
||||||
private String coverImg;
|
private String coverImg;
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ public class TbProductStockDetail implements Serializable {
|
|||||||
|
|
||||||
@Column(name = "`sub_type`",nullable = false)
|
@Column(name = "`sub_type`",nullable = false)
|
||||||
@NotNull
|
@NotNull
|
||||||
@ApiModelProperty(value = " 1入库2出库")
|
@ApiModelProperty(value = " 1入库 -1出库")
|
||||||
private Integer subType;
|
private Integer subType;
|
||||||
|
|
||||||
@Column(name = "`type`",nullable = false)
|
@Column(name = "`type`",nullable = false)
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ public class TbProductStockDetailController {
|
|||||||
@PostMapping("/stock")
|
@PostMapping("/stock")
|
||||||
@Log("查询/product/Stock")
|
@Log("查询/product/Stock")
|
||||||
@ApiOperation("查询/product/Stock")
|
@ApiOperation("查询/product/Stock")
|
||||||
@PreAuthorize("@el.check('tbProductStockDetail:list')")
|
// @PreAuthorize("@el.check('tbProductStockDetail:list')")
|
||||||
public ResponseEntity<Object> queryPage(@RequestBody TbProductStockDetailQueryCriteria criteria){
|
public ResponseEntity<Object> queryPage(@RequestBody TbProductStockDetailQueryCriteria criteria){
|
||||||
return new ResponseEntity<>(tbProductStockDetailService.queryPage(criteria),HttpStatus.OK);
|
return new ResponseEntity<>(tbProductStockDetailService.queryPage(criteria),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ public class TbProductStockDetailDto implements Serializable {
|
|||||||
/** 关联订单Id */
|
/** 关联订单Id */
|
||||||
private String orderId;
|
private String orderId;
|
||||||
|
|
||||||
/** 1入库2出库 */
|
/** 1入库 -1出库 */
|
||||||
private Integer subType;
|
private Integer subType;
|
||||||
|
|
||||||
/** purchase采购入库 transfer调拔入库
|
/** purchase采购入库 transfer调拔入库
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
|
|||||||
map.put("操作批次号", tbProductStockDetail.getBatchNumber());
|
map.put("操作批次号", tbProductStockDetail.getBatchNumber());
|
||||||
map.put("库存操作来源:收银端调用 CASHIER 系统后台调用SHOP", tbProductStockDetail.getSourcePath());
|
map.put("库存操作来源:收银端调用 CASHIER 系统后台调用SHOP", tbProductStockDetail.getSourcePath());
|
||||||
map.put("关联订单Id", tbProductStockDetail.getOrderId());
|
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("purchase采购入库 transfer调拔入库 ", tbProductStockDetail.getType());
|
||||||
map.put("上次剩余数量", tbProductStockDetail.getLeftNumber());
|
map.put("上次剩余数量", tbProductStockDetail.getLeftNumber());
|
||||||
map.put("出入库时间", tbProductStockDetail.getStockTime());
|
map.put("出入库时间", tbProductStockDetail.getStockTime());
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ public class TbProductStockOperateController {
|
|||||||
@PostMapping("/outAndOn")
|
@PostMapping("/outAndOn")
|
||||||
@Log("新增/product/StockOperate")
|
@Log("新增/product/StockOperate")
|
||||||
@ApiOperation("新增/product/StockOperate")
|
@ApiOperation("新增/product/StockOperate")
|
||||||
@PreAuthorize("@el.check('tbProductStockOperate:add')")
|
// @PreAuthorize("@el.check('tbProductStockOperate:add')")
|
||||||
public ResponseEntity<Object> createOutAndONOperate(@RequestBody OutAndOnDto outAndOnDto){
|
public ResponseEntity<Object> createOutAndONOperate(@RequestBody OutAndOnDto outAndOnDto){
|
||||||
return new ResponseEntity<>(tbProductStockOperateService.createOutAndONOperate(outAndOnDto),HttpStatus.CREATED);
|
return new ResponseEntity<>(tbProductStockOperateService.createOutAndONOperate(outAndOnDto),HttpStatus.CREATED);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user