|
@@ -1,6 +1,7 @@
|
|
|
package com.fjhx.purchase.service.subscribe.impl;
|
|
|
|
|
|
import cn.hutool.extra.spring.SpringUtil;
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
@@ -15,6 +16,8 @@ import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
|
|
|
import com.fjhx.purchase.service.subscribe.SubscribeService;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fjhx.purchase.util.code.CodeEnum;
|
|
|
+import com.fjhx.wms.entity.warehouse.po.Warehouse;
|
|
|
+import com.fjhx.wms.service.warehouse.WarehouseService;
|
|
|
import com.obs.services.internal.ServiceException;
|
|
|
import io.seata.spring.annotation.GlobalTransactional;
|
|
|
import org.apache.commons.collections4.MapUtils;
|
|
@@ -50,6 +53,9 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
|
|
|
@Autowired
|
|
|
private ProductInfoService productInfoService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ WarehouseService warehouseService;
|
|
|
+
|
|
|
@Override
|
|
|
public Page<SubscribeVo> getPage(SubscribeSelectDto dto) {
|
|
|
IWrapper<Subscribe> wrapper = getWrapper();
|
|
@@ -93,6 +99,17 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
|
|
|
}
|
|
|
}
|
|
|
subscribe.setSubscribeDetailList(subscribeDetailList);
|
|
|
+ //赋值维多利亚扩展收货仓库名
|
|
|
+ String victoriatouristJson = subscribe.getVictoriatouristJson();
|
|
|
+ if(ObjectUtils.isNotEmpty(victoriatouristJson)){
|
|
|
+ JSONObject json = JSONObject.parseObject(victoriatouristJson);
|
|
|
+ Long receiptWarehouseId = json.getLong("receiptWarehouseId");
|
|
|
+ Warehouse warehouse = warehouseService.getById(receiptWarehouseId);
|
|
|
+ if(ObjectUtils.isNotEmpty(victoriatouristJson)) {
|
|
|
+ json.put("receiptWarehouseName",warehouse.getName());
|
|
|
+ subscribe.setVictoriatouristJson(json.toJSONString());
|
|
|
+ }
|
|
|
+ }
|
|
|
return subscribe;
|
|
|
}
|
|
|
|