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

11.4

Browse Source
This commit is contained in:
wangpengfei
2024-11-04 15:33:39 +08:00
parent 69af559470
commit 09ef1a21c7
4 changed files with 77 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,11 @@ public class WarehouseInfoRest {
public ResultBean<List<ProjectDetailsVo>> list(@RequestBody WarehouseInfoMapQuery query) {
return wmsWarehouseService.listQuery(query);
}
@GetMapping("/getWarehouseBySid/{sid}")
public ResultBean<ProjectDetailsVo> getWarehouseBySid(@PathVariable("sid") String sid) {
return wmsWarehouseService.getWarehouseBySid(sid);
}
@PostMapping("/listPageN")
public ResultBean<PagerVo<ProjectDetailsVo>> listPageN(@RequestBody PagerQuery<WarehouseInfoMapQuery> query) {
return wmsWarehouseService.listPage1(query);

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);
ProjectDetailsVo getWarehouseBySid( @Param("sid") String sid);
IPage<ProjectDetailsVo> listQuery1( IPage<ProjectDetailsVo> page,@Param(Constants.WRAPPER) QueryWrapper<WarehouseInfo> qw);
int updateBySidIsDelete(List<String> list);

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

@@ -22,6 +22,12 @@
${ew.sqlSegment}
</where>
</select>
<select id="getWarehouseBySid" resultType="com.yxt.warehouse.biz.warehouseinfo.ProjectDetailsVo">
select
a.*
from warehouse_info a
where a.sid=#{sid}
</select>
<select id="listQuery1" resultType="com.yxt.warehouse.biz.warehouseinfo.ProjectDetailsVo">
select
a.*

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

@@ -111,6 +111,45 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
}
List<ProjectDetailsVo> storeInfos = baseMapper.listQuery(qw);
for (ProjectDetailsVo storeInfo : storeInfos) {
// 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]);
}
}
return rb.success().setData(storeInfos);
}
public ResultBean<ProjectDetailsVo> getWarehouseBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
ProjectDetailsVo storeInfo = baseMapper.getWarehouseBySid(sid);
List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid()));
if (warehouseInventories.size()!=0){
List<WarehouseInventoryRecord> list=warehouseInventoryRecordService.list(new QueryWrapper<WarehouseInventoryRecord>()
@@ -143,8 +182,7 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
storeInfo.setLatitude(w[1]);
storeInfo.setLongitude(w[0]);
}
}
return rb.success().setData(storeInfos);
return rb.success().setData(storeInfo);
}
public ResultBean<PagerVo<ProjectDetailsVo>> listPage1(PagerQuery<WarehouseInfoMapQuery> pq) {
ResultBean rb = ResultBean.fireFail();