base

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

@@ -70,7 +70,7 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
             wmsGoodsBrand.setModifyTime(new Date());
             baseMapper.updateById(wmsGoodsBrand);
         } else {
-            BaseBrandInfo goods=baseMapper.selectOne(new QueryWrapper<BaseBrandInfo>().eq("name",dto.getBrandName()));
+            BaseBrandInfo goods=baseMapper.selectOne(new QueryWrapper<BaseBrandInfo>().eq("brandName",dto.getBrandName()));
             if(null!=goods){
                 return rb.setMsg("商品名不能重复");
             }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtendService.java

@@ -72,20 +72,17 @@ public class BaseGoodsSkuExtendService extends MybatisBaseService<BaseGoodsSkuEx
             BaseGoodsSkuExtend wmsGoods = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, wmsGoods);
             wmsGoods.setModifyTime(new Date());
+            wmsGoods.setPicUrl("");
             for (UrlsVo url : dto.getUrls()) {
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 String path = url.getUrl().substring(urlPrefix.length());
-                if(StringUtils.isBlank(dto.getPicUrl())){
+                if(StringUtils.isBlank(wmsGoods.getPicUrl())){
                     wmsGoods.setPicUrl(path);
                 }else{
                     wmsGoods.setPicUrl(wmsGoods.getPicUrl()+","+path);
                 }
             }
-            if (StringUtils.isNotBlank(dto.getPicUrl())) {
-                String urlPrefix = fileUploadComponent.getUrlPrefix();
-                String path = dto.getPicUrl().substring(urlPrefix.length());
-                wmsGoods.setPicUrl(path);
-            }
+
             baseMapper.updateById(wmsGoods);
 
         } else {
@@ -96,7 +93,7 @@ public class BaseGoodsSkuExtendService extends MybatisBaseService<BaseGoodsSkuEx
             for (UrlsVo url : dto.getUrls()) {
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 String path = url.getUrl().substring(urlPrefix.length());
-                if(StringUtils.isBlank(dto.getPicUrl())){
+                if(StringUtils.isBlank(wmsGoods.getPicUrl())){
                     wmsGoods.setPicUrl(path);
                 }else{
                     wmsGoods.setPicUrl(wmsGoods.getPicUrl()+","+path);

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

@@ -46,6 +46,9 @@ public class BaseGoodsSpuVo implements Vo {
     private String isListed;//是否上架
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
+    private String typeName;//类型
+    private String brandName;//品牌
+    private String manufacturerName;//厂家
     private BaseGoodsSpuDetailVo baseGoodsSpuDetail;
     private List<BaseGoodsSkuVo> baseGoodsSkus;
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java

@@ -29,7 +29,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         BaseManufacturerQuery query = pq.getParams();
         QueryWrapper<BaseManufacturer> qw = new QueryWrapper<>();
         if(StringUtils.isNotBlank(query.getName())){
-            qw.like("goodsTypeName",query.getName());
+            qw.like("manufacturerName",query.getName());
         }
 
         IPage<BaseManufacturer> page = PagerUtil.queryToPage(pq);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtend.java

@@ -10,22 +10,11 @@ import lombok.Data;
 @Data
 public class WmsWarehouseExtend extends BaseEntity {
 
-    private String warehouseName;//仓库名称
-    private String warehouseCode;//仓库编码
-    private String contacts;//联系人
-    private String mob;//手机
-    private String telephone;//联系电话
-    private String manager;//主管
-    private String areaSid;//地区sid
-    private String address;//地址
-    private String longitude;//经度
-    private String latitude;//纬度
-    private String warehouseTypeKey;//仓库类型Key
-    private String warehouseTypeValue;//仓库类型value
-    private String usageStatus;//使用状态,0停用 1正常
-    private String squareMeter;//平方米
-    private String sortNo;//创建组织sid
-    private String useOrgSid;//创建组织sid
-    private String createOrgSid;//创建组织sid
+    private String warehouseSid;//仓库sid
+    private String markupRate1;//加价率1
+    private String markupRate2;//加价率2
+    private String markupRate3;//加价率3
+    private String markupRate4;//加价率4
+    private String markupRate5;//加价率5
 
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendVo.java

@@ -23,21 +23,11 @@ public class WmsWarehouseExtendVo implements Vo {
     private String isEnable;
     private String state;
     private String isDelete;
+    private String warehouseSid;//仓库sid
     private String warehouseName;//仓库名称
-    private String warehouseCode;//仓库编码
-    private String contacts;//联系人
-    private String mob;//手机
-    private String telephone;//联系电话
-    private String manager;//主管
-    private String areaSid;//地区sid
-    private String address;//地址
-    private String longitude;//经度
-    private String latitude;//纬度
-    private String warehouseTypeKey;//仓库类型Key
-    private String warehouseTypeValue;//仓库类型value
-    private String usageStatus;//使用状态,0停用 1正常
-    private String squareMeter;//平方米
-    private String sortNo;//创建组织sid
-    private String useOrgSid;//创建组织sid
-    private String createOrgSid;//创建组织sid
+    private String markupRate1;//加价率1
+    private String markupRate2;//加价率2
+    private String markupRate3;//加价率3
+    private String markupRate4;//加价率4
+    private String markupRate5;//加价率5
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java

@@ -64,8 +64,10 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
 //            for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
 //                wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
 //            }
-            dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
-            wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
+            if(dto.getWmsWarehouseExtendDto()!=null){
+                dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
+                wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
+            }
         } else {
             WmsWarehouseInfo wmsWarehouse = new WmsWarehouseInfo();
             sid = wmsWarehouse.getSid();
@@ -75,8 +77,11 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
 //            for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
 //                wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
 //            }
-            dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
-            wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
+            if(dto.getWmsWarehouseExtendDto()!=null){
+                dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
+                wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
+            }
+
         }
 
         return rb.success().setMsg("成功");