商品 库存

oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoService.java

@@ -41,7 +41,9 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
         }
         PagerVo<BaseBrandInfoVo> baseBrandInfoVos=w.getData();
         for (BaseBrandInfoVo baseBrandInfoVo : baseBrandInfoVos.getRecords()) {
-            baseBrandInfoVo.setImage(fileUploadComponent.getUrlPrefix() + baseBrandInfoVo.getImage());
+            if(StringUtils.isNotBlank(baseBrandInfoVo.getImage())) {
+                baseBrandInfoVo.setImage(fileUploadComponent.getUrlPrefix() + baseBrandInfoVo.getImage());
+            }
         }
 
         return rb.success().success().setData(baseBrandInfoVos);

oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSku.java

@@ -17,5 +17,6 @@ public class BaseGoodsSku extends BaseEntity {
     private String indexes;//特有规格属性在spu表中special_spec字段对应每个参数值数组下标的组合，如0_0_0,1_0_0，相当于SKU这条记录的编码。
     @TableField(value = "own_spec")
     private String ownSpec;//sku的特有规格参数键值对，json格式，反序列化时请使用linkedHashMap，保证有序
-
+    private String barCode;//条形码
+    private String aidBarCode;//辅助条码
 }

oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuDto.java

@@ -28,4 +28,6 @@ public class BaseGoodsSkuDto implements Dto {
     @TableField(value = "own_spec")
     private String ownSpec;//sku的特有规格参数键值对，json格式，反序列化时请使用linkedHashMap，保证有序
     private BaseGoodsSkuExtendDto baseGoodsSkuExtend;//sku扩展
+    private String barCode;//条形码
+    private String aidBarCode;//辅助条码
 }

oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuVo.java

@@ -34,5 +34,7 @@ public class BaseGoodsSkuVo implements Vo {
     private String ownSpec;//sku的特有规格参数键值对，json格式，反序列化时请使用linkedHashMap，保证有序
     private String goodsName;
     private BaseGoodsSkuExtendVo baseGoodsSkuExtend;
+    private String barCode;//条形码
+    private String aidBarCode;//辅助条码
 
 }

oms/src/main/java/com/yxt/oms/biz/func/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
@@ -31,4 +33,13 @@ public class BaseGoodsSkuExtend extends BaseEntity {
     private String integralAmount;//积分数量
     private String sortNo;//排序
     private String picUrl;//商品的图片，多个图片以‘,’分割
+    private double weight;//重量
+    private double volume;//体积（长*宽*高）
+    private double vLength;//长
+    private double vWidth;//宽
+    private double vHeight;//高
+    private String packageSpecs;//包装规格（如1*30包，1*300ml）
+    private double quantityOfPackage;//包装内数量
+    private String packUnit;//包装单位
+    private BigDecimal packPrice;//包装单价
 }

oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendDto.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -43,4 +44,13 @@ public class BaseGoodsSkuExtendDto implements Dto {
     private String picUrl;//商品的图片，多个图片以‘,’分割
 //    private String [] Urls={};//图片数组
     private List<UrlsVo> urls;//图片数组
+    private double weight;//重量
+    private double volume;//体积（长*宽*高）
+    private double vLength;//长
+    private double vWidth;//宽
+    private double vHeight;//高
+    private String packageSpecs;//包装规格（如1*30包，1*300ml）
+    private double quantityOfPackage;//包装内数量
+    private String packUnit;//包装单位
+    private BigDecimal packPrice;//包装单价
 }

oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendVo.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -49,5 +50,14 @@ public class BaseGoodsSkuExtendVo implements Vo {
 //    private String [] Urls={};//图片数组
     private List<UrlsVo> urls;//图片数组
     private String title;//sku标题
+    private double weight;//重量
+    private double volume;//体积（长*宽*高）
+    private double vLength;//长
+    private double vWidth;//宽
+    private double vHeight;//高
+    private String packageSpecs;//包装规格（如1*30包，1*300ml）
+    private double quantityOfPackage;//包装内数量
+    private String packUnit;//包装单位
+    private BigDecimal packPrice;//包装单价
 
 }

oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpu.java

@@ -3,6 +3,8 @@ package com.yxt.oms.biz.func.basegoodsspu;
 import com.yxt.common.core.domain.BaseEntity;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author wangpengfei
  * @date 2024/2/26 13:36
@@ -29,4 +31,22 @@ public class BaseGoodsSpu extends BaseEntity {
     private String isListed;//是否上架
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
+    private String goodsLevelKey;//商品等级Key
+    private String goodsLevelValue;//商品等级value（数据字典，如A、B、C）
+    private String goodsClassKey;//商品类型key
+    private String goodsClassValue;//商品类型value（数据字典，如正常商品、赠品、耗材等）
+    private String aidBarCode;//辅助条码
+    private String lengthUnit;//长度单位
+    private String volumeUnit;//体积单位
+    private String weightUnit;//重量单位
+    private double weight;//重量
+    private double volume;//体积（长*宽*高）
+    private double vLength;//长
+    private double vWidth;//宽
+    private double vHeight;//高
+    private String packageSpecs;//包装规格（如1*30包，1*300ml）
+    private double quantityOfPackage;//包装内数量
+    private String packUnit;//包装单位
+    private BigDecimal packPrice;//包装单价
+
 }

oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuDto.java

@@ -6,6 +6,7 @@ import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuDto;
 import com.yxt.oms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailDto;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -45,5 +46,23 @@ public class BaseGoodsSpuDto implements Dto {
     private List<BaseGoodsSkuDto> baseGoodsSkus;//商品sku
     private String userSid;
     private String orgPath;
+    private String goodsLevelKey;//商品等级Key
+    private String goodsLevelValue;//商品等级value（数据字典，如A、B、C）
+    private String goodsClassKey;//商品类型key
+    private String goodsClassValue;//商品类型value（数据字典，如正常商品、赠品、耗材等）
+    private String aidBarCode;//辅助条码
+    private String lengthUnit;//长度单位
+    private String volumeUnit;//体积单位
+    private String weightUnit;//重量单位
+    private double weight;//重量
+    private double volume;//体积（长*宽*高）
+    private double vLength;//长
+    private double vWidth;//宽
+    private double vHeight;//高
+    private String packageSpecs;//包装规格（如1*30包，1*300ml）
+    private double quantityOfPackage;//包装内数量
+    private String packUnit;//包装单位
+    private BigDecimal packPrice;//包装单价
+
 
 }

oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuVo.java

@@ -6,6 +6,7 @@ import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuVo;
 import com.yxt.oms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailVo;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -51,4 +52,22 @@ public class BaseGoodsSpuVo implements Vo {
     private String brandName;
     private String manufacturerName;
     private String typeName;
+    private String goodsLevelKey;//商品等级Key
+    private String goodsLevelValue;//商品等级value（数据字典，如A、B、C）
+    private String goodsClassKey;//商品类型key
+    private String goodsClassValue;//商品类型value（数据字典，如正常商品、赠品、耗材等）
+    private String aidBarCode;//辅助条码
+    private String lengthUnit;//长度单位
+    private String volumeUnit;//体积单位
+    private String weightUnit;//重量单位
+    private double weight;//重量
+    private double volume;//体积（长*宽*高）
+    private double vLength;//长
+    private double vWidth;//宽
+    private double vHeight;//高
+    private String packageSpecs;//包装规格（如1*30包，1*300ml）
+    private double quantityOfPackage;//包装内数量
+    private String packUnit;//包装单位
+    private BigDecimal packPrice;//包装单价
+
 }

oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfo.java

@@ -18,6 +18,7 @@ public class WarehouseInfo extends BaseEntity {
     private String manager;//主管
     private String areaSid;//地区sid
     private String address;//地址
+    private String lngAndLat;//经纬度
     private String longitude;//经度
     private String latitude;//纬度
     private String warehouseTypeKey;//仓库类型Key

oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoDto.java

@@ -32,6 +32,7 @@ public class WarehouseInfoDto implements Dto {
     private String manager;//主管
     private String areaSid;//地区sid
     private String address;//地址
+    private String lngAndLat;//经纬度
     private String longitude;//经度
     private String latitude;//纬度
     private String warehouseTypeKey;//仓库类型Key

oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoMapQuery.java

@@ -0,0 +1,21 @@
+package com.yxt.oms.biz.func.warehouseinfo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/8/29 11:52
+ */
+@Data
+public class WarehouseInfoMapQuery {
+    private String name;//仓库名称
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    private String orgLevelKey;//
+    private int index;//下标
+}

oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoMapper.java

@@ -20,6 +20,6 @@ public interface WarehouseInfoMapper extends BaseMapper<WarehouseInfo> {
     IPage<WarehouseInfoVo> listPage(IPage<WarehouseInfo> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInfo> qw);
 
     int updateBySidIsDelete(List<String> list);
-    @Select("select * from oms_warehouse_info")
+    @Select("select * from warehouse_info")
     List<WarehouseAreaAllVo> selectAll();
 }

oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoMapper.xml

@@ -7,13 +7,13 @@
     <select id="listPage" resultType="com.yxt.oms.biz.func.warehouseinfo.WarehouseInfoVo">
         select
         *
-        from oms_warehouse_info
+        from warehouse_info
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
     <update id="updateBySidIsDelete">
-        UPDATE oms_warehouse_info
+        UPDATE warehouse_info
         SET isDelete=1
         where sid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">

oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java

@@ -1,5 +1,6 @@
 package com.yxt.oms.biz.func.warehouseinfo;
 
+import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -15,16 +16,18 @@ import com.yxt.oms.utils.OrgPathQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:40
+ */
 @Service
-public class WarehouseInfoService {
-
+public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper, WarehouseInfo> {
 
     @Autowired
-    WarehouseInfoFeign warehouseFeign;
+    WarehouseInfoFeign warehouseInfoFeign;
     @Autowired
     SysOrganizationFeign sysOrganizationFeign;
     @Autowired
@@ -41,7 +44,16 @@ public class WarehouseInfoService {
         DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
         pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
         pq.getParams().setIndex(dataRule.getIndex());
-        PagerVo<WarehouseInfoVo> p = warehouseFeign.listPage(pq).getData();
+        PagerVo<WarehouseInfoVo> p = warehouseInfoFeign.listPage(pq).getData();
+        return rb.success().setData(p);
+    }
+    public ResultBean<List<WarehouseInfo>> listQuery(WarehouseInfoMapQuery pq) {
+        ResultBean rb = ResultBean.fireFail();
+        //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数
+        DataRule dataRule=commonMethod.dataRule(pq.getOrgPath(),pq.getMenuUrl(),pq.getUserSid()).getData();
+        pq.setOrgLevelKey(dataRule.getDataRuleId());
+        pq.setIndex(dataRule.getIndex());
+        List<WarehouseInfo> p = warehouseInfoFeign.list(pq).getData();
         return rb.success().setData(p);
     }
     public ResultBean<List<WarehouseInfo>> listAll(OrgPathQuery query) {
@@ -59,7 +71,7 @@ public class WarehouseInfoService {
                 useOrgSid = sysOrganization.getSid();
             }
         }
-        List<WarehouseInfo> list = warehouseFeign.listAll(query).getData();
+        List<WarehouseInfo> list = warehouseInfoFeign.listAll(query).getData();
         return rb.success().setData(list);
     }
 
@@ -87,36 +99,33 @@ public class WarehouseInfoService {
                 }
             }
         }
-        return warehouseFeign.saveOrUpdate(dto);
+        return warehouseInfoFeign.saveOrUpdate(dto);
     }
 
     public ResultBean<WarehouseInfoVo> initialization(String sid) {
 
-        return warehouseFeign.initialization(sid);
+        return warehouseInfoFeign.initialization(sid);
     }
 
 
