From e7141ff0c5e97c610429b9907e2aff99db17356f Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 20 May 2024 16:10:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basebrandinfo/BaseBrandInfoService.java | 6 +- .../BaseGoodsSkuExtend.java | 16 +++-- .../biz/base/basegoodsspu/BaseGoodsSpu.java | 2 +- .../base/basegoodsspu/BaseGoodsSpuListVo.java | 4 +- .../base/basegoodsspu/BaseGoodsSpuMapper.xml | 4 +- .../basegoodsspu/BaseGoodsSpuService.java | 47 ++++++++++-- .../biz/base/basegoodstype/BaseGoodsType.java | 6 +- .../BaseManufacturerMapper.xml | 2 +- .../wmswarehousearea/WmsWarehouseArea.java | 3 +- .../WmsWarehouseAreaService.java | 72 +++++++++---------- 10 files changed, 101 insertions(+), 61 deletions(-) diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java index fbae17eba6..c57ef30f03 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java @@ -74,13 +74,13 @@ public class BaseBrandInfoService extends MybatisBaseService p = new PagerVo<>(); + PagerVo p = new PagerVo<>(); return rb.success().setData(p); } } else { - PagerVo p = new PagerVo<>(); + PagerVo p = new PagerVo<>(); return rb.success().setData(p); } if(StringUtils.isNotBlank(query.getName())){ diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java index a92bafb86c..30db30fc14 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; +import java.math.BigDecimal; + /** * @author wangpengfei * @date 2024/2/26 13:36 @@ -20,13 +22,13 @@ public class BaseGoodsSkuExtend extends BaseEntity { private String inventoryAlertUpperLimit;//库存警戒上线 @TableField(value = "InventoryAlertLowerLimit") private String inventoryAlertLowerLimit;//库存警戒下线 - private String costPrice;//成本价 - private String tagPrice;//吊牌价 - private String salesPrice;//销售单价 - private String standardPurchasePrice;//标准进价 - private String agencyPrice;//代理价 - private String discount;//折扣 - private String minimumSalesPrice;//最低零售价 + private BigDecimal costPrice;//成本价 + private BigDecimal tagPrice;//吊牌价 + private BigDecimal salesPrice;//销售单价 + private BigDecimal standardPurchasePrice;//标准进价 + private BigDecimal agencyPrice;//代理价 + private BigDecimal discount;//折扣 + private BigDecimal minimumSalesPrice;//最低零售价 private String isLockingSalesPrice;//是否锁定销售价 1是2否 private String isLockingSalesPriceValue;//是否锁定销售价 private String isIntegralExchange;//是否可以积分兑换 diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java index effb7143d1..8de4df826b 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java @@ -22,7 +22,7 @@ public class BaseGoodsSpu extends BaseEntity { private String goodsUnitSid;//商品单位sid private String goodsUnitName;//商品单位名称 private String taxRate;//税率 - private String shelfLife;//保质期天 + private Integer shelfLife;//保质期天 private String nationalStandardCode;//国标码 private String sortNo;//排序 private String externalCode;//外部编码 diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java index a6f5962a63..848fe2b8ae 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java @@ -25,10 +25,10 @@ public class BaseGoodsSpuListVo implements Vo { private String shelfLife;//保质期 private String brandName;//品牌 private String manufacturerName;//厂家 - private String isOriginalFactory;//原厂标志（ 1 是 2否） + private String isOriginalFactoryValue;//原厂标志（ 1 是 2否） private String InventoryAlertUpperLimit;//库存上限 private String InventoryAlertLowerLimit;//库存下限 - private String isLockingSalesPrice;//锁定销售价（ 1 是 2否） + private String isLockingSalesPriceValue;//锁定销售价（ 1 是 2否） private String minimumSalesPrice;//销售底价 private String standardPurchasePrice;//三包价格 private String agencyPrice;//首保价格 diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml index 385542e0b4..c35556b94e 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml @@ -81,8 +81,8 @@ WHERE diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java index 8518704fab..c6a9e38589 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; import java.util.UUID; @@ -22,7 +23,7 @@ public class WmsWarehouseArea extends BaseEntity { private String areaName;//库位名称 private String areaCode;//库位编码 private String warehouseSid;//仓库sid - private String volume;//库位容量 + private BigDecimal volume;//库位容量 private String unit;//计量单位 private String areaTypeSid;//货区类型 } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java index 780a69d224..ae9eab453e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java @@ -42,42 +42,42 @@ public class WmsWarehouseAreaService extends MybatisBaseService qw = new QueryWrapper<>(); -// PrivilegeQuery privilegeQuery = new PrivilegeQuery(); -// privilegeQuery.setOrgPath(query.getOrgPath()); -// privilegeQuery.setMenuUrl(query.getMenuUrl()); -// privilegeQuery.setUserSid(query.getUserSid()); -// ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); -// if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { -// //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) -// String orgSidPath = query.getOrgPath(); -// orgSidPath = orgSidPath + "/"; -// int i1 = orgSidPath.indexOf("/"); -// int i2 = orgSidPath.indexOf("/", i1 + 1); -// int i3 = orgSidPath.indexOf("/", i2 + 1); -// int i4 = orgSidPath.indexOf("/", i3 + 1); -// String orgLevelKey = defaultIdReltBean.getData(); -// if ("1".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i1); -// qw.like("s.orgSidPath", orgSidPath); -// } else if ("2".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i2); -// qw.like("s.orgSidPath", orgSidPath); -// } else if ("3".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i3); -// qw.like("s.orgSidPath", orgSidPath); -// } else if ("4".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i4); -// qw.like("s.orgSidPath", orgSidPath); -// } else if ("5".equals(orgLevelKey)) { -// qw.eq("a.createBySid", query.getUserSid()); -// } else { -// PagerVo p = new PagerVo<>(); -// return rb.success().setData(p); -// } -// } else { -// PagerVo p = new PagerVo<>(); -// return rb.success().setData(p); -// } + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("a.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } if (StringUtils.isNotBlank(query.getName())) { qw.like("a.areaName", query.getName()); }