yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

完善商品管理

zhanglei
fanzongzhe 1 year ago
parent
eb584cd0b4
commit
918e36482e
11 changed files with 106 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java
  2. 7
      yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java
  3. 7
      yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java
  4. 7
      yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java
  5. 19
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java
  6. 21
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java
  7. 22
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java
  8. 21
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java
  9. 13
      yxt-base-biz/src/main/java/com/yxt/base/utils/OrgPathQuery.java
  10. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java
  11. 1
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java

7
yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java
View File

@ -1,6 +1,7 @@
package com.yxt.base.apiadmin.base;
import com.yxt.base.biz.base.basebrandinfo.*;
import com.yxt.base.utils.OrgPathQuery;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -29,9 +30,9 @@ public class BaseGoodsBrandRest {
return baseBrandInfoService.listPage(pq);
}
@ApiOperation("查询所有的品牌")
@GetMapping("/listAll")
public ResultBean<List<BaseBrandInfo>> listAll() {
return baseBrandInfoService.listAll();
@PostMapping("/listAll")
public ResultBean<List<BaseBrandInfo>> listAll(@RequestBody OrgPathQuery query) {
return baseBrandInfoService.listAll(query);
}
@ApiOperation("保存修改")
@PostMapping("/saveOrUpdate")

7
yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java
View File

@ -1,6 +1,7 @@
package com.yxt.base.apiadmin.base;
import com.yxt.base.biz.base.basegoodstype.*;
import com.yxt.base.utils.OrgPathQuery;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -29,9 +30,9 @@ public class BaseGoodsTypeRest {
return baseGoodsTypeService.listPage(pq);
}
@ApiOperation("查询所有的类别")
@GetMapping("/listAll")
public ResultBean<List<BaseGoodsType>> listAll() {
return baseGoodsTypeService.listAll();
@PostMapping("/listAll")
public ResultBean<List<BaseGoodsType>> listAll(@RequestBody OrgPathQuery query) {
return baseGoodsTypeService.listAll(query);
}
@ApiOperation("保存修改")

7
yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java
View File

@ -1,6 +1,7 @@
package com.yxt.base.apiadmin.base;
import com.yxt.base.biz.base.basegoodsunit.*;
import com.yxt.base.utils.OrgPathQuery;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -29,9 +30,9 @@ public class BaseGoodsUnitRest {
return baseGoodsUnitService.listPage(pq);
}
@ApiOperation("查询所有的类别")
@GetMapping("/listAll")
public ResultBean<List<BaseGoodsUnit>> listAll() {
return baseGoodsUnitService.listAll();
@PostMapping("/listAll")
public ResultBean<List<BaseGoodsUnit>> listAll(@RequestBody OrgPathQuery query) {
return baseGoodsUnitService.listAll(query);
}
@ApiOperation("保存修改")

7
yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java
View File

@ -1,6 +1,7 @@
package com.yxt.base.apiadmin.base;
import com.yxt.base.biz.base.basemanufacturer.*;
import com.yxt.base.utils.OrgPathQuery;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -30,9 +31,9 @@ public class BaseManufacturerRest {
}
@ApiOperation("查询所有的厂家")
@GetMapping("/listAll")
public ResultBean<List<BaseManufacturer>> listAll() {
return baseManufacturerService.listAll();
@PostMapping("/listAll")
public ResultBean<List<BaseManufacturer>> listAll(@RequestBody OrgPathQuery query) {
return baseManufacturerService.listAll(query);
}
@ApiOperation("保存修改")

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

@ -10,6 +10,7 @@ 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.OrgPathQuery;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -19,6 +20,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import java.text.SimpleDateFormat;
import java.util.Arrays;
@ -99,9 +101,22 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
// }
return rb.success().setData(p);
}
public ResultBean<List<BaseBrandInfo>> listAll() {
public ResultBean<List<BaseBrandInfo>> listAll(@RequestBody OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail();
List<BaseBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<BaseBrandInfo>().eq("isEnable",1).ne("isDelete","1"));
String useOrgSid = "";
String orgPath = query.getOrgPath();
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
useOrgSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
useOrgSid = sysOrganization.getSid();
}
}
List<BaseBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<BaseBrandInfo>().eq("isEnable",1).ne("isDelete","1").eq("useOrgSid",useOrgSid));
return rb.success().setData(pagging);
}
public ResultBean<String> saveOrUpdate(BaseBrandInfoDto dto) {

21
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java
View File

@ -11,6 +11,7 @@ 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.OrgPathQuery;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
@ -19,6 +20,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import java.text.SimpleDateFormat;
import java.util.Arrays;
@ -110,10 +112,25 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
}
return rb.success().setData(p);
}
public ResultBean<List<BaseGoodsType>> listAll() {
public ResultBean<List<BaseGoodsType>> listAll(OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail();
String useOrgSid = "";
String orgPath = query.getOrgPath();
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
useOrgSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
useOrgSid = sysOrganization.getSid();
}
}
List<BaseGoodsType> pagging = baseMapper.selectList(new QueryWrapper<BaseGoodsType>().eq("isEnable",1)
.ne("isDelete","1"));
.ne("isDelete","1")
.eq("useOrgSid",useOrgSid)
);
return rb.success().setData(pagging);
}

