申购维多利亚

hx-purchase/src/main/java/com/fjhx/purchase/controller/subscribe/SubscribeController.java

@@ -46,6 +46,14 @@ public class SubscribeController {
     }
 
     /**
+     * 申购单明细 维多利亚
+     */
+    @PostMapping("/detailByWdly")
+    public Subscribe detailByWdly(@RequestBody BaseSelectDto dto) {
+        return subscribeService.detailByWdly(dto.getId());
+    }
+
+    /**
      * 申购单新增
      */
     @PostMapping("/add")

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/SubscribeService.java

@@ -27,6 +27,10 @@ public interface SubscribeService extends BaseService<Subscribe> {
      * 申购单明细
      */
     Subscribe detail(Long id);
+    /**
+     * 申购单明细 维多利亚
+     */
+    Subscribe detailByWdly(Long id);
 
     /**
      * 申购单新增

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeServiceImpl.java

@@ -6,29 +6,28 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.purchase.entity.subscribe.dto.SubscribeDto;
+import com.fjhx.purchase.entity.subscribe.dto.SubscribeSelectDto;
 import com.fjhx.purchase.entity.subscribe.po.Subscribe;
 import com.fjhx.purchase.entity.subscribe.po.SubscribeDetail;
+import com.fjhx.purchase.entity.subscribe.vo.SubscribeVo;
 import com.fjhx.purchase.mapper.subscribe.SubscribeMapper;
 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 com.ruoyi.common.utils.wrapper.IWrapper;
 import io.seata.spring.annotation.GlobalTransactional;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.subscribe.vo.SubscribeVo;
-import com.fjhx.purchase.entity.subscribe.dto.SubscribeSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.purchase.entity.subscribe.dto.SubscribeDto;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -40,7 +39,7 @@ import java.util.stream.Collectors;
  * 申购单 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-03
  */
 @DS(SourceConstant.PURCHASE)
@@ -66,29 +65,30 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
 
     /**
      * 详情
+     *
      * @param id
      * @return
      */
     @Override
     public Subscribe detail(Long id) {
-        if(ObjectUtils.isEmpty(id)){
+        if (ObjectUtils.isEmpty(id)) {
             throw new ServiceException("参数异常");
         }
         Subscribe subscribe = this.getById(id);
-        if(ObjectUtils.isEmpty(subscribe)){
+        if (ObjectUtils.isEmpty(subscribe)) {
             throw new ServiceException("数据不存在");
         }
         //处理申购产品
         List<SubscribeDetail> subscribeDetailList = subscribeDetailService.list(
                 Wrappers.<SubscribeDetail>query().lambda()
-                        .eq(SubscribeDetail::getSubscribeId,id));
-        if(CollectionUtils.isNotEmpty(subscribeDetailList)){
+                        .eq(SubscribeDetail::getSubscribeId, id));
+        if (CollectionUtils.isNotEmpty(subscribeDetailList)) {
             //根据申购businessId取出所有产品
             List<Long> productIds = subscribeDetailList.stream().map(SubscribeDetail::getBussinessId).collect(Collectors.toList());
             List<ProductInfoVo> productInfoVos = productInfoService.getListByProductIds(productIds);
             Map<Long, List<ProductInfoVo>> productMap = productInfoVos.stream().collect(Collectors.groupingBy(ProductInfoVo::getId));
-            for(SubscribeDetail s:subscribeDetailList){
-                if(MapUtils.isNotEmpty(productMap)){
+            for (SubscribeDetail s : subscribeDetailList) {
+                if (MapUtils.isNotEmpty(productMap)) {
                     ProductInfoVo p = productMap.get(s.getBussinessId()).get(0);
                     s.setProductCategory(p.getClassifyName());
                     s.setProductCode(p.getCode());
@@ -99,14 +99,20 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
             }
         }
         subscribe.setSubscribeDetailList(subscribeDetailList);
+        return subscribe;
+    }
+
+    @Override
+    public Subscribe detailByWdly(Long id) {
+        Subscribe subscribe = detail(id);
         //赋值维多利亚扩展收货仓库名
         String victoriatouristJson = subscribe.getVictoriatouristJson();
-        if(ObjectUtils.isNotEmpty(victoriatouristJson)){
+        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());
+            if (ObjectUtils.isNotEmpty(victoriatouristJson)) {
+                json.put("receiptWarehouseName", warehouse.getName());
                 subscribe.setVictoriatouristJson(json.toJSONString());
             }
         }
@@ -121,8 +127,8 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
         subscribe.setCode(CodeEnum.SUBSCRIBE.getCode());
         subscribeService.save(subscribe);
         List<SubscribeDetail> SubscribeDetails = subscribe.getSubscribeDetailList();
-        if(CollectionUtils.isNotEmpty(SubscribeDetails)){
-            for(SubscribeDetail s : SubscribeDetails){
+        if (CollectionUtils.isNotEmpty(SubscribeDetails)) {
+            for (SubscribeDetail s : SubscribeDetails) {
                 s.setSubscribeId(subscribe.getId());
             }
             subscribeDetailService.saveBatch(subscribe.getSubscribeDetailList());
@@ -131,6 +137,7 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
 
     /**
      * 编辑
+     *
      * @param subscribeDto
      */
     @GlobalTransactional