From be9679cbce23794881b766f2479b8b8c9089ec33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= <280645618@qq.com> Date: Sun, 25 Jan 2026 10:59:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96pdd=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/qihang-erp.sql | 2 +- .../model/request/OrderSearchRequest.java | 2 +- .../service/impl/OOrderServiceImpl.java | 2 +- .../service/impl/PddOrderServiceImpl.java | 5 ++ vue/src/views/order/order_list.vue | 56 ++++--------------- vue/src/views/pdd/order/index.vue | 9 +++ .../{wait_ship.vue => manual/index.vue} | 0 7 files changed, 29 insertions(+), 47 deletions(-) rename vue/src/views/shipping/{wait_ship.vue => manual/index.vue} (100%) diff --git a/docs/qihang-erp.sql b/docs/qihang-erp.sql index d738edf0..2a2d8141 100644 --- a/docs/qihang-erp.sql +++ b/docs/qihang-erp.sql @@ -3466,7 +3466,7 @@ INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path` INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) 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` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) 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` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) 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` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) 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` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2129, '手动发货', 6, 0, 'manual_shipment', 'shipping/manual/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` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2134, '店铺任务设置', 3, 30, 'task', 'shop/task/index', NULL, 1, 0, 'C', '0', '0', NULL, 'bug', 'admin', '2026-01-21 00:39:27', '', NULL, ''); COMMIT; diff --git a/model/src/main/java/cn/qihangerp/model/request/OrderSearchRequest.java b/model/src/main/java/cn/qihangerp/model/request/OrderSearchRequest.java index 7c97e62a..776b8ded 100644 --- a/model/src/main/java/cn/qihangerp/model/request/OrderSearchRequest.java +++ b/model/src/main/java/cn/qihangerp/model/request/OrderSearchRequest.java @@ -11,7 +11,7 @@ public class OrderSearchRequest { private String orderStatus; private String startTime; private String endTime; - private Integer erpPushStatus; + private Integer shipStatus; private String receiverName; private String receiverMobile; private String shippingNumber; diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java index 1d23c0bb..4f64376a 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java @@ -121,7 +121,7 @@ public class OOrderServiceImpl extends ServiceImpl .eq(bo.getOrderStatus()!=null,OOrder::getOrderStatus,bo.getOrderStatus()) .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),OOrder::getOrderCreateTime,bo.getStartTime()+" 00:00:00") .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),OOrder::getOrderCreateTime,bo.getEndTime()+" 23:59:59") - + .eq(bo.getShipStatus()!=null,OOrder::getShipStatus,bo.getShipStatus()) .eq(org.springframework.util.StringUtils.hasText(bo.getReceiverName()),OOrder::getReceiverName,bo.getReceiverName()) .like(org.springframework.util.StringUtils.hasText(bo.getReceiverMobile()),OOrder::getReceiverMobile,bo.getReceiverMobile()) ; diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/PddOrderServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/PddOrderServiceImpl.java index e2b8b308..f25d6060 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/PddOrderServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/PddOrderServiceImpl.java @@ -343,6 +343,11 @@ public class PddOrderServiceImpl extends ServiceImpl // 更新自己 PddOrder douOrderUpdate = new PddOrder(); douOrderUpdate.setId(pddOrder.getId()); + douOrderUpdate.setReceiverNameMask(confirmBo.getReceiver()); + douOrderUpdate.setReceiverAddressMask(confirmBo.getAddress()); + douOrderUpdate.setProvince(confirmBo.getProvince()); + douOrderUpdate.setCity(confirmBo.getCity()); + douOrderUpdate.setTown(confirmBo.getTown()); douOrderUpdate.setAuditStatus(1); douOrderUpdate.setAuditTime(new Date()); mapper.updateById(douOrderUpdate); diff --git a/vue/src/views/order/order_list.vue b/vue/src/views/order/order_list.vue index 7401ab86..dca59b65 100644 --- a/vue/src/views/order/order_list.vue +++ b/vue/src/views/order/order_list.vue @@ -35,30 +35,14 @@ end-placeholder="结束日期"> - - - - - + + + + + - - - - - - - - - - - - - - - - 搜索 重置 @@ -217,32 +201,16 @@ - + + - @@ -251,7 +219,7 @@ diff --git a/vue/src/views/pdd/order/index.vue b/vue/src/views/pdd/order/index.vue index 23c7a92f..7faefb49 100644 --- a/vue/src/views/pdd/order/index.vue +++ b/vue/src/views/pdd/order/index.vue @@ -154,6 +154,15 @@ + + +