open_platform/ss-common-storage
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1024

Browse Source
This commit is contained in:
wangpengfei
2024-10-24 16:49:31 +08:00
parent 5d613b0a61
commit 316a789649
6 changed files with 81 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java
View File

@@ -37,6 +37,10 @@ public class WarehouseInfoRest {
public ResultBean<List<ProjectDetailsVo>> list(@RequestBody WarehouseInfoMapQuery query) {
return wmsWarehouseService.listQuery(query);
}
@PostMapping("/listPageN")
public ResultBean<PagerVo<ProjectDetailsVo>> listPageN(@RequestBody PagerQuery<WarehouseInfoMapQuery> query) {
return wmsWarehouseService.listPage1(query);
}
@ApiOperation("查询所有的仓库")
@PostMapping("/listAll")
public ResultBean<List<WarehouseInfo>> listAll(@RequestBody OrgPathQuery query) {

1
src/main/java/com/yxt/warehouse/biz/warehouseinfo/ProjectDetailsVo.java
View File

@@ -21,6 +21,7 @@ public class ProjectDetailsVo {
private String latitude;//纬度
private String squareMeter;//平方米
private String supplierName;
private String customerName;
private String supplierType;
private String goodsDetail;
}

10
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapQuery.java
View File

@@ -1,15 +1,23 @@
package com.yxt.warehouse.biz.warehouseinfo;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author wangpengfei
* @date 2024/8/29 11:52
*/
@Data
public class WarehouseInfoMapQuery {
public class WarehouseInfoMapQuery implements Query {
private String name;//仓库名称
@ApiModelProperty("组织sid")
private String orgPath;
private List<String> sids;
private String warehouseName;
private String address;
private String warehouseCode;
}

1
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java
View File

@@ -19,6 +19,7 @@ import java.util.List;
public interface WarehouseInfoMapper extends BaseMapper<WarehouseInfo> {
IPage<WarehouseInfoVo> listPage(IPage<WarehouseInfo> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInfo> qw);
List<ProjectDetailsVo> listQuery( @Param(Constants.WRAPPER) QueryWrapper<WarehouseInfo> qw);
IPage<ProjectDetailsVo> listQuery1( IPage<ProjectDetailsVo> page,@Param(Constants.WRAPPER) QueryWrapper<WarehouseInfo> qw);
int updateBySidIsDelete(List<String> list);
@Select("select * from wms_warehouse_info")

9
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
View File

@@ -22,6 +22,15 @@
${ew.sqlSegment}
</where>
</select>
<select id="listQuery1" resultType="com.yxt.warehouse.biz.warehouseinfo.ProjectDetailsVo">
select
a.*
from warehouse_info a
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="listAll" resultType="com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVo">
select
*

57
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
View File

@@ -142,6 +142,63 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
}
return rb.success().setData(storeInfos);
}
public ResultBean<PagerVo<ProjectDetailsVo>> listPage1(PagerQuery<WarehouseInfoMapQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WarehouseInfoMapQuery query = pq.getParams();
QueryWrapper<WarehouseInfo> qw = new QueryWrapper<>();
qw.like("s.orgSidPath", query.getOrgPath());
if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getWarehouseName())) {
qw.like("a.warehouseName", query.getWarehouseName());
}
if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getAddress())) {
qw.like("a.address", query.getAddress());
}
if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getWarehouseCode())) {
qw.like("a.warehouseCode", query.getWarehouseCode());
}
if(query.getSids().size()!=0){
qw.in("a.sid",query.getSids());
}
IPage<ProjectDetailsVo> page = PagerUtil.queryToPage(pq);
IPage<ProjectDetailsVo> pagging = baseMapper.listQuery1(page, qw);
for (ProjectDetailsVo storeInfo : pagging.getRecords()) {
List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid()));
if (warehouseInventories.size()!=0){
List<WarehouseInventoryRecord> list=warehouseInventoryRecordService.list(new QueryWrapper<WarehouseInventoryRecord>()
.eq("inventorySid",warehouseInventories.get(0).getSid()).eq("billType","1"));
if(list.size()!=0){
storeInfo.setSupplierName(list.get(0).getBillObjName());
List<PurchaseInventoryBillDetail>details=purchaseInventoryBillDetailService.list(new QueryWrapper<PurchaseInventoryBillDetail>()
.eq("sourceBillSid",list.get(0).getSourceBillSid()));
for (PurchaseInventoryBillDetail detail : details) {
if(StringUtils.isBlank(storeInfo.getGoodsDetail())){
Double s=detail.getCount();
if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){
storeInfo.setGoodsDetail(detail.getGoodsSkuTitle()+":"+ DoubleUtils.removeZeros(s.toString())+detail.getUnit());
}else{
storeInfo.setGoodsDetail(detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
}
}else{
Double s=detail.getCount();
if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){
storeInfo.setGoodsDetail(","+detail.getGoodsSkuTitle()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
}else{
storeInfo.setGoodsDetail(","+detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
}
}
}
}
}
if(StringUtils.isNotBlank(storeInfo.getLngAndLat())){
String []w=storeInfo.getLngAndLat().split(",");
storeInfo.setLatitude(w[1]);
storeInfo.setLongitude(w[0]);
}
}
PagerVo<ProjectDetailsVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
}
public ResultBean<List<WarehouseInfo>> listAll(OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail();