门店供应链物品管理/记录

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelGoodsOrderMgrController.java

@@ -140,7 +140,7 @@ public class ChannelGoodsOrderMgrController extends BaseApiController {
         goodsOrderItemQueryWrapper.eq("t1.order_id", order.getOrderId());
         List<ChannelGoodsOrderItemVO> orderItemVOList = channelGoodsOrderItemService.selectChannelGoodsOrderItemVOList(goodsOrderItemQueryWrapper);
 //        goodsOrderInfoVO.setDeliverList(userDeliverOrderItemService.getChannelGoodsDeliverItemList(order.getOrderId(), orderItemVOList));
-        goodsOrderInfoVO.setChannelGoodsOrderItem(orderItemVOList);
+        goodsOrderInfoVO.setItems(orderItemVOList);
         return AjaxResult.success(goodsOrderInfoVO);
     }
 

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelGoodsSettleMgrController.java

@@ -94,7 +94,7 @@ public class ChannelGoodsSettleMgrController extends BaseApiController {
                 channelGoodsOrderSettleVO.setTotalVerifyQty(channelGoodsList.stream().mapToInt(ChannelGoods::getVerifyQty).sum());
                 Integer totalPurchaseCost = 0;
                 for (ChannelGoods channelGoods : channelGoodsList) {
-                    totalPurchaseCost += channelGoods.getPurchaseCost() * channelGoods.getQuantity();
+                    totalPurchaseCost += channelGoods.getPurchaseCost() * channelGoods.getRemainQty();
                 }
                 channelGoodsOrderSettleVO.setTotalPurchaseCost(totalPurchaseCost);
                 channelGoodsOrderSettleVO.setStatus(channelGoodsList.get(0).getStatus());

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelGoodsOrderInfoVO.java

@@ -36,6 +36,6 @@ public class ChannelGoodsOrderInfoVO extends ChannelGoodsOrder {
     private String channelName;
 
     @ApiModelProperty("采购商品订单详情")
-    private List<ChannelGoodsOrderItemVO> channelGoodsOrderItem;
+    private List<ChannelGoodsOrderItemVO> items;
 
 }