diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.java index 938e6c8e5d..20f1d29370 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.java @@ -22,4 +22,6 @@ public interface BaseBrandInfoMapper extends BaseMapper { BaseBrandInfo checkForInsert(@Param("brandCode") String brandCode, @Param("deptSid") String deptSid); BaseBrandInfo checkForUpdate(@Param("brandCode") String brandCode, @Param("useOrgSid")String useOrgSid, @Param("sid") String sid); + + List selListAll(@Param(Constants.WRAPPER)QueryWrapper qw); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml index ca1e7ee623..e3bba45537 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml @@ -29,6 +29,16 @@ and isDelete = 0 and sid !=#{sid} + UPDATE base_brand_info SET isDelete=1 diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java index c57ef30f03..419bac1e0d 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java @@ -23,10 +23,7 @@ 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.*; import java.util.stream.Collectors; /** @@ -103,20 +100,58 @@ public class BaseBrandInfoService extends MybatisBaseService> listAll(@RequestBody OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); - String useOrgSid = ""; - String orgPath = query.getOrgPath(); - if (StringUtils.isNotBlank(orgPath)) { - List split = Arrays.asList(orgPath.split("/")); - if (split.size() > 1) { - //获取本级sid获取本级部门信息 - SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); - useOrgSid = sysOrganization1.getSid(); + QueryWrapper qw = new QueryWrapper<>(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean 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("b.createBySid", query.getUserSid()); } else { - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); - useOrgSid = sysOrganization.getSid(); + return rb.success().setData(new ArrayList<>()); } + } else { + return rb.success().setData(new ArrayList<>()); } - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1).ne("isDelete","1").eq("useOrgSid",useOrgSid)); + qw.eq("b.isEnable",1); + qw.ne("b.isDelete",1); + List pagging = baseMapper.selListAll(qw); +// String useOrgSid = ""; +// String orgPath = query.getOrgPath(); +// if (StringUtils.isNotBlank(orgPath)) { +// List 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 pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1).ne("isDelete","1").eq("useOrgSid",useOrgSid)); return rb.success().setData(pagging); } public ResultBean saveOrUpdate(BaseBrandInfoDto dto) { diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java index 46fd330ac3..ccf3deb0a1 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java @@ -69,6 +69,7 @@ public class BaseGoodsSpuService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); BaseGoodsSpuQuery query = pq.getParams(); @@ -292,7 +293,7 @@ public class BaseGoodsSpuService extends MybatisBaseService picPath = dto.getPicPath(); if (!picPath.isEmpty()) { StringBuilder sb = new StringBuilder(); @@ -425,7 +442,7 @@ public class BaseGoodsSpuService extends MybatisBaseService picPath = dto.getPicPath(); if (!picPath.isEmpty()) { StringBuilder sb = new StringBuilder(); diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java index 669f103109..3c056e8bec 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java @@ -21,4 +21,6 @@ public interface BaseGoodsTypeMapper extends BaseMapper { BaseGoodsType checkForInsert(@Param("goodsTypeCode") String goodsTypeCode, @Param("deptSid") String deptSid); BaseGoodsType checkForUpdate(@Param("goodsTypeCode")String goodsTypeCode,@Param("deptSid") String useOrgSid, @Param("sid")String sid); + + List selListAll(@Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml index be268786f8..637f5712da 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml @@ -28,6 +28,15 @@ and isDelete = 0 and sid != #{sid} + UPDATE base_goods_type SET isDelete=1 diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java index 0dad44983c..19aaef96f5 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java @@ -23,6 +23,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -41,6 +42,7 @@ public class BaseGoodsTypeService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); BaseGoodsTypeQuery query = pq.getParams(); @@ -83,28 +85,28 @@ public class BaseGoodsTypeService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); List records = pagging.getRecords(); for (BaseGoodsTypeVo record : records) { - if(StringUtils.isNotBlank(record.getPSid())){ + if (StringUtils.isNotBlank(record.getPSid())) { BaseGoodsType wmsGoodsType1 = fetchBySid(record.getPSid()); - if(wmsGoodsType1!=null){ + if (wmsGoodsType1 != null) { record.setPName(wmsGoodsType1.getGoodsTypeName()); } record.setSids(record.getPSid()); @@ -112,25 +114,66 @@ public class BaseGoodsTypeService extends MybatisBaseService> listAll(OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); - String useOrgSid = ""; - String orgPath = query.getOrgPath(); - if (StringUtils.isNotBlank(orgPath)) { - List split = Arrays.asList(orgPath.split("/")); - if (split.size() > 1) { - //获取本级sid获取本级部门信息 - SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); - useOrgSid = sysOrganization1.getSid(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean 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 { + return rb.success().setData(new ArrayList<>()); + } } else { - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); - useOrgSid = sysOrganization.getSid(); + return rb.success().setData(new ArrayList<>()); } } - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) - .ne("isDelete","1") - .eq("useOrgSid",useOrgSid) - ); + qw.eq("p.isEnable", 1); + qw.ne("p.isDelete", 1); + List pagging = baseMapper.selListAll(qw); +// String useOrgSid = ""; +// String orgPath = query.getOrgPath(); +// if (StringUtils.isNotBlank(orgPath)) { +// List 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 pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) +// .ne("isDelete","1") +// .eq("useOrgSid",useOrgSid) +// ); return rb.success().setData(pagging); } @@ -145,11 +188,11 @@ public class BaseGoodsTypeService extends MybatisBaseService { BaseManufacturer checkForInsert(@Param("manufacturerCode")String manufacturerCode,@Param("deptSid") String deptSid); BaseManufacturer checkForUpdate(@Param("manufacturerCode")String manufacturerCode,@Param("useOrgSid") String useOrgSid, @Param("sid")String sid); + + List selListAll(@Param(Constants.WRAPPER)QueryWrapper qw); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml index 594376125e..442581b68d 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml @@ -33,6 +33,15 @@ and isDelete = 0 and sid != #{sid} + UPDATE base_manufacturer SET isDelete=1 diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java index dea379a273..8533244534 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java @@ -23,6 +23,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -95,23 +96,61 @@ public class BaseManufacturerService extends MybatisBaseService> listAll(OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); - String useOrgSid = ""; - String orgPath = query.getOrgPath(); - if (StringUtils.isNotBlank(orgPath)) { - List split = Arrays.asList(orgPath.split("/")); - if (split.size() > 1) { - //获取本级sid获取本级部门信息 - SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); - useOrgSid = sysOrganization1.getSid(); + QueryWrapper qw = new QueryWrapper<>(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean 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 { - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); - useOrgSid = sysOrganization.getSid(); + return rb.success().setData(new ArrayList<>()); } + } else { + return rb.success().setData(new ArrayList<>()); } - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) - .ne("isDelete","1") - .eq("useOrgSid",useOrgSid) - ); + qw.eq("p.isEnable",1); + qw.ne("p.isDelete",1); + List pagging = baseMapper.selListAll(qw); +// String useOrgSid = ""; +// String orgPath = query.getOrgPath(); +// if (StringUtils.isNotBlank(orgPath)) { +// List 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 pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) +// .ne("isDelete","1") +// .eq("useOrgSid",useOrgSid) +// ); return rb.success().setData(pagging); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/utils/OrgPathQuery.java b/yxt-base-biz/src/main/java/com/yxt/base/utils/OrgPathQuery.java index f1da844d4d..396ca20249 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/utils/OrgPathQuery.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/utils/OrgPathQuery.java @@ -1,5 +1,6 @@ package com.yxt.base.utils; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -9,5 +10,10 @@ import lombok.Data; */ @Data public class OrgPathQuery { + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/ShelfDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/ShelfDetailsVo.java index 668c886bd4..d57e29edc8 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/ShelfDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/ShelfDetailsVo.java @@ -1,6 +1,7 @@ package com.yxt.wms.biz.inventory.wmsshelfbill; import com.yxt.wms.biz.inventory.wmsshelfbilldetail.ShelfDetailsListVo; +import com.yxt.wms.biz.inventory.wmsshelfbilldetail.ShelfInitListVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -29,9 +30,14 @@ public class ShelfDetailsVo { @ApiModelProperty("来源单sid") private String sourceBillSid; @ApiModelProperty("单据状态：0新建，1已完成") - private Integer billState; - + private String billState; + private String userSid; private String remarks; - - private List list = new ArrayList<>(); + private String createOrgSid; + private String useOrgSid; + private String deptSid; + private String deptName; + private String upShelfSid; + private String upShelfName; + private List list = new ArrayList<>(); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/ShelfInitVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/ShelfInitVo.java index 89cdf591ac..d4cefe742b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/ShelfInitVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/ShelfInitVo.java @@ -30,9 +30,14 @@ public class ShelfInitVo { @ApiModelProperty("来源单sid") private String sourceBillSid; @ApiModelProperty("单据状态：0新建，1已完成") - private Integer billState; - + private String billState; + private String userSid; private String remarks; - + private String createOrgSid; + private String useOrgSid; + private String deptSid; + private String deptName; + private String upShelfSid; + private String upShelfName; private List list = new ArrayList<>(); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBill.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBill.java index efb0a36d64..25915b95fe 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBill.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBill.java @@ -23,6 +23,10 @@ public class WmsShelfBill extends BaseEntity { private Integer billState; private String createOrgSid; - private String useOrgSid; + private String deptSid; + private String deptName; + private String upShelfSid; + private String upShelfName; + } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillDto.java index 828bfdd85d..6314757288 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillDto.java @@ -28,9 +28,14 @@ public class WmsShelfBillDto { @ApiModelProperty("来源单sid") private String sourceBillSid; @ApiModelProperty("单据状态：0新建，1已完成") - private Integer billState; - + private String billState; + private String userSid; private String remarks; - + private String createOrgSid; + private String useOrgSid; + private String deptSid; + private String deptName; + private String upShelfSid; + private String upShelfName; private List list = new ArrayList<>(); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java index 80f44945c1..60a7d5dc61 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java @@ -19,4 +19,6 @@ public interface WmsShelfBillMapper extends BaseMapper { ShelfDetailsVo details(String sid); String selectNum(String goodsId); + + String selectCodeNum(String bill); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml index befbf2b659..f30e64fd6a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml @@ -3,14 +3,15 @@ + - \ No newline at end of file + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillQuery.java index bbf89110b7..212fa47419 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillQuery.java @@ -14,10 +14,20 @@ public class WmsShelfBillQuery implements Query { @ApiModelProperty("单据编号") private String billNo; + @ApiModelProperty("来源单据编号") + private String sourceBillNo; @ApiModelProperty("单据日期开始时间") private String createTimeStart; @ApiModelProperty("单据日期结束时间") private String createTimeEnd; @ApiModelProperty("单据状态") private String billState; + + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java index 2f6c906970..65dce4882c 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java @@ -10,6 +10,7 @@ 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.wms.biz.inventory.wmsansbill.WmsAnsBillVo; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventorySaveDto; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordDto; @@ -24,6 +25,13 @@ import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailB import com.yxt.wms.biz.inventory.wmsshelfbilldetail.*; import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo; import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign; +import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.wms.feign.portal.sysuser.SysUserFeign; +import com.yxt.wms.feign.portal.sysuser.SysUserVo; +import com.yxt.wms.utils.BillNo; import com.yxt.wms.utils.Rule; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -61,14 +69,58 @@ public class WmsShelfBillService extends MybatisBaseService listPage(PagerQuery pq) { WmsShelfBillQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean 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("wsb.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } //ToDo:添加查询条件 if (StringUtils.isNotBlank(query.getBillNo())) { qw.like("wsb.billNo", query.getBillNo()); } + if (StringUtils.isNotBlank(query.getSourceBillNo())) { + qw.like("wsb.sourceBillNo", query.getSourceBillNo()); + } //单据日期开始时间-单据日期结束时间 qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (wsb.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (wsb.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" @@ -88,19 +140,36 @@ public class WmsShelfBillService extends MybatisBaseService list = dto.getList(); list.removeAll(Collections.singleton(null)); sid = wmsShelfBill.getSid(); if (!list.isEmpty()) { wmsShelfBillDetailService.saveShelfDetails(sid, list); } + String applyCode = getApplyCode(dto.getCreateOrgSid()); + wmsShelfBill.setBillNo(applyCode); baseMapper.insert(wmsShelfBill); } else { WmsShelfBill wmsShelfBill = fetchBySid(sid); if (wmsShelfBill == null) { return rb.setMsg("该单据不存在"); } + if (StringUtils.isNotBlank(dto.getBillState())) { + if (dto.getBillState().equals("新建")){ + dto.setBillState("0"); + } else if (dto.getBillState().equals("完成")) { + dto.setBillState("1"); + } + } BeanUtil.copyProperties(dto, wmsShelfBill, "sid"); List list = dto.getList(); list.removeAll(Collections.singleton(null)); @@ -111,11 +180,29 @@ public class WmsShelfBillService extends MybatisBaseService resultBean1 = sysOrganizationFeign.fetchBySid(createOrgSid); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType("SJD"); + String bill = Rule.getBill(b); + String i = baseMapper.selectCodeNum(bill); + String billNo = ""; + if (org.apache.commons.lang3.StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(bill, 0); + } + return billNo; + } + + public void saveWmsInventory(String sid) { WmsShelfBill wmsShelfBill = fetchBySid(sid); List detailList = wmsShelfBillDetailService.selectByBillSid(sid); @@ -145,7 +232,7 @@ public class WmsShelfBillService extends MybatisBaseService list = wmsShelfBillDetailService.details(sid); + List list = wmsShelfBillDetailService.selDetailsByMainSid(sid); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { + for (ShelfInitListVo listVo : list) { + BigDecimal count = new BigDecimal("0"); + BigDecimal acCount = new BigDecimal("0"); + if (StringUtils.isNotBlank(listVo.getCount())) { + count = new BigDecimal(listVo.getCount()); + } + if (StringUtils.isNotBlank(listVo.getActualCount())) { + acCount = new BigDecimal(listVo.getActualCount()); + } + BigDecimal subtract = count.subtract(acCount); + listVo.setNoShelfCount(subtract.toString()); + } shelfDetailsVo.setList(list); } return rb.success().setData(shelfDetailsVo); @@ -221,6 +320,37 @@ public class WmsShelfBillService extends MybatisBaseService getInit(String sid, String orgPath, String userSid) { ResultBean rb = ResultBean.fireFail(); ShelfInitVo shelfInitVo = new ShelfInitVo(); + String deptName = ""; + String deptSid = ""; + String createOrgSid = ""; + shelfInitVo.setUserSid(userSid); + SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData(); + shelfInitVo.setCreateByName(userVo.getName()); + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptName = sysOrganization.getName() + "/" + sysOrganization1.getName(); + deptName = sysOrganization1.getName(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptName = sysOrganization.getName(); + deptName = sysOrganization.getName(); + deptSid = sysOrganization.getSid(); + } + shelfInitVo.setDeptSid(deptSid); + shelfInitVo.setDeptName(deptName); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + shelfInitVo.setCreateOrgSid(createOrgSid); + shelfInitVo.setUseOrgSid(createOrgSid); + } + } //查询所有已上架的商品 List stringList = wmsShelfBillDetailService.selectReceiptSidList(); stringList.removeAll(Collections.singleton(null)); @@ -229,7 +359,7 @@ public class WmsShelfBillService extends MybatisBaseService list = new ArrayList<>(); //获取收货单据的明细 List wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectByBillSid(sid, stringList); @@ -237,13 +367,14 @@ public class WmsShelfBillService extends MybatisBaseService confirm(WmsShelfBillDto dto) { ResultBean rb = ResultBean.fireFail(); - dto.setBillState(1); + dto.setBillState("1"); ResultBean resultBean = saveOrUpdateShelf(dto); String sid = resultBean.getData(); return rb.success().setData(sid); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/ShelfInitListVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/ShelfInitListVo.java index ca1a9d45ed..77673b8180 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/ShelfInitListVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/ShelfInitListVo.java @@ -3,6 +3,8 @@ package com.yxt.wms.biz.inventory.wmsshelfbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @description: * @author: dimengzhe @@ -11,39 +13,30 @@ import lombok.Data; @Data public class ShelfInitListVo { + @ApiModelProperty("收货单明细sid") + private String receiptDetailSid; @ApiModelProperty("批次号") private String batchNumber; - @ApiModelProperty("库存sid") - private String inventorySid; - @ApiModelProperty("仓库sid") - private String warehouseSid; - @ApiModelProperty("库位sid") - private String warehouseRackSid; - @ApiModelProperty("库位编号") - private String warehouseRackCode; - @ApiModelProperty("上架数量") - private String count; - - //商品名称 + @ApiModelProperty("商品基础信息Sid") + private String goodSpuSid; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; @ApiModelProperty("商品Sku名称") private String goodsSkuTitle; - //商品编码 @ApiModelProperty("商品sku编码") private String goodsSkuCode; - //规格 @ApiModelProperty("规格型号") private String goodsSkuOwnSpec; - //单位 @ApiModelProperty("计量单位") private String unit; - //仓库 - @ApiModelProperty("仓库名称") - private String warehouseName; - //库位 - @ApiModelProperty("库位名称") - private String warehouseRackName; - //已上架数量 + @ApiModelProperty("需上架数量") + private String count; + @ApiModelProperty("已上架数量(根据上架记录计算)") private String actualCount; - //载具编号 + @ApiModelProperty("未上架数量") + private String noShelfCount; + @ApiModelProperty("载具编号") private String packageNo; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetail.java index fbe1316bf7..e252a753c0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetail.java @@ -19,14 +19,25 @@ public class WmsShelfBillDetail extends BaseEntity { private String receiptDetailSid; @ApiModelProperty("批次号") private String batchNumber; - @ApiModelProperty("库存sid") - private String inventorySid; - @ApiModelProperty("仓库sid") - private String warehouseSid; - @ApiModelProperty("库位sid") - private String warehouseRackSid; - @ApiModelProperty("库位编号") - private String warehouseRackCode; - @ApiModelProperty("上架数量") + @ApiModelProperty("商品基础信息Sid") + private String goodSpuSid; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; + @ApiModelProperty("商品sku编码") + private String goodsSkuCode; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("需上架数量") private BigDecimal count; + @ApiModelProperty("已上架数量(根据上架记录计算)") + private BigDecimal actualCount; + @ApiModelProperty("载具编号") + private String packageNo; + } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailDto.java index 57650dd6de..6af4ae545b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailDto.java @@ -17,39 +17,25 @@ public class WmsShelfBillDetailDto { private String receiptDetailSid; @ApiModelProperty("批次号") private String batchNumber; - @ApiModelProperty("库存sid") - private String inventorySid; - @ApiModelProperty("仓库sid") - private String warehouseSid; - @ApiModelProperty("库位sid") - private String warehouseRackSid; - @ApiModelProperty("库位编号") - private String warehouseRackCode; - @ApiModelProperty("需上架数量") - private String count; - - - //商品名称 + @ApiModelProperty("商品基础信息Sid") + private String goodSpuSid; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; @ApiModelProperty("商品Sku名称") private String goodsSkuTitle; - //商品编码 @ApiModelProperty("商品sku编码") private String goodsSkuCode; - //规格 @ApiModelProperty("规格型号") private String goodsSkuOwnSpec; - //单位 @ApiModelProperty("计量单位") private String unit; - //仓库 - @ApiModelProperty("仓库名称") - private String warehouseName; - //库位 - @ApiModelProperty("库位名称") - private String warehouseRackName; - //已上架数量 + @ApiModelProperty("需上架数量") + private String count; + @ApiModelProperty("已上架数量(根据上架记录计算)") private String actualCount; - //载具编号 + @ApiModelProperty("载具编号") private String packageNo; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailMapper.java index 35625f1885..fb42dbf0c4 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailMapper.java @@ -19,4 +19,6 @@ public interface WmsShelfBillDetailMapper extends BaseMapper List selectByBillSid(String sid); List selectReceiptSidList(); + + List selDetailsByMainSid(String sid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailMapper.xml index a275a55552..4e88aeef86 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailMapper.xml @@ -43,4 +43,9 @@ select receiptDetailSid from wms_shelf_bill_detail - \ No newline at end of file + + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailService.java index 6d70afce46..e54aa3674f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailService.java @@ -34,4 +34,8 @@ public class WmsShelfBillDetailService extends MybatisBaseService selectReceiptSidList() { return baseMapper.selectReceiptSidList(); } + + public List selDetailsByMainSid(String sid) { + return baseMapper.selDetailsByMainSid(sid); + } }