完善商品管理

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java

@@ -74,13 +74,13 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
                 orgSidPath = orgSidPath.substring(0, i4);
                 qw.like("s.orgSidPath", orgSidPath);
             } else if ("5".equals(orgLevelKey)) {
-                qw.eq("b..createBySid", query.getUserSid());
+                qw.eq("b.createBySid", query.getUserSid());
             } else {
-                PagerVo<BaseGoodsSpuListVo> p = new PagerVo<>();
+                PagerVo<BaseBrandInfoVo> p = new PagerVo<>();
                 return rb.success().setData(p);
             }
         } else {
-            PagerVo<BaseGoodsSpuListVo> p = new PagerVo<>();
+            PagerVo<BaseBrandInfoVo> p = new PagerVo<>();
             return rb.success().setData(p);
         }
         if(StringUtils.isNotBlank(query.getName())){

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;//是否可以积分兑换

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;//外部编码

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;//首保价格

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml

@@ -81,8 +81,8 @@ WHERE
     </select>
     <select id="checkForUpdate" resultType="com.yxt.base.biz.base.basegoodsspu.BaseGoodsSpu">
         select *
-        from base_goods_unit
-        where unitName = #{unitName}
+        from base_goods_spu
+        where goodsCode = #{goodsCode}
           and useOrgSid = #{useOrgSid}
           and isDelete = 0
           and sid != #{sid}

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java

@@ -13,9 +13,11 @@ import com.yxt.base.biz.base.basegoodsskuextend.UrlsVo;
 import com.yxt.base.biz.base.basegoodsspudetail.BaseGoodsSpuDetailVo;
 import com.yxt.base.biz.base.basegoodsunit.BaseGoodsUnit;
 import com.yxt.base.biz.base.basegoodsunit.BaseGoodsUnitService;
+import com.yxt.base.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.base.feign.portal.sysuser.SysUserFeign;
 import com.yxt.base.utils.PinYinUtils;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -65,7 +67,8 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
     private BaseBrandInfoService baseBrandInfoService;
     @Autowired
     private BaseManufacturerService baseManufacturerService;
-
+    @Autowired
+    private SysUserFeign sysUserFeign;
     public ResultBean<PagerVo<BaseGoodsSpuVo>> listPage(PagerQuery<BaseGoodsSpuQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         BaseGoodsSpuQuery query = pq.getParams();
@@ -190,18 +193,50 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
         ResultBean rb = ResultBean.fireFail();
         BaseGoodsSpuListQuery query = pq.getParams();
         QueryWrapper<BaseGoodsSpu> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getOrgPath())) {
-            String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
-            qw.eq("p.createOrgSid", createOrgSid);
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(query.getOrgPath());
+        privilegeQuery.setMenuUrl(query.getMenuUrl());
+        privilegeQuery.setUserSid(query.getUserSid());
+        ResultBean<String> 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("u.orgSidPath", orgSidPath);
+            } else if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i2);
+                qw.like("u.orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i3);
+                qw.like("u.orgSidPath", orgSidPath);
+            } else if ("4".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i4);
+                qw.like("u.orgSidPath", orgSidPath);
+            } else if ("5".equals(orgLevelKey)) {
+                qw.eq("p.createBySid", query.getUserSid());
+            } else {
+                PagerVo<BaseGoodsSpuListVo> p = new PagerVo<>();
+                return rb.success().setData(p);
+            }
+        } else {
+            PagerVo<BaseGoodsSpuListVo> p = new PagerVo<>();
+            return rb.success().setData(p);
         }
         if (StringUtils.isNotBlank(query.getGoodsPY())) {
             qw.like("p.goodsPY", query.getGoodsPY());
         }
         if (StringUtils.isNotBlank(query.getCreateOrgName())) {
-            qw.like("p.createOrgName", query.getCreateOrgName());
+            qw.like("c.`name`", query.getCreateOrgName());
         }
         if (StringUtils.isNotBlank(query.getUseOrgName())) {
-            qw.like("p.useOrgName", query.getUseOrgName());
+            qw.like("u.`name`", query.getUseOrgName());
         }
         if (StringUtils.isNotBlank(query.getGoodsName())) {
             qw.like("p.goodsName", query.getGoodsName());

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsType.java

@@ -3,6 +3,8 @@ package com.yxt.base.biz.base.basegoodstype;
 import com.yxt.common.core.domain.BaseEntity;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author wangpengfei
  * @date 2024/2/26 13:36
@@ -11,8 +13,8 @@ import lombok.Data;
 public class BaseGoodsType extends BaseEntity {
     private String goodsTypeName;//商品类别名称
     private String goodsTypeCode;//类别编码
-    private String percentageRate;//提成比例
-    private Double percentageAmount;//提成金额
+    private Integer percentageRate;//提成比例
+    private BigDecimal percentageAmount;//提成金额
     private String pSid;//父级sid
     private String isParent;//是否为父节点，0为否，1为是，0标识为叶子节点
     private String isGoodsID;//是否一品一码  0 否 1是

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml

@@ -29,7 +29,7 @@
         select *
         from base_manufacturer
         where manufacturerCode = #{manufacturerCode}
-          and useOrgSid = #{deptSid}
+          and useOrgSid = #{useOrgSid}
           and isDelete = 0
             and sid != #{sid}
     </select>

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;//货区类型
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java

@@ -42,42 +42,42 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
         ResultBean rb = ResultBean.fireFail();
         WmsWarehouseAreaQuery query = pq.getParams();
         QueryWrapper<WmsWarehouseArea> qw = new QueryWrapper<>();
-//        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-//        privilegeQuery.setOrgPath(query.getOrgPath());
-//        privilegeQuery.setMenuUrl(query.getMenuUrl());
-//        privilegeQuery.setUserSid(query.getUserSid());
-//        ResultBean<String> 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<WmsWarehouseAreaVo> p = new PagerVo<>();
-//                return rb.success().setData(p);
-//            }
-//        } else {
-//            PagerVo<WmsWarehouseAreaVo> 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<String> 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<WmsWarehouseAreaVo> p = new PagerVo<>();
+                return rb.success().setData(p);
+            }
+        } else {
+            PagerVo<WmsWarehouseAreaVo> p = new PagerVo<>();
+            return rb.success().setData(p);
+        }
         if (StringUtils.isNotBlank(query.getName())) {
             qw.like("a.areaName", query.getName());
         }