From cd84603cde812ff7d9dd4ae2209220c0792bbff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA=E8=80=81=E9=BD=90?= <280645618@qq.com> Date: Tue, 7 Oct 2025 11:40:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=91=E8=B4=A7=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oms/controller/LogisticsController.java | 6 ++++- docs/qihang-erp.sql | 4 ++-- .../order/service/impl/OOrderServiceImpl.java | 4 ++-- vue/src/views/shipping/shipment/wait_ship.vue | 24 +++++++++---------- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java index 8ad06ee0..bc2e74fa 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java @@ -77,5 +77,9 @@ public class LogisticsController extends BaseController { { return success(logisticsCompanyService.getById(id)); } - + @DeleteMapping("/logistics/{id}") + public AjaxResult remove(@PathVariable Long id) + { + return toAjax(logisticsCompanyService.removeById(id)); + } } diff --git a/docs/qihang-erp.sql b/docs/qihang-erp.sql index 519e34cb..b6807cdc 100644 --- a/docs/qihang-erp.sql +++ b/docs/qihang-erp.sql @@ -3216,7 +3216,7 @@ INSERT INTO `sys_menu` VALUES (2090, '角色管理', 5, 2, 'role', 'system/role/ INSERT INTO `sys_menu` VALUES (2091, '部门管理', 5, 3, 'dept', 'system/dept/index', NULL, 1, 0, 'C', '0', '0', NULL, 'tree', 'admin', '2024-03-31 12:42:57', '', NULL, ''); INSERT INTO `sys_menu` VALUES (2092, '售后处理记录', 2, 5, 'processing', 'afterSale/index', NULL, 1, 0, 'C', '0', '0', '', 'documentation', 'admin', '2024-04-06 17:27:03', 'admin', '2024-07-28 18:59:41', ''); INSERT INTO `sys_menu` VALUES (2093, '发货订单商品', 1, 2, 'order_item_list', 'order/item_list', NULL, 1, 0, 'C', '1', '0', '', 'chart', 'admin', '2024-04-06 18:58:06', 'admin', '2025-10-01 08:36:11', ''); -INSERT INTO `sys_menu` VALUES (2094, '电子面单发货', 6, 1, 'print', 'shipping/ewaybillPrint/index', NULL, 1, 0, 'C', '0', '0', '', 'edit', 'admin', '2024-07-20 11:04:54', 'admin', '2025-06-01 14:26:27', ''); +INSERT INTO `sys_menu` VALUES (2094, '打单发货', 6, 1, 'print', 'shipping/ewaybillPrint/index', NULL, 1, 0, 'C', '0', '0', '', 'edit', 'admin', '2024-07-20 11:04:54', 'admin', '2025-06-01 14:26:27', ''); INSERT INTO `sys_menu` VALUES (2096, '备货单', 6, 2, 'stockup', 'shipping/stockup', NULL, 1, 0, 'C', '0', '0', '', 'email', 'admin', '2024-07-20 11:53:24', 'admin', '2025-06-02 09:10:24', ''); INSERT INTO `sys_menu` VALUES (2097, '物流跟踪', 6, 5, 'logistics', 'shipping/stocking/index', NULL, 1, 0, 'C', '0', '1', '', 'list', 'admin', '2024-07-20 11:54:18', 'admin', '2025-05-25 14:32:27', ''); INSERT INTO `sys_menu` VALUES (2099, '私域订单管理', 1, 10, 'offline_order_list', 'order/private/index', NULL, 1, 0, 'C', '0', '1', '', 'checkbox', 'admin', '2024-07-27 17:33:03', 'admin', '2025-05-24 13:10:53', ''); @@ -3228,7 +3228,7 @@ INSERT INTO `sys_menu` VALUES (2115, '商品库存管理', 7, 0, 'goods_inventor INSERT INTO `sys_menu` VALUES (2116, '商品出库管理', 7, 20, 'stock_out', 'stock/stockOut/index', NULL, 1, 0, 'C', '0', '0', '', 'guide', 'admin', '2024-09-21 20:44:46', 'admin', '2025-03-24 13:46:42', ''); INSERT INTO `sys_menu` VALUES (2117, '仓位管理', 7, 91, 'position', 'stock/warehouse/position', NULL, 1, 0, 'C', '1', '0', '', '404', 'admin', '2024-09-22 11:52:18', 'admin', '2025-03-24 13:47:04', ''); INSERT INTO `sys_menu` VALUES (2118, '新建商品入库单', 7, 11, 'stock_in/create', 'stock/stockIn/create.vue', NULL, 1, 0, 'C', '1', '0', '', '404', 'admin', '2024-09-22 14:49:40', 'admin', '2025-03-24 13:35:30', ''); -INSERT INTO `sys_menu` VALUES (2129, '订单发货', 6, 0, 'manual_shipment', 'shipping/shipment/index', NULL, 1, 0, 'C', '0', '0', '', 'checkbox', 'admin', '2025-06-01 13:36:57', 'admin', '2025-10-02 00:15:02', ''); +INSERT INTO `sys_menu` VALUES (2129, '订单发货', 6, 0, 'ship_order', 'shipping/shipment/index', NULL, 1, 0, 'C', '0', '0', '', 'checkbox', 'admin', '2025-06-01 13:36:57', 'admin', '2025-10-02 00:15:02', ''); -- ---------------------------- -- Table structure for sys_menu2 diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java index bcd365c9..651c7890 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java @@ -841,7 +841,7 @@ public class OOrderServiceImpl extends ServiceImpl return ResultVo.success(); } - + @Transactional(rollbackFor = Exception.class) @Override public ResultVo cancelOrder(Long id, String cancelReason, String man) { OOrder shopOrder = this.baseMapper.selectById(id); @@ -879,7 +879,7 @@ public class OOrderServiceImpl extends ServiceImpl return ResultVo.success(); } - + @Transactional(rollbackFor = Exception.class) @Override public ResultVo cancelOrderItem(Long orderItemId, String cancelReason, String man) { OOrderItem shopOrderItem = orderItemMapper.selectById(orderItemId); diff --git a/vue/src/views/shipping/shipment/wait_ship.vue b/vue/src/views/shipping/shipment/wait_ship.vue index 8dcd9888..2fb9f4ff 100644 --- a/vue/src/views/shipping/shipment/wait_ship.vue +++ b/vue/src/views/shipping/shipment/wait_ship.vue @@ -221,16 +221,16 @@ - + - - - + + + - + @@ -305,16 +305,16 @@ - + - - - + + + - +