Browse Source

库龄查询、库存结转模块

zhanglei
fanzongzhe 1 year ago
parent
commit
659a8694cc
  1. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeExportVo.java
  2. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeQuery.java
  3. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeVo.java
  4. 278
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
  5. 84
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
  6. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettleRecordQuery.java
  7. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettleRecordVo.java
  8. 7
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebill.java
  9. 1
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillMapper.xml
  10. 27
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillQuery.java
  11. 18
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillService.java
  12. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetail.java
  13. 48
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailMapper.xml
  14. 5
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailQuery.java
  15. 128
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailService.java
  16. 3
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailVo.java
  17. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillExportVo.java
  18. 22
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/privilege/PrivilegeQuery.java
  19. 35
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeign.java
  20. 88
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationVo.java
  21. 25
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstafforg/SysStaffOrgFeign.java
  22. 21
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/OrgList.java
  23. 28
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java
  24. 97
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeExportVo.java

@ -26,10 +26,8 @@ public class WmsInventoryAgeExportVo {
private String unit;//计量单位
@ExportEntityMap(CnName = "仓库名称", EnName = "warehouseName")
private String warehouseName;//仓库名称
@ExportEntityMap(CnName = "库区名称", EnName = "warehouseArea")
private String warehouseArea;//库区名称
@ExportEntityMap(CnName = "货架名称", EnName = "warehouseRackName")
private String warehouseRackName;//货架名称
@ExportEntityMap(CnName = "库位编码", EnName = "warehouseRackCode")
private String warehouseRackCode;//库位编码
@ExportEntityMap(CnName = "库存数量", EnName = "count")
private String count;//库存数量
@ExportEntityMap(CnName = "库龄", EnName = "age")

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeQuery.java

@ -22,5 +22,5 @@ public class WmsInventoryAgeQuery implements Query {
private String ageStart;//库龄开始
private String ageEnd;//库龄开始
// private String queryName; //单号,来源单号,供应商
private String useOrgSid;
private String orgPath;
}

4
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeVo.java

@ -21,8 +21,8 @@ public class WmsInventoryAgeVo implements Vo {
private String goodsSkuOwnSpec; //规格型号
private String unit;//计量单位
private String warehouseName;//仓库名称
private String warehouseArea;//库区名称
private String warehouseRackName;//货架名称
// private String warehouseArea;//库区名称
private String warehouseRackCode;//库位编码
private String count;//库存数量
private String age;//库龄
//来源单号

278
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@ -6,17 +6,17 @@
<select id="listPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVo">
select a.goodsID,
a.sid,
a.goodsSpuName,
a.goodsSkuCode,
a.goodsSkuOwnSpec,
a.unit,
a.warehouseName,
a.warehouseRackCode,
a.count,
a.allocateCount,
a.batchNumber,
DATE_FORMAT(a.firstInDate, '%Y-%m-%d') as firstInDate
a.sid,
a.goodsSpuName,
a.goodsSkuCode,
a.goodsSkuOwnSpec,
a.unit,
a.warehouseName,
a.warehouseRackCode,
a.count,
a.allocateCount,
a.batchNumber,
DATE_FORMAT(a.firstInDate, '%Y-%m-%d') as firstInDate
from wms_inventory a
<where>
${ew.sqlSegment}
@ -73,51 +73,51 @@
<select id="getBillList" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryBillListVo">
select *
from (select wd.goodsSpuName,
wd.goodsSkuTitle,
wd.goodsSkuCode,
wd.goodsSkuOwnSpec,
wd.unit,
wd.warehouseName,
wd.warehouseArea,
wd.warehouseRackName,
wb.busTypeValue,
wd.cost,
wd.price1,
wd.price2,
wd.subject,
wb.createByName,
DATE_FORMAT(wb.createTime, '%Y-%m-%d') as createTime,
wb.billNo,
wb.sourceBillSid sourceBillNo,
wb.billObjName,
wb.busTypeKey
from wms_inventory a
left join wms_inventory_bill wb on wb.sid = a.billSid
left join wms_inventory_bill_detail wd on wd.sid = a.billDetailSid
where a.sid = #{sid}
union all
select wd.goodsSpuName,
wd.goodsSkuTitle,
wd.goodsSkuCode,
wd.goodsSkuOwnSpec,
wd.unit,
wd.warehouseName,
wd.warehouseArea,
wd.warehouseRackName,
wb.busTypeValue,
wd.cost,
wd.price1,
wd.price2,
wd.subject,
wb.createByName,
DATE_FORMAT(wb.createTime, '%Y-%m-%d') as createTime,
wb.billNo,
wb.sourceBillSid sourceBillNo,
wb.billObjName,
wb.busTypeKey
from wms_inventory_bill_detail wd
left join wms_inventory_bill wb on wb.sid = wd.billSid
where wd.inventorySid = #{sid}) b
wd.goodsSkuTitle,
wd.goodsSkuCode,
wd.goodsSkuOwnSpec,
wd.unit,
wd.warehouseName,
wd.warehouseArea,
wd.warehouseRackName,
wb.busTypeValue,
wd.cost,
wd.price1,
wd.price2,
wd.subject,
wb.createByName,
DATE_FORMAT(wb.createTime, '%Y-%m-%d') as createTime,
wb.billNo,
wb.sourceBillSid sourceBillNo,
wb.billObjName,
wb.busTypeKey
from wms_inventory a
left join wms_inventory_bill wb on wb.sid = a.billSid
left join wms_inventory_bill_detail wd on wd.sid = a.billDetailSid
where a.sid = #{sid}
union all
select wd.goodsSpuName,
wd.goodsSkuTitle,
wd.goodsSkuCode,
wd.goodsSkuOwnSpec,
wd.unit,
wd.warehouseName,
wd.warehouseArea,
wd.warehouseRackName,
wb.busTypeValue,
wd.cost,
wd.price1,
wd.price2,
wd.subject,
wb.createByName,
DATE_FORMAT(wb.createTime, '%Y-%m-%d') as createTime,
wb.billNo,
wb.sourceBillSid sourceBillNo,
wb.billObjName,
wb.busTypeKey
from wms_inventory_bill_detail wd
left join wms_inventory_bill wb on wb.sid = wd.billSid
where wd.inventorySid = #{sid}) b
<where>
${ew.sqlSegment}
</where>
@ -125,95 +125,83 @@
<select id="listExcel" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVoExcelVo">
select a.*,
(@rank := @rank + 1) rankNo
(@rank := @rank + 1) rankNo
from (SELECT @rank := 0) t,
wms_inventory a
wms_inventory a
<where>
${ew.sqlSegment}
</where>
</select>
<select id="listPageSales" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventorySalesVo">
SELECT i.sid AS inventorySid,
i.goodsID,
i.goodSpuSid,
i.goodsSpuName,
i.goodsSkuSid,
i.goodsSkuTitle,
i.goodsSkuCode,
i.unit,
i.warehouseSid,
i.warehouseName AS warehouse,
i.count as currentCount,
i.minimumPrice as price
SELECT i.sid AS inventorySid,
i.goodsID,
i.goodSpuSid,
i.goodsSpuName,
i.goodsSkuSid,
i.goodsSkuTitle,
i.goodsSkuCode,
i.unit,
i.warehouseSid,
i.warehouseName AS warehouse,
i.count as currentCount,
i.minimumPrice as price
FROM wms_inventory AS i
<where>
${ew.sqlSegment}
</where>
</select>
<select id="getPackageGoodsVo" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryPackageVo">
SELECT v.goodSpuSid goodsSid,
v.goodsSpuName goodsName,
v.goodsSkuCode goodsCode,
v.unit,
v.goodsSkuOwnSpec specification,
v.count,
v.minimumPrice price,
v.warehouseName warehouse,
v.warehouseSid,
v.warehouseArea,
v.remarks,
v.freePrice
SELECT v.goodSpuSid goodsSid,
v.goodsSpuName goodsName,
v.goodsSkuCode goodsCode,
v.unit,
v.goodsSkuOwnSpec specification,
v.count,
v.minimumPrice price,
v.warehouseName warehouse,
v.warehouseSid,
v.warehouseArea,
v.remarks,
v.freePrice
FROM wms_inventory AS v
<where>
${ew.sqlSegment}
</where>
</select>
<select id="inventoryAgeList" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryAgeVo">
SELECT *
FROM (
SELECT sid,
goodsSpuName,
goodsSkuTitle,
goodsSkuCode,
goodsSkuOwnSpec,
unit,
warehouseName,
warehouseArea,
warehouseRackName,
count,
firstInDate,
useOrgSid,
DATEDIFF(NOW(), firstInDate) age
FROM wms_inventory
) AS w
SELECT sid,
goodsSpuName,
goodsSkuTitle,
goodsSkuCode,
goodsSkuOwnSpec,
unit,
warehouseName,
warehouseRackCode,
count,
date_format (w.firstInDate,'%Y-%m-%d') as firstInDate,
useOrgSid,
DATEDIFF(NOW(), firstInDate) age
FROM wms_inventory as w
<where>
${ew.sqlSegment}
</where>
</select>
<select id="ageExportExcel" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryAgeExportVo">
SELECT
w.*,
( @rank := @rank + 1 ) rankNo
FROM
(
SELECT
sid,
goodsSpuName,
goodsSkuTitle,
goodsSkuCode,
goodsSkuOwnSpec,
unit,
warehouseName,
warehouseArea,
warehouseRackName,
count,
firstInDate,
useOrgSid,
DATEDIFF( NOW(), firstInDate ) age
FROM
wms_inventory
) AS w,
( SELECT @rank := 0 ) t
( @rank := @rank + 1 ) rankNo,
w.sid,
w.goodsSpuName,
w.goodsSkuTitle,
w.goodsSkuCode,
w.goodsSkuOwnSpec,
w.unit,
w.warehouseName,
w.warehouseRackCode,
w.count,
date_format (w.firstInDate,'%Y-%m-%d') as firstInDate,
DATEDIFF(NOW(), w.firstInDate) as age
FROM wms_inventory as w,
( SELECT @rank := 0 ) t
<where>${ew.sqlSegment}</where>
</select>
@ -229,19 +217,19 @@
<select id="invenGoodsListPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryInvenSelectList">
SELECT wi.sid,
wi.goodsSpuName,
wi.goodsSkuCode,
wi.goodsSkuOwnSpec,
wi.unit,
wi.warehouseSid,
wi.warehouseName,
wi.warehouseRackSid,
wi.warehouseRackCode,
wwa.areaName,
wi.count
wi.goodsSpuName,
wi.goodsSkuCode,
wi.goodsSkuOwnSpec,
wi.unit,
wi.warehouseSid,
wi.warehouseName,
wi.warehouseRackSid,
wi.warehouseRackCode,
wwa.areaName,
wi.count
FROM wms_inventory wi
LEFT JOIN wms_warehouse_area wwa
ON wi.`warehouseRackSid` = wwa.`sid`
LEFT JOIN wms_warehouse_area wwa
ON wi.`warehouseRackSid` = wwa.`sid`
<where>
${ew.sqlSegment}
</where>
@ -249,19 +237,19 @@
<select id="alloGoodsListPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryAlloSelectList">
SELECT wi.sid,
wi.goodsSpuName,
wi.goodsSkuCode,
wi.goodsSkuOwnSpec,
wi.unit,
wi.warehouseSid,
wi.warehouseName,
wi.warehouseRackSid,
wi.warehouseRackCode,
wwa.areaName,
wi.count
wi.goodsSpuName,
wi.goodsSkuCode,
wi.goodsSkuOwnSpec,
wi.unit,
wi.warehouseSid,
wi.warehouseName,
wi.warehouseRackSid,
wi.warehouseRackCode,
wwa.areaName,
wi.count
FROM wms_inventory wi
LEFT JOIN wms_warehouse_area wwa
ON wi.`warehouseRackSid` = wwa.`sid`
LEFT JOIN wms_warehouse_area wwa
ON wi.`warehouseRackSid` = wwa.`sid`
<where>
${ew.sqlSegment}
</where>

84
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@ -14,6 +14,8 @@ import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBill;
import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillService;
import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo;
import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -32,6 +34,8 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
private WmsInventoryBillService wmsInventoryBillService;
@Resource
private BaseGoodsSkuFeign baseGoodsSkuFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
public PagerVo<WmsInventoryVo> listPage(PagerQuery<WmsInventoryQuery> pq) {
WmsInventoryQuery query = pq.getParams();
@ -180,36 +184,36 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
return rb.success().setData(wmsInventoryInitVo);
}*/
/* public ResultBean updatePrice(WmsInventoryUpdatePrice wmsInventoryUpdatePrice) {
ResultBean rb = ResultBean.fireFail();
List<String> stringList = wmsInventoryUpdatePrice.getSidsList();
stringList.removeAll(Collections.singleton(null));
String price = wmsInventoryUpdatePrice.getPrice();
if (!stringList.isEmpty()) {
int type = wmsInventoryUpdatePrice.getType();
switch (type) {
case 1:
baseMapper.updatePrice1(price, stringList);
break;
case 2:
baseMapper.updatePrice2(price, stringList);
break;
case 3:
baseMapper.updatePrice3(price, stringList);
break;
case 4:
baseMapper.updatePrice4(price, stringList);
break;
case 5:
baseMapper.updatePrice5(price, stringList);
break;
default:
break;
}
}
return rb.success();
}
*/
/* public ResultBean updatePrice(WmsInventoryUpdatePrice wmsInventoryUpdatePrice) {
ResultBean rb = ResultBean.fireFail();
List<String> stringList = wmsInventoryUpdatePrice.getSidsList();
stringList.removeAll(Collections.singleton(null));
String price = wmsInventoryUpdatePrice.getPrice();
if (!stringList.isEmpty()) {
int type = wmsInventoryUpdatePrice.getType();
switch (type) {
case 1:
baseMapper.updatePrice1(price, stringList);
break;
case 2:
baseMapper.updatePrice2(price, stringList);
break;
case 3:
baseMapper.updatePrice3(price, stringList);
break;
case 4:
baseMapper.updatePrice4(price, stringList);
break;
case 5:
baseMapper.updatePrice5(price, stringList);
break;
default:
break;
}
}
return rb.success();
}
*/
/* public PagerVo<WmsInventoryBillListVo> getBillList(PagerQuery<WmsInventoryBillListQuery> pagerQuery) {
WmsInventoryBillListQuery query = pagerQuery.getParams();
QueryWrapper<WmsInventory> qw = new QueryWrapper<>();
@ -334,8 +338,13 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
public PagerVo<WmsInventoryAgeVo> inventoryAgeList(PagerQuery<WmsInventoryAgeQuery> pq) {
WmsInventoryAgeQuery query = pq.getParams();
QueryWrapper<WmsInventory> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getUseOrgSid())) {
qw.eq("w.useOrgSid", query.getUseOrgSid());
if (StringUtils.isNotBlank(query.getOrgPath())) {
String orgPath = query.getOrgPath();
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
if (orgSidByPath.getSuccess()) {
String useOrgSid = orgSidByPath.getData();
qw.eq("w.useOrgSid", useOrgSid);
}
}
if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
qw.like("w.goodsSpuName", query.getGoodsSpuName());
@ -352,7 +361,6 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
qw.apply(StringUtils.isNotBlank(query.getAgeStart()), "w.age >=" + query.getAgeStart()).
apply(StringUtils.isNotBlank(query.getAgeEnd()), "w.age <=" + query.getAgeStart()
);
qw.eq("1", "1");
qw.orderByDesc("w.firstInDate");
IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryAgeVo> pagging = baseMapper.inventoryAgeList(page, qw);
@ -362,8 +370,13 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
public List<WmsInventoryAgeExportVo> ageExportExcel(WmsInventoryAgeQuery query) {
QueryWrapper<WmsInventory> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getUseOrgSid())) {
qw.eq("w.useOrgSid", query.getUseOrgSid());
if (StringUtils.isNotBlank(query.getOrgPath())) {
String orgPath = query.getOrgPath();
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
if (orgSidByPath.getSuccess()) {
String useOrgSid = orgSidByPath.getData();
qw.eq("w.useOrgSid", useOrgSid);
}
}
if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
qw.like("w.goodsSpuName", query.getGoodsSpuName());
@ -380,7 +393,6 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
qw.apply(StringUtils.isNotBlank(query.getAgeStart()), "w.age >=" + query.getAgeStart()).
apply(StringUtils.isNotBlank(query.getAgeEnd()), "w.age <=" + query.getAgeStart()
);
qw.eq("1", "1");
qw.orderByDesc("w.firstInDate");
List<WmsInventoryAgeExportVo> list = baseMapper.ageExportExcel(qw);
return list;

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettleRecordQuery.java

@ -14,5 +14,5 @@ public class WmsInventorySettleRecordQuery implements Query {
private String startDate;
private String endDate;
private String useOrgName;
private String useOrgSid;
private String orgPath;
}

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettleRecordVo.java

@ -1,8 +1,11 @@
package com.yxt.wms.biz.inventory.wmsinventorysettlebill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
import java.util.Date;
/**
* @author Fan
* @description
@ -13,6 +16,7 @@ public class WmsInventorySettleRecordVo implements Vo {
private String sid;
private String createByName;
private String createTime;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date createTime;
private String useOrgName;
}

7
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebill.java

@ -54,8 +54,6 @@ public class WmsInventorySettlebill extends BaseEntity {
@ApiModelProperty("结算单编号")
private String billNo; // 结算单编号
@ApiModelProperty("制单日期")
private String createDate; // 制单日期
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("库存结算状态(1进行中 2已完成)")
@ -72,5 +70,8 @@ public class WmsInventorySettlebill extends BaseEntity {
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("使用组织")
private String useOrgName; // 使用组织
@ApiModelProperty("创建组织")
private String createOrgName; // 创建组织
}

1
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillMapper.xml

@ -38,5 +38,6 @@
<select id="carryForwardList"
resultType="com.yxt.wms.biz.inventory.wmsinventorysettlebill.WmsInventorySettleRecordVo">
SELECT * FROM wms_inventory_settlebill
<where>${ew.sqlSegment}</where>
</select>
</mapper>

27
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillQuery.java

@ -29,7 +29,9 @@ package com.yxt.wms.biz.inventory.wmsinventorysettlebill;
import com.yxt.common.core.query.Query;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -51,29 +53,26 @@ import lombok.Data;
@ApiModel(value = "库存结算单 查询条件", description = "库存结算单 查询条件")
public class WmsInventorySettlebillQuery implements Query {
@ApiModelProperty("结算单编号")
@ApiModelProperty("结算单编号")
private String billNo; // 结算单编号
@ApiModelProperty("制单日期")
@ApiModelProperty("制单日期")
private String createDate; // 制单日期
@ApiModelProperty("制单人sid")
@ApiModelProperty("制单人sid")
private String createUserSid; // 制单人sid
@ApiModelProperty("制单人姓名")
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("库存结算状态(1进行中 2已完成)")
@ApiModelProperty("库存结算状态(1进行中 2已完成)")
private Integer settleState; // 库存结算状态(1进行中 2已完成)
@ApiModelProperty("库存结算类型(1月结 2年结)")
@ApiModelProperty("库存结算类型(1月结 2年结)")
private Integer settleType; // 库存结算类型(1月结 2年结)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("开始时间")
private Date settle_startTimeStart; // 开始时间
private Date settle_startTimeEnd; // 开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("结束时间")
private Date settle_endTimeStart; // 结束时间
private Date settle_endTimeEnd; // 结束时间
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
private String orgPath;
}

18
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillService.java

@ -28,9 +28,11 @@ package com.yxt.wms.biz.inventory.wmsinventorysettlebill;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.core.result.ResultBean;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory;
import com.yxt.wms.biz.inventory.wmsinventorysettlebilldetail.WmsInventorySettlebillDetail;
import com.yxt.wms.biz.inventory.wmsinventorysettlebilldetail.WmsInventorySettlebillDetailService;
import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -61,7 +63,8 @@ public class WmsInventorySettlebillService extends MybatisBaseService<WmsInvento
@Autowired
private WmsInventorySettlebillDetailService wmsInventorySettlebillDetailService;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
private QueryWrapper<WmsInventorySettlebill> createQueryWrapper(WmsInventorySettlebillQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -141,13 +144,20 @@ public class WmsInventorySettlebillService extends MybatisBaseService<WmsInvento
public PagerVo<WmsInventorySettleRecordVo> carryForwardList(PagerQuery<WmsInventorySettleRecordQuery> pq) {
WmsInventorySettleRecordQuery query = pq.getParams();
QueryWrapper<WmsInventorySettlebill> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getUseOrgSid())) {
qw.eq("useOrgSid",query.getUseOrgSid());
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getOrgPath())) {
String orgPath = query.getOrgPath();
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
if (orgSidByPath.getSuccess()) {
String useOrgSid = orgSidByPath.getData();
qw.eq("useOrgSid", useOrgSid);
}
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("useOrgName",query.getUseOrgName());
}
qw.apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getStartDate()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + query.getStartDate() + "','%Y-%m-%d')").
apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getEndDate()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getEndDate() + "','%Y-%m-%d')"
);
qw.eq("1","1");
qw.orderByDesc("createTime");
IPage<WmsInventorySettlebill> page = PagerUtil.queryToPage(pq);
IPage<WmsInventorySettleRecordVo> pagging = baseMapper.carryForwardList(page, qw);

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetail.java

@ -68,10 +68,8 @@ public class WmsInventorySettlebillDetail extends BaseEntity {
private String goodsSkuOwnSpec;//规格型号
private String warehouseSid;//仓库sid
private String warehouseName;//仓库名称
private String warehouseAreaSid;//库区sid
private String warehouseArea;//库区名称
private String warehouseRackSid;//货架sid
private String warehouseRackName;//货架名称
private String warehouseRackSid;//库位Sid
private String warehouseRackCode;//库位编码
@ApiModelProperty("上期结存")
private BigDecimal preBalance; // 上期结存
@ApiModelProperty("本期结存")

48
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailMapper.xml

@ -7,7 +7,7 @@
resultType="com.yxt.wms.biz.inventory.wmsinventorysettlebilldetail.WmsInventorySettlebillDetailVo">
SELECT
d.sid,
s.createTime,
date_format (s.createTime,'%Y-%m-%d') as createTime,
d.currentBalance,
d.preBalance,
d.settleType,
@ -16,8 +16,7 @@
d.goodsSkuOwnSpec,
d.goodsSkuTitle,
d.warehouseName,
d.warehouseArea,
d.warehouseRackName
d.warehouseRackCode
FROM
wms_inventory_settlebill_detail AS d
LEFT JOIN wms_inventory_settlebill AS s ON d.billSid = s.sid
@ -32,29 +31,28 @@
<select id="listExcel"
resultType="com.yxt.wms.biz.inventory.wmsinventorysettlebilldetail.WmsInventorySettlebillExportVo">
SELECT
d.sid,
s.createTime,
CASE
d.settleType
WHEN '1' THEN
'月结'
WHEN '2' THEN
'年结'
END AS settleType,
d.currentBalance,
d.preBalance,
d.goodsSpuName,
d.goodsSkuCode,
d.goodsSkuOwnSpec,
d.goodsSkuTitle,
d.warehouseName,
d.warehouseArea,
d.warehouseRackName,
( @rank := @rank + 1 ) rankNo
d.sid,
date_format (s.createTime,'%Y-%m-%d') as createTime,
CASE
d.settleType
WHEN '1' THEN
'月结'
WHEN '2' THEN
'年结'
END AS settleType,
d.currentBalance,
d.preBalance,
d.goodsSpuName,
d.goodsSkuCode,
d.goodsSkuOwnSpec,
d.goodsSkuTitle,
d.warehouseName,
d.warehouseRackCode,
( @rank := @rank + 1 ) rankNo
FROM
wms_inventory_settlebill_detail AS d
LEFT JOIN wms_inventory_settlebill AS s ON d.billSid = s.sid,
( SELECT @rank := 0 ) t
wms_inventory_settlebill_detail AS d
LEFT JOIN wms_inventory_settlebill AS s ON d.billSid = s.sid,
( SELECT @rank := 0 ) t
<where>${ew.sqlSegment}</where>
</select>
</mapper>

5
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailQuery.java

@ -57,9 +57,8 @@ public class WmsInventorySettlebillDetailQuery implements Query {
private String goodsSkuCode;//商品编码(图号)
private String goodsSkuOwnSpec;//规格型号
private String warehouseName;//仓库名称
private String warehouseArea;//库区名称
private String warehouseRackName;//货架名称
private String useOrgSid;
private String warehouseRackCode;//库位编码
private String orgPath;
private String startDate;
private String endDate;

128
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailService.java

@ -28,12 +28,15 @@ package com.yxt.wms.biz.inventory.wmsinventorysettlebilldetail;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.core.result.ResultBean;
import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@ -53,78 +56,85 @@ import java.util.List;
*/
@Service
public class WmsInventorySettlebillDetailService extends MybatisBaseService<WmsInventorySettlebillDetailMapper, WmsInventorySettlebillDetail> {
private QueryWrapper<WmsInventorySettlebillDetail> createQueryWrapper(WmsInventorySettlebillDetailQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<WmsInventorySettlebillDetail> qw = new QueryWrapper<>();
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getUseOrgSid())) {
qw.eq("s.useOrgSid", query.getUseOrgSid());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getGoodsSpuName())) {
qw.like("d.goodsSpuName", query.getGoodsSpuName());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getWarehouseName())) {
qw.like("d.warehouseName", query.getWarehouseName());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getGoodsSkuCode())) {
qw.like("d.goodsSkuCode", query.getGoodsSkuCode());
}
qw.apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getStartDate()), "date_format (s.createTime,'%Y-%m-%d') >= date_format('" + query.getStartDate() + "','%Y-%m-%d')").
apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getEndDate()), "date_format (s.createTime,'%Y-%m-%d') <= date_format('" + query.getEndDate() + "','%Y-%m-%d')"
);
qw.eq("1", "1");
qw.orderByDesc("s.createTime");
return qw;
}
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
public PagerVo<WmsInventorySettlebillDetailVo> listPageVo(PagerQuery<WmsInventorySettlebillDetailQuery> pq) {
WmsInventorySettlebillDetailQuery query = pq.getParams();
QueryWrapper<WmsInventorySettlebillDetail> qw = createQueryWrapper(query);
IPage<WmsInventorySettlebillDetail> page = PagerUtil.queryToPage(pq);
IPage<WmsInventorySettlebillDetailVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<WmsInventorySettlebillDetailVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
private QueryWrapper<WmsInventorySettlebillDetail> createQueryWrapper(WmsInventorySettlebillDetailQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<WmsInventorySettlebillDetail> qw = new QueryWrapper<>();
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getOrgPath())) {
String orgPath = query.getOrgPath();
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
if (orgSidByPath.getSuccess()) {
String useOrgSid = orgSidByPath.getData();
qw.eq("s.useOrgSid", useOrgSid);
}
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getGoodsSpuName())) {
qw.like("d.goodsSpuName", query.getGoodsSpuName());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getWarehouseName())) {
qw.like("d.warehouseName", query.getWarehouseName());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getGoodsSkuCode())) {
qw.like("d.goodsSkuCode", query.getGoodsSkuCode());
}
qw.apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getStartDate()), "date_format (s.createTime,'%Y-%m-%d') >= date_format('" + query.getStartDate() + "','%Y-%m-%d')").
apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getEndDate()), "date_format (s.createTime,'%Y-%m-%d') <= date_format('" + query.getEndDate() + "','%Y-%m-%d')"
);
qw.orderByDesc("s.createTime");
return qw;
}
public PagerVo<WmsInventorySettlebillDetailVo> listPageVo(PagerQuery<WmsInventorySettlebillDetailQuery> pq) {
WmsInventorySettlebillDetailQuery query = pq.getParams();
QueryWrapper<WmsInventorySettlebillDetail> qw = createQueryWrapper(query);
IPage<WmsInventorySettlebillDetail> page = PagerUtil.queryToPage(pq);
IPage<WmsInventorySettlebillDetailVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<WmsInventorySettlebillDetailVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(WmsInventorySettlebillDetailDto dto){
public void saveOrUpdateDto(WmsInventorySettlebillDetailDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
this.updateByDto(dto);
}
public void insertByDto(WmsInventorySettlebillDetailDto dto){
WmsInventorySettlebillDetail entity = new WmsInventorySettlebillDetail();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void insertByDto(WmsInventorySettlebillDetailDto dto) {
WmsInventorySettlebillDetail entity = new WmsInventorySettlebillDetail();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(WmsInventorySettlebillDetailDto dto){
String dtoSid = dto.getSid();
public void updateByDto(WmsInventorySettlebillDetailDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
WmsInventorySettlebillDetail entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
WmsInventorySettlebillDetail entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public WmsInventorySettlebillDetailDetailsVo fetchDetailsVoBySid(String sid){
WmsInventorySettlebillDetail entity = fetchBySid(sid);
WmsInventorySettlebillDetailDetailsVo vo = new WmsInventorySettlebillDetailDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public WmsInventorySettlebillDetailDetailsVo fetchDetailsVoBySid(String sid) {
WmsInventorySettlebillDetail entity = fetchBySid(sid);
WmsInventorySettlebillDetailDetailsVo vo = new WmsInventorySettlebillDetailDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delByMainSid(String sid) {
baseMapper.delByMainSid(sid);
}
public void delByMainSid(String sid) {
baseMapper.delByMainSid(sid);
}
public List<WmsInventorySettlebillExportVo> listExcel(WmsInventorySettlebillDetailQuery query) {
QueryWrapper<WmsInventorySettlebillDetail> qw = createQueryWrapper(query);
List<WmsInventorySettlebillExportVo> list = baseMapper.listExcel(qw);
return list;
}
public List<WmsInventorySettlebillExportVo> listExcel(WmsInventorySettlebillDetailQuery query) {
QueryWrapper<WmsInventorySettlebillDetail> qw = createQueryWrapper(query);
List<WmsInventorySettlebillExportVo> list = baseMapper.listExcel(qw);
return list;
}
}

3
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailVo.java

@ -62,8 +62,7 @@ public class WmsInventorySettlebillDetailVo implements Vo {
private String goodsSkuCode;//商品编码(图号)
private String goodsSkuOwnSpec;//规格型号
private String warehouseName;//仓库名称
private String warehouseArea;//库区名称
private String warehouseRackName;//货架名称
private String warehouseRackCode;//库位编码
@ApiModelProperty("上期结存")
private String preBalance; // 上期结存
@ApiModelProperty("本期结存")

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillExportVo.java

@ -27,10 +27,8 @@ public class WmsInventorySettlebillExportVo {
private String goodsSkuOwnSpec; //规格型号
@ExportEntityMap(CnName = "仓库名称", EnName = "warehouseName")
private String warehouseName;//仓库名称
@ExportEntityMap(CnName = "库区名称", EnName = "warehouseArea")
private String warehouseArea;//库区名称
@ExportEntityMap(CnName = "货架名称", EnName = "warehouseRackName")
private String warehouseRackName;//货架名称
@ExportEntityMap(CnName = "库位编码", EnName = "warehouseRackCode")
private String warehouseRackCode;//货架名称
@ExportEntityMap(CnName = "上期结存", EnName = "preBalance")
private String preBalance; // 上期结存
@ExportEntityMap(CnName = "本期结存", EnName = "currentBalance")

22
yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/privilege/PrivilegeQuery.java

@ -0,0 +1,22 @@
package com.yxt.wms.feign.portal.privilege;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description: 权限角色层级
* @author: dimengzhe
* @date: 2023/5/23
**/
@Data
public class PrivilegeQuery {
@ApiModelProperty("菜单路由")
private String menuUrl;
@ApiModelProperty("组织全路径sid")
private String orgPath;
@ApiModelProperty("菜单sid")
private String menuSid;
@ApiModelProperty("用户sid")
private String userSid;
}

35
yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeign.java

@ -0,0 +1,35 @@
package com.yxt.wms.feign.portal.sysorganization;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.ResponseBody;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysOrganizationFeign.java <br/>
* Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign <br/>
* Description: 组织机构表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @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<SysOrganizationVo> fetchBySid(@PathVariable("sid") String sid);
}

88
yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationVo.java

@ -0,0 +1,88 @@
package com.yxt.wms.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(门户建设) <br/>
* File: SysOrganizationVo.java <br/>
* Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo <br/>
* Description: 组织机构表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:28 <br/>
*
* @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<SysOrganizationVo> 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;
}

25
yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstafforg/SysStaffOrgFeign.java

@ -0,0 +1,25 @@
package com.yxt.wms.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<String> getOrgSidByPath(@RequestParam("orgPath") String orgPath);
}

21
yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/OrgList.java

@ -0,0 +1,21 @@
package com.yxt.wms.feign.portal.sysuser;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/9/21 9:26
* @Description
*/
@Data
public class OrgList implements Vo {
private static final long serialVersionUID = -2867882982421321776L;
private String orgName;
private String orgPath;
private String deptName;
private String deptSid;
}

28
yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java

@ -0,0 +1,28 @@
package com.yxt.wms.feign.portal.sysuser;
import com.yxt.common.core.result.ResultBean;
import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@Api(tags = "用户表")
@FeignClient(
contextId = "anrui-portal-SysUser",
name = "anrui-portal",
path = "v1/sysuser")
public interface SysUserFeign {
@ApiOperation(value = "查询角色权限的层级获取权限id")
@PostMapping(value = "/selectPrivilegeLevel")
ResultBean<String> selectPrivilegeLevel(@RequestBody PrivilegeQuery query);
@ApiOperation("根据sid获取一条记录")
@GetMapping("/fetchBySid/{sid}")
public ResultBean<SysUserVo> fetchBySid(@PathVariable("sid") String sid);
}

97
yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java

@ -0,0 +1,97 @@
package com.yxt.wms.feign.portal.sysuser;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysUserVo.java <br/>
* Class: com.yxt.anrui.portal.api.sysuser.SysUserVo <br/>
* Description: 用户表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "用户表 视图数据对象", description = "用户表 视图数据对象")
@Data
@NoArgsConstructor
public class SysUserVo implements Vo {
private static final long serialVersionUID = 2415131854581950721L;
@ApiModelProperty("部门sid")
private String departmentSid;
@ApiModelProperty("部门名称")
private String departmentName;
@ApiModelProperty("上级部门名称-本级部门名称 岗位名称")
@JsonProperty("pNameAndDepartmentNameAndPostName")
private String pNameAndDepartmentNameAndPostName;
@ApiModelProperty("岗位名称")
private String postName;
@ApiModelProperty("岗位Sid")
private String postSid;
@ApiModelProperty("单位sid")
private String organizationSid;
@ApiModelProperty("单位名称")
private String organizationName;
@ApiModelProperty("用户姓名")
private String name;
@ApiModelProperty("登录名,登录名不能相同")
private String userName;
@ApiModelProperty("id")
private Integer id;
@ApiModelProperty("用户sid")
private String sid;
@ApiModelProperty("是否是管理员:1管理员,2一般用户,0是超级管理员,3尚无单位人员")
private String isAdmin;
@ApiModelProperty("角色名称")
private String roleName;
@ApiModelProperty("关联的人员sid")
private String staffSid;
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty(value = "禁用状态")
private String isEnable;
@ApiModelProperty("用户类型:1员工、2客户、3供应商")
private String userType;
@ApiModelProperty("用户类型:1、2、3")
private String userTypeKey;
@ApiModelProperty("用户头像")
private String headImage;
@ApiModelProperty("组织名称")
private String orgNamePath;
@ApiModelProperty("组织sid")
private String orgSidPath;
@ApiModelProperty(value = "token")
private String token;
@ApiModelProperty(value = "角色sids")
private List<String> roleSids = new ArrayList<>();
private List<OrgList> orgList = new ArrayList<>();
@ApiModelProperty("默认的组织机构sid全路径")
private String defaultOrgPath;
@ApiModelProperty("默认的组织机构名称全路径")
private String defaultOrgPathName;
private String defaultDeptName;
private String defaultDeptSid;
@ApiModelProperty("是否需要更换密码")
private Boolean needResetPsd;
@ApiModelProperty("工号")
private String jobNumber;
}
Loading…
Cancel
Save