diff --git a/src/main/java/com/yxt/goods/apiadmin/GoodsBrandRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsBrandRest.java index ec39bc1..2297fc1 100644 --- a/src/main/java/com/yxt/goods/apiadmin/GoodsBrandRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsBrandRest.java @@ -5,6 +5,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.goods.biz.goodsbrandinfo.*; +import com.yxt.goods.utils.OrgPathQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -30,9 +31,9 @@ public class GoodsBrandRest { return baseBrandInfoService.listPage(pq); } @ApiOperation("查询所有的品牌") - @GetMapping("/listAll") - public ResultBean> listAll() { - return baseBrandInfoService.listAll(); + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return baseBrandInfoService.listAll(query); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") @@ -52,6 +53,13 @@ public class GoodsBrandRest { return baseBrandInfoService.delete(sid); } + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + baseBrandInfoService.delAll(sids); + return rb.success(); + } @ApiOperation("更改可用状态") @GetMapping("/updateIsEnable/{sid}/{isEnable}") diff --git a/src/main/java/com/yxt/goods/apiadmin/GoodsManufacturerRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsManufacturerRest.java index 1053274..84173ac 100644 --- a/src/main/java/com/yxt/goods/apiadmin/GoodsManufacturerRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsManufacturerRest.java @@ -5,6 +5,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.goods.biz.goodsmanufacturer.*; +import com.yxt.goods.utils.OrgPathQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -31,9 +32,9 @@ public class GoodsManufacturerRest { } @ApiOperation("查询所有的厂家") - @GetMapping("/listAll") - public ResultBean> listAll() { - return baseManufacturerService.listAll(); + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return baseManufacturerService.listAll(query); } @ApiOperation("保存修改") @@ -54,6 +55,13 @@ public class GoodsManufacturerRest { return baseManufacturerService.delete(sid); } + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + baseManufacturerService.delAll(sids); + return rb.success(); + } @ApiOperation("更改可用状态") @GetMapping("/updateIsEnable/{sid}/{isEnable}") diff --git a/src/main/java/com/yxt/goods/apiadmin/GoodsTypeRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsTypeRest.java index 9dce892..a911fe9 100644 --- a/src/main/java/com/yxt/goods/apiadmin/GoodsTypeRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsTypeRest.java @@ -5,6 +5,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.goods.biz.goodstype.*; +import com.yxt.goods.utils.OrgPathQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -30,9 +31,9 @@ public class GoodsTypeRest { return goodsTypeService.listPage(pq); } @ApiOperation("查询所有的类别") - @GetMapping("/listAll") - public ResultBean> listAll() { - return goodsTypeService.listAll(); + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return goodsTypeService.listAll(query); } @ApiOperation("保存修改") @@ -53,6 +54,13 @@ public class GoodsTypeRest { return goodsTypeService.delete(sid); } + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + goodsTypeService.delAll(sids); + return rb.success(); + } @ApiOperation("更改可用状态") @GetMapping("/updateIsEnable/{sid}/{isEnable}") @@ -64,4 +72,9 @@ public class GoodsTypeRest { public ResultBean getTypeByName(@PathVariable("name") String name) { return goodsTypeService.getTypeByName(name); } + @ApiOperation("更改商品是否一品一码") + @GetMapping("/updateIsGoodsID/{sid}/{state}") + public ResultBean updateIsGoodsID(@PathVariable("sid") String sid,@PathVariable("state")String state) { + return goodsTypeService.updateProductCode(sid,state); + } } diff --git a/src/main/java/com/yxt/goods/apiadmin/GoodsUnitRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsUnitRest.java index 80ab434..bff9bf6 100644 --- a/src/main/java/com/yxt/goods/apiadmin/GoodsUnitRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsUnitRest.java @@ -5,6 +5,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.goods.biz.goodsunit.*; +import com.yxt.goods.utils.OrgPathQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -30,9 +31,9 @@ public class GoodsUnitRest { return goodsUnitService.listPage(pq); } @ApiOperation("查询所有的类别") - @GetMapping("/listAll") - public ResultBean> listAll() { - return goodsUnitService.listAll(); + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return goodsUnitService.listAll(query); } @ApiOperation("保存修改") @@ -53,6 +54,14 @@ public class GoodsUnitRest { return goodsUnitService.delete(sid); } + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + goodsUnitService.delAll(sids); + return rb.success(); + } + @ApiOperation("更改可用状态") @GetMapping("/updateIsEnable/{sid}/{isEnable}") diff --git a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.java b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.java index 9d7b318..0831e4d 100644 --- a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.java +++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.java @@ -7,12 +7,14 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author wangpengfei * @date 2024/2/26 13:40 */ @Mapper public interface GoodsBrandInfoMapper extends BaseMapper { - + int updateBySidIsDelete(List list); IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml index c1152fa..e3f4fae 100644 --- a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml @@ -12,4 +12,12 @@ ${ew.sqlSegment} + + UPDATE goods_brand_info + SET isDelete=1 + where sid in + + #{item} + + \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoQuery.java b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoQuery.java index 3ca0652..e861257 100644 --- a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoQuery.java @@ -10,4 +10,6 @@ import lombok.Data; @Data public class GoodsBrandInfoQuery implements Query { private String name; + private String userOrgSid; + private String createOrgSid;//创建组织sid } diff --git a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java index 4f1dde0..ed2cef8 100644 --- a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java +++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java @@ -11,13 +11,17 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.goods.utils.OrgPathQuery; 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; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @author wangpengfei @@ -36,6 +40,10 @@ public class GoodsBrandInfoService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -50,9 +58,12 @@ public class GoodsBrandInfoService extends MybatisBaseService> listAll() { + public ResultBean> listAll( OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); + +// List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1).ne("isDelete","1") +// .eq("userOrgSid",query.getUserOrgSid())); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1).ne("isDelete","1")); return rb.success().setData(pagging); } public ResultBean saveOrUpdate(GoodsBrandInfoDto dto) { @@ -114,6 +125,9 @@ public class GoodsBrandInfoService extends MybatisBaseService { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List getAllTypeByUseOrgSid(@Param("useOrgSid") String useOrgSid); + int updateBySidIsDelete(List list); } diff --git a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml index 6d1bd93..8cd978f 100644 --- a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml @@ -17,4 +17,12 @@ from goods_manufacturer where useOrgSid = #{useOrgSid} + + UPDATE goods_manufacturer + SET isDelete=1 + where sid in + + #{item} + + \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerQuery.java b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerQuery.java index 561deb1..ee3bb4f 100644 --- a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerQuery.java @@ -10,4 +10,6 @@ import lombok.Data; @Data public class GoodsManufacturerQuery implements Query { private String name; + private String userOrgSid; + private String createOrgSid;//创建组织sid } diff --git a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java index 27cfe24..7988915 100644 --- a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java +++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java @@ -10,11 +10,15 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.goods.utils.OrgPathQuery; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestBody; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @author wangpengfei @@ -31,16 +35,20 @@ public class GoodsManufacturerService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); List records = pagging.getRecords(); return rb.success().setData(p); } - public ResultBean> listAll() { + public ResultBean> listAll(OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); +// List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1).ne("isDelete","1") +// .eq("userOrgSid",query.getUserOrgSid())); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1).ne("isDelete","1") + ); return rb.success().setData(pagging); } @@ -93,6 +101,11 @@ public class GoodsManufacturerService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendQuery.java b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendQuery.java index d7f2697..6a41ed3 100644 --- a/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendQuery.java @@ -10,4 +10,6 @@ import lombok.Data; @Data public class GoodsSkuExtendQuery implements Query { private String name; + private String userOrgSid; + private String createOrgSid;//创建组织sid } diff --git a/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendService.java b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendService.java index d3576c5..c240db8 100644 --- a/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendService.java +++ b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendService.java @@ -49,6 +49,9 @@ public class GoodsSkuExtendService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -68,16 +71,40 @@ public class GoodsSkuExtendService extends MybatisBaseService().eq("sid",dto.getSid())); + if(StringUtils.isBlank(dto.getCostPrice())){ + dto.setCostPrice("0"); + } + if(StringUtils.isBlank(dto.getTagPrice())){ + dto.setTagPrice("0"); + } + if(StringUtils.isBlank(dto.getSalesPrice())){ + dto.setSalesPrice("0"); + } + if(StringUtils.isBlank(dto.getAgencyPrice())){ + dto.setAgencyPrice("0"); + } + if(StringUtils.isBlank(dto.getStandardPurchasePrice())){ + dto.setStandardPurchasePrice("0"); + } + if(StringUtils.isBlank(dto.getMinimumSalesPrice())){ + dto.setMinimumSalesPrice("0"); + } + if(StringUtils.isBlank(dto.getIsLockingSalesPrice())){ + dto.setIsLockingSalesPrice("0"); + } + if(StringUtils.isBlank(dto.getSortNo())){ + dto.setSortNo("1"); + } if (null!=extend) { sid = dto.getSid(); GoodsSkuExtend wmsGoods = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsGoods); wmsGoods.setModifyTime(new Date()); + wmsGoods.setPicUrl(""); for (UrlsVo url : dto.getUrls()) { - wmsGoods.setPicUrl(""); 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); @@ -94,7 +121,7 @@ public class GoodsSkuExtendService extends MybatisBaseService ${ew.sqlSegment} @@ -21,7 +21,7 @@ from goods_spu s left join goods_type a on a.sid=s.goodsTypeSid left join goods_brand_info b on b.sid=s.brandSid - left join base_manufacturer c on c.sid=s.manufacturerSid + left join goods_manufacturer c on c.sid=s.manufacturerSid where s.sid=#{sid} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java index ae86e1d..43c3541 100644 --- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java @@ -10,4 +10,6 @@ import lombok.Data; @Data public class GoodsSpuQuery implements Query { private String name; + private String userOrgSid; + private String createOrgSid;//创建组织sid } diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java index d0d62c0..aa257db 100644 --- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java +++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java @@ -76,6 +76,9 @@ public class GoodsSpuService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -100,7 +103,9 @@ public class GoodsSpuService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -67,7 +71,9 @@ public class BaseGoodsSpuDetailService extends MybatisBaseService { + + int updateBySidIsDelete(List list); IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml index 616a606..63eac8d 100644 --- a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml @@ -12,4 +12,12 @@ ${ew.sqlSegment} + + UPDATE goods_type + SET isDelete=1 + where sid in + + #{item} + + \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeQuery.java b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeQuery.java index e24cb38..d953e9c 100644 --- a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeQuery.java @@ -9,5 +9,11 @@ import lombok.Data; */ @Data public class GoodsTypeQuery implements Query { - private String name; + private String name;//名字 + private String code;//编码 + private String IsGoodID;//是否一品一码（goodID），0否，1是 + private String outStockRule;//出库规则（先进先出0、先进后出1、保质期优先2） + private String userOrgSid; + private String createOrgSid;//创建组织sid + } diff --git a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java index 5477ea3..bf57a16 100644 --- a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java +++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java @@ -10,11 +10,14 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.goods.utils.OrgPathQuery; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @author wangpengfei @@ -31,7 +34,20 @@ public class GoodsTypeService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -39,14 +55,20 @@ public class GoodsTypeService extends MybatisBaseService> listAll() { + } + public ResultBean> listAll(OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); +// List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1).ne("isDelete","1") +// .eq("userOrgSid",query.getUserOrgSid())); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1).ne("isDelete","1") + ); return rb.success().setData(pagging); } @@ -73,6 +95,9 @@ public class GoodsTypeService extends MybatisBaseService().eq("goodsTypeName",name)); return rb.success().setData(type); } - + public ResultBean updateProductCode(String sid,String state) { + ResultBean rb = ResultBean.fireFail(); + GoodsType wmsGoodsType = fetchBySid(sid); + if (null != wmsGoodsType) { + wmsGoodsType.setIsGoodsID(state); + baseMapper.updateById(wmsGoodsType); + } + return rb.success().setMsg("成功"); + } } diff --git a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java index b8623b6..4f60bbe 100644 --- a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java +++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java @@ -35,4 +35,5 @@ public class GoodsTypeVo implements Vo { private String useOrgSid;//使用组织sid private String createOrgSid;//创建组织sid private String sids;//创建组织sid + private String outStockRule;//出库规则 } diff --git a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.java index 149fc25..4efd78f 100644 --- a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.java +++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author wangpengfei * @date 2024/2/26 13:40 @@ -14,4 +16,5 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface GoodsUnitMapper extends BaseMapper { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + int updateBySidIsDelete(List list); } diff --git a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml index e842864..9a88e82 100644 --- a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml @@ -12,4 +12,12 @@ ${ew.sqlSegment} + + UPDATE goods_unit + SET isDelete=1 + where sid in + + #{item} + + \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitQuery.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitQuery.java index 3390bb1..f82b18e 100644 --- a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitQuery.java @@ -10,4 +10,6 @@ import lombok.Data; @Data public class GoodsUnitQuery implements Query { private String name; + private String userOrgSid; + private String createOrgSid;//创建组织sid } diff --git a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java index 44b28f4..84f01b4 100644 --- a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java +++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java @@ -10,11 +10,15 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.goods.utils.OrgPathQuery; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestBody; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @author wangpengfei @@ -37,9 +41,12 @@ public class GoodsUnitService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); List records = pagging.getRecords(); return rb.success().setData(p); - } public ResultBean> listAll() { + } public ResultBean> listAll( OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); +// List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1).ne("isDelete","1") +// .eq("userOrgSid",query.getUserOrgSid())); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1).ne("isDelete","1") + ); return rb.success().setData(pagging); } @@ -95,6 +102,11 @@ public class GoodsUnitService extends MybatisBaseService - * File: SysOrganizationFeign.java
- * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign
- * Description: 组织机构表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-08-03 00:24:28
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Api(tags = "组织机构表") -@FeignClient( - contextId = "anrui-portal-SysOrganization", - name = "anrui-portal", - path = "v1/sysorganization") -public interface SysOrganizationFeign { - - @ApiOperation("获取一条记录 根据sid") - @ResponseBody - @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid); -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/feign/portal/sysorganization/SysOrganizationVo.java b/src/main/java/com/yxt/goods/feign/portal/sysorganization/SysOrganizationVo.java deleted file mode 100644 index d066ab6..0000000 --- a/src/main/java/com/yxt/goods/feign/portal/sysorganization/SysOrganizationVo.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.yxt.goods.feign.portal.sysorganization; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -/** - * Project: anrui_portal(门户建设)
- * File: SysOrganizationVo.java
- * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo
- * Description: 组织机构表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-08-03 00:24:28
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@ApiModel(value = "组织机构表 视图数据对象", description = "组织机构表 视图数据对象") -@Data -public class SysOrganizationVo implements Vo { - @ApiModelProperty("部门/组织名称") - private String name; - - @ApiModelProperty("父(部门/组织) sid") - private String psid; - - @ApiModelProperty("联系电话") - private String linkPhone; - - @ApiModelProperty("联系人") - private String linkPerson; - - @ApiModelProperty("部门sid全路径") - private String orgSidPath; - - @ApiModelProperty("排序") - private Integer sort; - - @ApiModelProperty("地址") - private String addrs; - - @ApiModelProperty("地理位置经纬度") - private String jwd; - - @ApiModelProperty("二维码") - private String qrText; - - @ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己") - private Integer limitOrgMember; - - @ApiModelProperty("部门编码") - private String orgCode; - @ApiModelProperty("sid") - private String sid; - @ApiModelProperty("子集") - private List children = new ArrayList<>(); - @ApiModelProperty("主管人员名称") - private String zgNames; - @ApiModelProperty("分管人员名称") - private String fgNames; - @ApiModelProperty("主管人员sid") - private String zgStaffSid; - @ApiModelProperty("分管人员sid") - private String fgStaffSid; - @ApiModelProperty("组织简称") - private String orgAbbre; - @ApiModelProperty("是否是部门(0否，1是)") - private Integer isDept; - @ApiModelProperty("组织属性key") - private String orgAttributeKey; - @ApiModelProperty("组织属性value") - private String orgAttributeValue; - @ApiModelProperty("管理层级key") - private String orgLevelKey; - @ApiModelProperty("管理层级value") - private String orgLevelValue; - @ApiModelProperty("其他编码") - private String otherCode; - @ApiModelProperty("主管用户sid") - private String managerSid; -} diff --git a/src/main/java/com/yxt/goods/feign/portal/sysstafforg/SysStaffOrgFeign.java b/src/main/java/com/yxt/goods/feign/portal/sysstafforg/SysStaffOrgFeign.java deleted file mode 100644 index 4926334..0000000 --- a/src/main/java/com/yxt/goods/feign/portal/sysstafforg/SysStaffOrgFeign.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.yxt.goods.feign.portal.sysstafforg; - -import com.yxt.common.core.result.ResultBean; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * @description: 人员与机构 - * @author: dimengzhe - * @date: 2024/3/6 - **/ -@FeignClient( - contextId = "anrui-portal-SysStaffOrg", - name = "anrui-portal", - path = "v1/sysstafforg") -public interface SysStaffOrgFeign { - - @GetMapping("/getOrgSidByPath") - @ResponseBody - @ApiOperation("根据用户组织全路径获取用户的分公司sid") - ResultBean getOrgSidByPath(@RequestParam("orgPath") String orgPath); -} diff --git a/src/main/java/com/yxt/goods/utils/OrgPathQuery.java b/src/main/java/com/yxt/goods/utils/OrgPathQuery.java new file mode 100644 index 0000000..2038eee --- /dev/null +++ b/src/main/java/com/yxt/goods/utils/OrgPathQuery.java @@ -0,0 +1,14 @@ +package com.yxt.goods.utils; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/5/17 14:15 + */ +@Data +public class OrgPathQuery { + private String orgPath; + private String userOrgSid; +} diff --git a/src/main/java/com/yxt/goods/utils/PinYinUtils.java b/src/main/java/com/yxt/goods/utils/PinYinUtils.java index 76f8f92..8413929 100644 --- a/src/main/java/com/yxt/goods/utils/PinYinUtils.java +++ b/src/main/java/com/yxt/goods/utils/PinYinUtils.java @@ -29,7 +29,22 @@ public class PinYinUtils { //用v表示ü format.setVCharType(HanyuPinyinVCharType.WITH_V); } - + /** + * 缩写 + * @param args + */ + public static String sx(String hz) { + char [] nameArray = hz.toCharArray(); + String b=""; + for (int i = 0; i < nameArray.length; i++) { + if (Character.toString(nameArray[i]).matches("^[\u4e00-\u9fa5]+$")) { + b=b+PinYinUtils.getCharDuoPinYinChar(String.valueOf(nameArray[i])); + }else{ + b=b+String.valueOf(nameArray[i]); + } + } + return b; + } // 多音字 private static final Map DYZMAP = setDYZMap();