Merge remote-tracking branch 'origin/master_0929' into master_0929

房远帅
2 parents 143cecd3 6a9d12e5
Showing 2 changed files with 56 additions and 31 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/ScSelectorController.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/order/PurchaseOrderInfoServiceImpl.java
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/ScSelectorController.java
View file @db5f249
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/ScSelectorController.java
View file @db5f249
@@ -6,18 +6,16 @@ import com.lframework.starter.web.core.components.resp.InvokeResult;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderInfoBo;
 import com.lframework.xingyun.sc.bo.paytype.OrderPayTypeBo;
 import com.lframework.xingyun.sc.bo.purchase.PurchaseOrderSelectorBo;
 import com.lframework.xingyun.sc.bo.purchase.receive.ReceiveSheetSelectorBo;
 import com.lframework.xingyun.sc.bo.stock.adjust.stock.reason.StockAdjustReasonSelectorBo;
 import com.lframework.xingyun.sc.bo.stock.take.plan.TakeStockPlanSelectorBo;
 import com.lframework.xingyun.sc.bo.stock.take.pre.PreTakeStockSheetSelectorBo;
-import com.lframework.xingyun.sc.entity.OrderPayType;
-import com.lframework.xingyun.sc.entity.PreTakeStockSheet;
-import com.lframework.xingyun.sc.entity.PurchaseOrder;
-import com.lframework.xingyun.sc.entity.ReceiveSheet;
-import com.lframework.xingyun.sc.entity.StockAdjustReason;
-import com.lframework.xingyun.sc.entity.TakeStockPlan;
+import com.lframework.xingyun.sc.entity.*;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService;
 import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService;
 import com.lframework.xingyun.sc.service.purchase.ReceiveSheetService;
@@ -31,11 +29,14 @@ import com.lframework.xingyun.sc.vo.stock.take.plan.TakeStockPlanSelectorVo;
 import com.lframework.xingyun.sc.vo.stock.take.pre.PreTakeStockSheetSelectorVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.util.List;
-import java.util.Objects;
+
+import java.util.*;
 import java.util.stream.Collectors;
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
+
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -73,6 +74,12 @@ public class ScSelectorController extends DefaultBaseController {
   @Autowired
   private StockAdjustReasonService stockAdjustReasonService;
+  @Resource
+  private PurchaseOrderInfoService orderInfoService;
+  @Resource
+  private PurchaseOrderLineService orderLineService;
+
+
   /**
    * 采购订单
    */
@@ -278,4 +285,44 @@ public class ScSelectorController extends DefaultBaseController {
         .collect(Collectors.toList());
     return InvokeResultBuilder.success(results);
   }
+
+    /**
+     * 根据ID加载订货单数据
+     */
+    @ApiOperation("根据ID加载订货单数据")
+    @PostMapping("/order/load")
+    public InvokeResult<List<GetPurchaseOrderInfoBo>> loadOrderInfo(@RequestBody(required = false) List<String> ids) {
+        if (CollectionUtil.isEmpty(ids)) {
+            return InvokeResultBuilder.success(CollectionUtil.emptyList());
+        }
+        List<PurchaseOrderInfo> orderInfoList = orderInfoService.listByIds(ids);
+        if (CollectionUtils.isEmpty(orderInfoList)) {
+            return new InvokeResult<>();
+        }
+        List<GetPurchaseOrderInfoBo> result = new ArrayList<>();
+        List<String> orderIds = new ArrayList<>();
+        for (PurchaseOrderInfo orderInfo : orderInfoList) {
+            GetPurchaseOrderInfoBo orderInfoBo = new GetPurchaseOrderInfoBo(orderInfo);
+            result.add(orderInfoBo);
+
+            orderIds.add(orderInfo.getId());
+        }
+        // 获取物料行数据
+        List<PurchaseOrderLine> orderLineList = orderLineService.listByOrderIds(orderIds);
+        if (CollectionUtils.isEmpty(orderLineList)) {
+            return InvokeResultBuilder.success(result);
+        }
+        Map<String, List<PurchaseOrderLine>> orderLineMap = new HashMap<>();
+        for (PurchaseOrderLine orderLine : orderLineList) {
+            String orderId = orderLine.getPurchaseOrderId();
+            List<PurchaseOrderLine> list = orderLineMap.computeIfAbsent(orderId, k -> new ArrayList<>());
+            list.add(orderLine);
+        }
+        for (GetPurchaseOrderInfoBo orderInfoBo : result) {
+            String orderId = orderInfoBo.getId();
+            List<PurchaseOrderLine> lineList = orderLineMap.get(orderId);
+            orderInfoBo.setPurchaseOrderLineList(lineList);
+        }
+        return InvokeResultBuilder.success(result);
+    }
 }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/order/PurchaseOrderInfoServiceImpl.java
View file @db5f249
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/order/PurchaseOrderInfoServiceImpl.java
View file @db5f249
@@ -103,29 +103,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     @Override
     public List<PurchaseOrderInfo> queryCanRevokeOrChangeList(QueryPurchaseOrderInfoVo vo) {
-        List<PurchaseOrderInfo> orderInfoList = getBaseMapper().queryCanRevokeOrChangeList(vo);
-        if (CollectionUtils.isEmpty(orderInfoList)) {
-            return new ArrayList<>();
-        }
-        List<String> orderIds = orderInfoList.stream().map(PurchaseOrderInfo::getId).distinct().collect(Collectors.toList());
-        // 获取物料行数据
-        List<PurchaseOrderLine> orderLineList = purchaseOrderLineService.listByOrderIds(orderIds);
-        if (CollectionUtils.isEmpty(orderLineList)) {
-            return orderInfoList;
-        }
-        Map<String, List<PurchaseOrderLine>> orderLineMap = new HashMap<>();
-        for (PurchaseOrderLine orderLine : orderLineList) {
-            String orderId = orderLine.getPurchaseOrderId();
-            List<PurchaseOrderLine> list = orderLineMap.computeIfAbsent(orderId, k -> new ArrayList<>());
-            list.add(orderLine);
-        }
-        for (PurchaseOrderInfo purchaseOrderInfo : orderInfoList) {
-            String orderId = purchaseOrderInfo.getId();
-            List<PurchaseOrderLine> lineList = orderLineMap.get(orderId);
-            purchaseOrderInfo.setPurchaseOrderLineList(lineList);
-        }
-
-        return orderInfoList;
+        return getBaseMapper().queryCanRevokeOrChangeList(vo);
     }
     @Override