-
     public ResultBean delete(String sid) {
-
-        return warehouseFeign.delete(sid);
+        return warehouseInfoFeign.delete(sid);
     }
 
     public ResultBean delAll(String[] sids) {
-        return warehouseFeign.delBySids(sids);
+        return warehouseInfoFeign.delBySids(sids);
     }
     public ResultBean updateIsEnable(String sid,String isEnable) {
-
-        return warehouseFeign.updateIsEnable(sid, isEnable);
+        return warehouseInfoFeign.updateIsEnable(sid, isEnable);
     }
 
     public ResultBean<List<WarehouseInfoAllVo>> selectAll() {
-        return warehouseFeign.selectAll();
+        return warehouseInfoFeign.selectAll();
     }
 
 
     public ResultBean<List<SmsOrderHouseInfo>> getWareHouse(String createOrgSid) {
-        return warehouseFeign.getWareHouse(createOrgSid);
+        return warehouseInfoFeign.getWareHouse(createOrgSid);
     }
 
 }

oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoVo.java

@@ -33,6 +33,7 @@ public class WarehouseInfoVo implements Vo {
     private String manager;//主管
     private String areaSid;//地区sid
     private String address;//地址
+    private String lngAndLat;//经纬度
     private String longitude;//经度
     private String latitude;//纬度
     private String warehouseTypeKey;//仓库类型Key
@@ -42,5 +43,5 @@ public class WarehouseInfoVo implements Vo {
     private Integer sortNo;//排序
     private String useOrgSid;//创建组织sid
     private String createOrgSid;//创建组织sid
-    private List<WarehouseExtendVo> omsWarehouseExtendVos;
+    private List<WarehouseExtendVo> wmsWarehouseExtendVos;
 }

oms/src/main/java/com/yxt/oms/config/SaTokenConfigure.java

@@ -1,4 +1,4 @@
-package com.yxt.oms.config;//package com.yxt.wms.config;
+package com.yxt.oms.config;//package com.yxt.oms.config;
 //
 //import cn.dev33.satoken.interceptor.SaInterceptor;
 //import cn.dev33.satoken.stp.StpUtil;

oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java

@@ -67,4 +67,7 @@ public interface WarehouseInfoFeign {
     @ApiOperation("查询所有的仓库")
     @PostMapping("/listAll")
     public ResultBean<List<WarehouseInfo>> listAll(@RequestBody OrgPathQuery query);
+
+    @PostMapping("/list")
+    public ResultBean<List<WarehouseInfo>> list(@RequestBody WarehouseInfoMapQuery query);
 }

oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeignFallback.java

@@ -31,12 +31,6 @@ public class WarehouseInfoFeignFallback implements WarehouseInfoFeign {
 		return null;
 	}
 
-	@Override
-	public ResultBean<List<WarehouseInfo>> listAll(OrgPathQuery query) {
-		return null;
-	}
-
-
 	@Override
 	public ResultBean<String> saveOrUpdate(WarehouseInfoDto dto) {
 		return null;
@@ -71,4 +65,14 @@ public class WarehouseInfoFeignFallback implements WarehouseInfoFeign {
 	public ResultBean<List<SmsOrderHouseInfo>> getWareHouse(String createOrgSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<WarehouseInfo>> listAll(OrgPathQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<WarehouseInfo>> list(WarehouseInfoMapQuery query) {
+		return null;
+	}
 }