From 3a123971b3b07001eb72413fa23f4a1f2121159e Mon Sep 17 00:00:00 2001 From: Richie <280645618@qq.com> Date: Sat, 24 May 2025 15:15:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BA=BF=E4=B8=8B=E6=B8=A0?= =?UTF-8?q?=E9=81=93=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oms/controller/ShopController.java | 2 +- .../qihangerp/request/OrderSearchRequest.java | 3 +- .../api/order/controller/OrderController.java | 31 +- .../tao/controller/TaoOrderController.java | 26 -- .../order/service/impl/OOrderServiceImpl.java | 11 +- vue/src/api/order/order.js | 16 +- vue/src/api/shipping/shipOrder.js | 13 - vue/src/api/tao/order.js | 18 - .../order/private/shipPrintOrderList.vue | 325 +++++++++--------- .../views/shipping/shipOrder/logistics.vue | 265 -------------- 10 files changed, 220 insertions(+), 490 deletions(-) delete mode 100644 vue/src/api/shipping/shipOrder.js delete mode 100644 vue/src/views/shipping/shipOrder/logistics.vue diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java index 87886b5f..31a41480 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java @@ -42,7 +42,7 @@ public class ShopController extends BaseController { { LambdaQueryWrapper qw = new LambdaQueryWrapper() .eq(shop.getType()!=null,OShop::getType,shop.getType()) - .ne(shop.getType()==null,OShop::getType,999) +// .ne(shop.getType()==null,OShop::getType,999) ; List list = shopService.list(qw); return getDataTable(list); diff --git a/core/common/src/main/java/cn/qihangerp/request/OrderSearchRequest.java b/core/common/src/main/java/cn/qihangerp/request/OrderSearchRequest.java index e9ae6a02..763eb074 100644 --- a/core/common/src/main/java/cn/qihangerp/request/OrderSearchRequest.java +++ b/core/common/src/main/java/cn/qihangerp/request/OrderSearchRequest.java @@ -4,7 +4,8 @@ import lombok.Data; @Data public class OrderSearchRequest { - private Integer shopId; + private Long shopId; + private Integer shopType; private String orderNum; private String orderStatus; private String startTime; diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java index 814a99ee..cf74be8c 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java @@ -4,6 +4,7 @@ package cn.qihangerp.api.order.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.TableDataInfo; +import cn.qihangerp.common.bo.ShopOrderShipBo; import cn.qihangerp.module.order.service.OOrderItemService; import cn.qihangerp.module.order.service.OOrderService; import cn.qihangerp.request.OrderSearchRequest; @@ -55,7 +56,7 @@ public class OrderController extends BaseController * @return */ @PostMapping("/pushErp/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { + public AjaxResult pushErp(@PathVariable Long[] ids) { // for (Long id : ids) { // OOrder oOrder = orderService.getById(id); // if (oOrder != null) { @@ -108,4 +109,32 @@ public class OrderController extends BaseController // return toAjax(result); // } + /** + * 订单发货(手动发货) + * @param shipBo + * @return + */ + @PostMapping("/manualShipment") + public AjaxResult manualShipment(@RequestBody ShopOrderShipBo shipBo) + { +// var result = orderService.manualShipmentOrder(shipBo,getUsername()); +// if(result.getCode() == 0) return AjaxResult.success(); +// else return AjaxResult.error(result.getMsg()); + return AjaxResult.error("未实现AAA"); + } + + /** + * 分配供应商发货 + * @param shipBo + * @return + */ + @PostMapping("/allocateShipmentOrder") + public AjaxResult allocateShipmentOrder(@RequestBody ShopOrderShipBo shipBo) + { +// var result = orderService.allocateShipmentOrder(shipBo,getUsername()); +// if(result.getCode() == 0) return AjaxResult.success(); +// else return AjaxResult.error(result.getMsg()); + return AjaxResult.error("未实现AAA"); + } + } diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java index 5d8f5280..b56fd209 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java @@ -56,31 +56,5 @@ public class TaoOrderController extends BaseController { return success(); } - /** - * 订单发货(手动发货) - * @param shipBo - * @return - */ - @PostMapping("/manualShipment") - public AjaxResult manualShipment(@RequestBody ShopOrderShipBo shipBo) - { -// var result = orderService.manualShipmentOrder(shipBo,getUsername()); -// if(result.getCode() == 0) return AjaxResult.success(); -// else return AjaxResult.error(result.getMsg()); - return AjaxResult.error("未实现"); - } - /** - * 分配供应商发货 - * @param shipBo - * @return - */ - @PostMapping("/allocateShipmentOrder") - public AjaxResult allocateShipmentOrder(@RequestBody ShopOrderShipBo shipBo) - { -// var result = orderService.allocateShipmentOrder(shipBo,getUsername()); -// if(result.getCode() == 0) return AjaxResult.success(); -// else return AjaxResult.error(result.getMsg()); - return AjaxResult.error("未实现"); - } } diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java index dbe47acc..b3f58d32 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java @@ -1192,7 +1192,7 @@ public class OOrderServiceImpl extends ServiceImpl } /** * 线下订单通知 - * @param orderId + * @param * @return */ @Transactional @@ -1239,7 +1239,7 @@ public class OOrderServiceImpl extends ServiceImpl orderMapper.insert(insert); // 插入orderItem - addOfflineOrderItem(insert.getId(), originOrder.getOrderNum(), originOrder.getOrderStatus(), originOrder.getRefundStatus()); + addOfflineOrderItem(insert.getId(), originOrder.getOrderNum(), originOrder.getOrderStatus(), originOrder.getRefundStatus(),insert.getShopId()); //更新推送状态 OfflineOrder offlineUpdate = new OfflineOrder(); @@ -1252,6 +1252,8 @@ public class OOrderServiceImpl extends ServiceImpl // 修改订单 (修改：) OOrder update = new OOrder(); update.setId(oOrders.get(0).getId()); + update.setShopType(EnumShopType.OFFLINE.getIndex()); + update.setShopId(originOrder.getShopId()); update.setRefundStatus(originOrder.getRefundStatus()); update.setOrderStatus(originOrder.getOrderStatus()); update.setReceiverName(originOrder.getReceiverName()); @@ -1266,12 +1268,14 @@ public class OOrderServiceImpl extends ServiceImpl } return ResultVo.success(); } - private void addOfflineOrderItem(String oOrderId,String originOrderNum,Integer orderStatus,Integer refundStatus){ + private void addOfflineOrderItem(String oOrderId,String originOrderNum,Integer orderStatus,Integer refundStatus,Long shopId){ List originOrderItems = offlineOrderItemMapper.selectList(new LambdaQueryWrapper().eq(OfflineOrderItem::getOrderNum, originOrderNum)); if(originOrderItems!=null && originOrderItems.size()>0) { for (var item : originOrderItems) { OOrderItem orderItem = new OOrderItem(); orderItem.setOrderId(oOrderId); + orderItem.setShopType(EnumShopType.OFFLINE.getIndex()); + orderItem.setShopId(shopId); orderItem.setOrderNum(originOrderNum); orderItem.setSubOrderNum(item.getSubOrderNum()); // 这里将订单商品skuid转换成erp系统的skuid @@ -1339,6 +1343,7 @@ public class OOrderServiceImpl extends ServiceImpl LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(bo.getShopId()!=null,OOrder::getShopId,bo.getShopId()) + .eq(bo.getShopType()!=null,OOrder::getShopType,bo.getShopType()) .eq(org.springframework.util.StringUtils.hasText(bo.getOrderNum()),OOrder::getOrderNum,bo.getOrderNum()) .eq(bo.getOrderStatus()!=null,OOrder::getOrderStatus,bo.getOrderStatus()) .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),OOrder::getOrderTime,bo.getStartTime()+" 00:00:00") diff --git a/vue/src/api/order/order.js b/vue/src/api/order/order.js index 1740ae24..9054c043 100644 --- a/vue/src/api/order/order.js +++ b/vue/src/api/order/order.js @@ -34,11 +34,23 @@ export function updateErpSkuId(data) { }) } -export function shipOrder(data) { + + +// 分配供应商发货 +export function allocateShipmentOrder(data) { return request({ - url: '/api/order/ship', + url: '/api/oms-api/order/allocateShipmentOrder', method: 'post', data: data }) } + +// 手动发货 +export function manualShipmentOrder(data) { + return request({ + url: '/api/oms-api/order/manualShipment', + method: 'post', + data: data + }) +} diff --git a/vue/src/api/shipping/shipOrder.js b/vue/src/api/shipping/shipOrder.js deleted file mode 100644 index d97f8206..00000000 --- a/vue/src/api/shipping/shipOrder.js +++ /dev/null @@ -1,13 +0,0 @@ -import request from '@/utils/request' - -// 查询打包发货列表 -export function listShipOrderWaybill(query) { - return request({ - url: '/api/oms-api/ship/order_waybill_list', - method: 'get', - params: query - }) -} - - - diff --git a/vue/src/api/tao/order.js b/vue/src/api/tao/order.js index e5e69347..dd49a260 100644 --- a/vue/src/api/tao/order.js +++ b/vue/src/api/tao/order.js @@ -44,22 +44,4 @@ export function pushOms(data) { }) } -// 分配供应商发货 -export function allocateShipmentOrder(data) { - return request({ - url: '/api/open-api/tao/order/allocateShipmentOrder', - method: 'post', - data: data - }) -} - - -// 手动发货 -export function manualShipmentOrder(data) { - return request({ - url: '/api/open-api/tao/order/manualShipment', - method: 'post', - data: data - }) -} diff --git a/vue/src/views/order/private/shipPrintOrderList.vue b/vue/src/views/order/private/shipPrintOrderList.vue index c737adbc..a9c506d9 100644 --- a/vue/src/views/order/private/shipPrintOrderList.vue +++ b/vue/src/views/order/private/shipPrintOrderList.vue @@ -30,38 +30,7 @@ end-placeholder="结束日期"> - - - - - - - - - - - - - - - - - + 搜索 重置 @@ -109,36 +78,44 @@ {{ shopList.find(x=>x.id === scope.row.shopId) ? shopList.find(x=>x.id === scope.row.shopId).name : '' }} - - - - - diff --git a/vue/src/views/shipping/shipOrder/logistics.vue b/vue/src/views/shipping/shipOrder/logistics.vue deleted file mode 100644 index 242fc873..00000000 --- a/vue/src/views/shipping/shipOrder/logistics.vue +++ /dev/null @@ -1,265 +0,0 @@ - - -