22
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java
View File

@ -11,6 +11,7 @@ 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.OrgPathQuery;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
@ -19,6 +20,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import java.text.SimpleDateFormat;
import java.util.Arrays;
@ -89,9 +91,25 @@ public class BaseGoodsUnitService extends MybatisBaseService<BaseGoodsUnitMapper
PagerVo<BaseGoodsUnitVo> p = PagerUtil.pageToVo(pagging, null);
List<BaseGoodsUnitVo> records = pagging.getRecords();
return rb.success().setData(p);
} public ResultBean<List<BaseGoodsUnit>> listAll() {
} public ResultBean<List<BaseGoodsUnit>> listAll(OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail();
List<BaseGoodsUnit> pagging = baseMapper.selectList(new QueryWrapper<BaseGoodsUnit>().eq("isEnable",1));
String useOrgSid = "";
String orgPath = query.getOrgPath();
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
useOrgSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
useOrgSid = sysOrganization.getSid();
}
}
List<BaseGoodsUnit> pagging = baseMapper.selectList(new QueryWrapper<BaseGoodsUnit>().eq("isEnable",1)
.ne("isDelete","1")
.eq("useOrgSid",useOrgSid)
);
return rb.success().setData(pagging);
}

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

@ -11,6 +11,7 @@ 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.OrgPathQuery;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
@ -19,6 +20,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import java.text.SimpleDateFormat;
import java.util.Arrays;
@ -91,10 +93,25 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
List<BaseManufacturerVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public ResultBean<List<BaseManufacturer>> listAll() {
public ResultBean<List<BaseManufacturer>> listAll(OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail();
String useOrgSid = "";
String orgPath = query.getOrgPath();
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
useOrgSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
useOrgSid = sysOrganization.getSid();
}
}
List<BaseManufacturer> pagging = baseMapper.selectList(new QueryWrapper<BaseManufacturer>().eq("isEnable",1)
.ne("isDelete","1"));
.ne("isDelete","1")
.eq("useOrgSid",useOrgSid)
);
return rb.success().setData(pagging);
}

13
yxt-base-biz/src/main/java/com/yxt/base/utils/OrgPathQuery.java
View File

@ -0,0 +1,13 @@
package com.yxt.base.utils;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/5/17 14:15
*/
@Data
public class OrgPathQuery {
private String orgPath;
}

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java
View File

@ -19,7 +19,7 @@ public interface WmsWarehouseAreaMapper extends BaseMapper<WmsWarehouseArea> {
IPage<WmsWarehouseAreaVo> listPage(IPage<WmsWarehouseArea> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseArea> qw);
WmsWarehouseAreaVo initialization (@Param("sid") String sid);
int updateBySidIsDelete(List<String> list);
@Select("select * from wms_warehouse_area where warehouseSid = #{ckSid}")
@Select("select * from wms_warehouse_area where warehouseSid = #{ckSid} and isDelete = 0 and isEnable = 1")
List<WmsWarehouseAreaAllVo> selectAll(String ckSid);
WmsWarehouseArea checkForInsert(@Param("areaCode")String areaCode, @Param("warehouseSid")String warehouseSid);

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

@ -140,6 +140,7 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
wmsWarehouseArea.setCreateTime(new DateTime());
wmsWarehouseArea.setCreateBySid(dto.getUserSid());
wmsWarehouseArea.setIsEnable(1);
baseMapper.insert(wmsWarehouseArea);
}
return rb.success().setMsg("成功");

Write Preview
Loading…
Cancel
Save