From a04988607944831dae5c48685abcaafcaaeedba8 Mon Sep 17 00:00:00 2001 From: Richie <280645618@qq.com> Date: Mon, 2 Jun 2025 11:28:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E5=BA=93?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/qihang-oms-data.sql | 27 +- docs/qihang-oms.sql | 488 +++++++++--------- .../qihangerp/module/order/domain/OOrder.java | 62 ++- .../module/order/domain/OOrderItem.java | 58 ++- .../module/order/mapper/OOrderItemMapper.java | 11 +- .../module/order/mapper/OOrderMapper.java | 9 +- .../order/service/impl/OOrderServiceImpl.java | 22 +- .../resources/mapper/OOrderItemMapper.xml | 26 +- .../main/resources/mapper/OOrderMapper.xml | 36 +- update_log.md | 10 +- 10 files changed, 406 insertions(+), 343 deletions(-) diff --git a/docs/qihang-oms-data.sql b/docs/qihang-oms-data.sql index 55722802..15a929ad 100644 --- a/docs/qihang-oms-data.sql +++ b/docs/qihang-oms-data.sql @@ -11,7 +11,7 @@ Target Server Version : 80200 File Encoding : 65001 - Date: 01/06/2025 14:23:45 + Date: 02/06/2025 11:08:54 */ SET NAMES utf8mb4; @@ -263,17 +263,15 @@ INSERT INTO `sys_menu` VALUES (117, '菜单管理', 5, 1, 'menu', 'system/menu/i INSERT INTO `sys_menu` VALUES (2077, '店铺商品管理', 3, 21, 'shop_goods', 'shop/goods/index', NULL, 1, 0, 'C', '0', '0', '', 'shopping', 'admin', '2024-03-28 10:29:59', 'admin', '2025-03-24 12:37:43', ''); INSERT INTO `sys_menu` VALUES (2078, '添加ERP商品', 4, 99, 'create', 'goods/create', NULL, 1, 0, 'C', '1', '0', '', 'checkbox', 'admin', '2024-03-18 07:59:57', 'admin', '2024-09-07 16:41:46', ''); INSERT INTO `sys_menu` VALUES (2079, '字典管理', 5, 9, 'dict', 'system/dict/index', NULL, 1, 0, 'C', '0', '0', '', 'dict', 'admin', '2024-03-18 08:43:55', 'admin', '2024-03-18 08:44:08', ''); -INSERT INTO `sys_menu` VALUES (2084, '电子面单设置', 3, 22, 'ewaybill_account', 'shop/ewaybillAccount/index', NULL, 1, 0, 'C', '0', '0', '', 'code', 'admin', '2024-03-21 20:05:09', 'admin', '2025-05-19 14:17:30', ''); -INSERT INTO `sys_menu` VALUES (2086, '定时任务配置', 3, 80, 'task_list', 'shop/task/index', NULL, 1, 0, 'C', '0', '0', '', 'time-range', 'admin', '2024-03-22 19:29:20', 'admin', '2025-05-19 14:24:21', ''); INSERT INTO `sys_menu` VALUES (2087, '发货管理', 0, 20, 'ship', NULL, NULL, 1, 0, 'M', '0', '0', '', 'guide', 'admin', '2024-03-30 17:36:10', 'admin', '2024-08-25 15:45:48', ''); -INSERT INTO `sys_menu` VALUES (2088, '发货设置', 2087, 9, 'ship_logistics', 'shipping/logistics/index', NULL, 1, 0, 'C', '0', '0', '', 'checkbox', 'admin', '2024-03-30 17:37:01', 'admin', '2025-05-23 20:07:04', ''); -INSERT INTO `sys_menu` VALUES (2089, '发货记录', 2087, 3, 'record', 'shipping/index', NULL, 1, 0, 'C', '0', '0', '', 'guide', 'admin', '2024-03-30 17:37:42', 'admin', '2024-07-28 18:56:02', ''); +INSERT INTO `sys_menu` VALUES (2088, '发货设置', 2087, 9, 'ship_set', 'shipping/logistics/index', NULL, 1, 0, 'C', '0', '0', '', 'checkbox', 'admin', '2024-03-30 17:37:01', 'admin', '2025-06-01 15:02:10', ''); +INSERT INTO `sys_menu` VALUES (2089, '发货记录', 2087, 3, 'record', 'shipping/record/index', NULL, 1, 0, 'C', '0', '0', '', 'guide', 'admin', '2024-03-30 17:37:42', 'admin', '2025-06-02 09:45:44', ''); INSERT INTO `sys_menu` VALUES (2090, '角色管理', 5, 2, 'role', 'system/role/index', NULL, 1, 0, 'C', '0', '0', NULL, 'peoples', 'admin', '2024-03-31 12:40:50', '', NULL, ''); 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', '0', '0', NULL, 'chart', 'admin', '2024-04-06 18:58:06', '', NULL, ''); -INSERT INTO `sys_menu` VALUES (2094, '取号&发货', 2087, 1, 'print', 'shipping/ewaybillPrint/index', NULL, 1, 0, 'C', '0', '0', '', 'edit', 'admin', '2024-07-20 11:04:54', 'admin', '2025-05-17 20:17:32', ''); -INSERT INTO `sys_menu` VALUES (2096, '备货清单', 2087, 2, 'stockup', 'shipping/stockup', NULL, 1, 0, 'C', '0', '0', '', 'email', 'admin', '2024-07-20 11:53:24', 'admin', '2024-07-28 20:44:10', ''); +INSERT INTO `sys_menu` VALUES (2094, '电子面单发货', 2087, 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, '备货单', 2087, 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, '物流跟踪', 2087, 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', ''); INSERT INTO `sys_menu` VALUES (2100, '私域售后管理', 2, 3, 'offline_aftersale', 'refund/private/index', NULL, 1, 0, 'C', '0', '1', '', 'code', 'admin', '2024-07-27 17:33:33', 'admin', '2025-05-25 14:59:03', ''); @@ -360,7 +358,7 @@ CREATE TABLE `sys_role` ( -- Records of sys_role -- ---------------------------- INSERT INTO `sys_role` VALUES (1, '超级管理员', 'admin', 1, '1', 1, 1, '0', '0', 'admin', '2023-08-07 19:31:37', '', NULL, '超级管理员'); -INSERT INTO `sys_role` VALUES (2, '普通角色', 'common', 2, '2', 1, 1, '0', '0', 'admin', '2023-08-07 19:31:37', 'admin', '2025-03-02 15:55:27', '普通角色'); +INSERT INTO `sys_role` VALUES (2, '普通角色', 'common', 2, '2', 1, 1, '0', '0', 'admin', '2023-08-07 19:31:37', 'admin', '2025-06-02 08:58:07', '普通角色'); -- ---------------------------- -- Table structure for sys_role_menu @@ -388,9 +386,8 @@ INSERT INTO `sys_role_menu` VALUES (2, 106); INSERT INTO `sys_role_menu` VALUES (2, 108); INSERT INTO `sys_role_menu` VALUES (2, 110); INSERT INTO `sys_role_menu` VALUES (2, 112); +INSERT INTO `sys_role_menu` VALUES (2, 2077); INSERT INTO `sys_role_menu` VALUES (2, 2078); -INSERT INTO `sys_role_menu` VALUES (2, 2084); -INSERT INTO `sys_role_menu` VALUES (2, 2086); INSERT INTO `sys_role_menu` VALUES (2, 2087); INSERT INTO `sys_role_menu` VALUES (2, 2088); INSERT INTO `sys_role_menu` VALUES (2, 2089); @@ -404,11 +401,19 @@ INSERT INTO `sys_role_menu` VALUES (2, 2100); INSERT INTO `sys_role_menu` VALUES (2, 2101); INSERT INTO `sys_role_menu` VALUES (2, 2103); INSERT INTO `sys_role_menu` VALUES (2, 2104); +INSERT INTO `sys_role_menu` VALUES (2, 2105); +INSERT INTO `sys_role_menu` VALUES (2, 2106); INSERT INTO `sys_role_menu` VALUES (2, 2108); INSERT INTO `sys_role_menu` VALUES (2, 2109); INSERT INTO `sys_role_menu` VALUES (2, 2110); INSERT INTO `sys_role_menu` VALUES (2, 2111); INSERT INTO `sys_role_menu` VALUES (2, 2112); +INSERT INTO `sys_role_menu` VALUES (2, 2114); +INSERT INTO `sys_role_menu` VALUES (2, 2115); +INSERT INTO `sys_role_menu` VALUES (2, 2116); +INSERT INTO `sys_role_menu` VALUES (2, 2117); +INSERT INTO `sys_role_menu` VALUES (2, 2118); +INSERT INTO `sys_role_menu` VALUES (2, 2129); -- ---------------------------- -- Table structure for sys_task @@ -490,7 +495,7 @@ CREATE TABLE `sys_user` ( -- ---------------------------- -- Records of sys_user -- ---------------------------- -INSERT INTO `sys_user` VALUES (1, NULL, 'admin', '启航老齐A', '00', '280645618@qq.com', '18123879144', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2025-06-01 14:21:31', 'admin', '2023-08-07 19:31:37', '', '2025-06-01 14:21:31', '管理员'); +INSERT INTO `sys_user` VALUES (1, NULL, 'admin', '启航老齐A', '00', '280645618@qq.com', '18123879144', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2025-06-02 10:57:23', 'admin', '2023-08-07 19:31:37', '', '2025-06-02 10:57:22', '管理员'); INSERT INTO `sys_user` VALUES (2, NULL, 'openapi', 'openApi接口专用', '00', '2806456181@qq.com', '15818590000', '0', '', '$2a$10$fHkhoqbMiyracAsTzl38H.55bu.M.of1FXk2EK7RQBjfic3tLU0Ue', '0', '0', '127.0.0.1', '2024-06-24 10:23:35', 'admin', '2024-03-17 14:55:22', 'admin', '2024-06-24 10:23:35', NULL); INSERT INTO `sys_user` VALUES (101, 101, '15818590119', 'aaa123', '00', '', '', '0', '', '$2a$10$pXcT6cHaObMeKuYd9vZb5uEb8PyUdF2AcqqRN1cBqiA9rV4qYQW7G', '0', '2', '', NULL, 'admin', '2024-08-15 13:45:25', '', NULL, NULL); INSERT INTO `sys_user` VALUES (102, 101, '15818590119', '老齐', '00', '', '', '0', '', '$2a$10$ysk.zgJ8wh25c7vOjKyZ8uarM2hkG0S51j8GYdJSo2kZmc3f8HdKe', '0', '0', '', NULL, 'admin', '2024-08-15 13:49:59', 'admin', '2025-02-10 16:26:20', NULL); diff --git a/docs/qihang-oms.sql b/docs/qihang-oms.sql index e4978601..62e2daa5 100644 --- a/docs/qihang-oms.sql +++ b/docs/qihang-oms.sql @@ -11,7 +11,7 @@ Target Server Version : 80200 File Encoding : 65001 - Date: 01/06/2025 14:23:04 + Date: 02/06/2025 11:09:09 */ SET NAMES utf8mb4; @@ -47,6 +47,252 @@ CREATE TABLE `erp_echo_log` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '与erp系统接口交互记录' ROW_FORMAT = DYNAMIC; +-- ---------------------------- +-- Table structure for erp_shipment +-- ---------------------------- +DROP TABLE IF EXISTS `erp_shipment`; +CREATE TABLE `erp_shipment` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `shop_id` bigint NOT NULL COMMENT '店铺id', + `shop_type` int NOT NULL COMMENT '店铺类型', + `order_id` bigint NULL DEFAULT NULL COMMENT 'o_order表id', + `order_num` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号', + `order_time` datetime NULL DEFAULT NULL COMMENT '订单时间', + `shipper` int NOT NULL DEFAULT 0 COMMENT '发货方 0 仓库发货 1 供应商发货', + `supplier_id` bigint NOT NULL DEFAULT 0 COMMENT '供应商ID', + `supplier` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '供应商', + `ship_type` int NULL DEFAULT NULL COMMENT '发货类型（1订单发货2商品补发3商品换货）', + `ship_company` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司', + `ship_company_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '物流公司code', + `ship_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流单号', + `ship_fee` decimal(6, 2) NOT NULL DEFAULT 0.00 COMMENT '物流费用', + `ship_time` datetime NULL DEFAULT NULL COMMENT '发货时间', + `ship_operator` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货操作人', + `ship_status` int NULL DEFAULT NULL COMMENT '物流状态（0 待发货1已发货2已完成）', + `package_weight` float NULL DEFAULT NULL COMMENT '包裹重量', + `package_length` float NULL DEFAULT NULL COMMENT '包裹长度', + `package_width` float NULL DEFAULT NULL COMMENT '包裹宽度', + `package_height` float NULL DEFAULT NULL COMMENT '包裹高度', + `packsge_operator` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '打包操作人', + `packsge_time` datetime NULL DEFAULT NULL COMMENT '打包时间', + `packages` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '包裹内容JSON', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `create_time` datetime NULL DEFAULT NULL, + `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `update_time` datetime NULL DEFAULT NULL, + `update_by` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE, + INDEX `order_id_index`(`order_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货记录表' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for erp_shipment_item +-- ---------------------------- +DROP TABLE IF EXISTS `erp_shipment_item`; +CREATE TABLE `erp_shipment_item` ( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id，自增', + `shipment_id` bigint NOT NULL COMMENT '发货id', + `shipper` int NOT NULL COMMENT '发货方 0 仓库发货 1 供应商发货', + `supplier_id` bigint NOT NULL DEFAULT 0 COMMENT '供应商ID', + `supplier` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '供应商', + `shop_type` int NOT NULL COMMENT '店铺类型', + `shop_id` bigint NOT NULL COMMENT '店铺id', + `order_id` bigint NOT NULL COMMENT '订单 id', + `order_num` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '订单编号', + `order_time` datetime NULL DEFAULT NULL COMMENT '订单时间', + `order_item_id` bigint NOT NULL COMMENT '订单itemID（o_order_item外键）', + `erp_goods_id` bigint NOT NULL DEFAULT 0 COMMENT 'erp系统商品id', + `erp_sku_id` bigint NOT NULL DEFAULT 0 COMMENT 'erp系统商品规格id', + `goods_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', + `goods_img` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', + `goods_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', + `goods_spec` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格', + `sku_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', + `quantity` int NOT NULL COMMENT '商品数量', + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `stock_status` int NOT NULL COMMENT '仓库状态 0 备货中 1 已出库 2 已发走', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + PRIMARY KEY (`id`) USING BTREE, + INDEX `goodId_index`(`erp_goods_id`) USING BTREE, + INDEX `order_id`(`order_item_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货明细表' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for erp_stock_in +-- ---------------------------- +DROP TABLE IF EXISTS `erp_stock_in`; +CREATE TABLE `erp_stock_in` ( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `stock_in_num` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '入库单据编号', + `stock_in_type` int NOT NULL COMMENT '来源类型（1采购订单2退货订单）', + `source_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源单号', + `source_id` bigint NULL DEFAULT NULL COMMENT '来源单id', + `source_goods_unit` int NULL DEFAULT NULL COMMENT '采购订单商品数', + `source_spec_unit_total` int NULL DEFAULT NULL COMMENT '采购订单总件数', + `source_spec_unit` int NULL DEFAULT NULL COMMENT '采购订单商品规格数', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `stock_in_operator_id` bigint NULL DEFAULT NULL COMMENT '操作入库人id', + `stock_in_operator` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作入库人', + `stock_in_time` datetime NULL DEFAULT NULL COMMENT '入库时间', + `status` int NOT NULL DEFAULT 0 COMMENT '状态（0待入库1部分入库2全部入库）', + `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '入库单' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for erp_stock_in_item +-- ---------------------------- +DROP TABLE IF EXISTS `erp_stock_in_item`; +CREATE TABLE `erp_stock_in_item` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `stock_in_id` bigint NOT NULL COMMENT '入库单id', + `stock_in_type` int NULL DEFAULT NULL COMMENT '来源类型（1采购订单2退货订单）', + `source_no` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源单号', + `source_id` bigint NULL DEFAULT NULL COMMENT '来源单id', + `source_item_id` bigint NOT NULL COMMENT '来源单itemId', + `goods_id` bigint NOT NULL COMMENT '商品id', + `goods_num` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', + `goods_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品名称', + `goods_image` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', + `sku_id` bigint NOT NULL COMMENT '商品规格id', + `sku_code` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', + `sku_name` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '颜色', + `quantity` int NOT NULL COMMENT '原始数量', + `in_quantity` int NOT NULL DEFAULT 0 COMMENT '入库数量', + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注', + `status` int NULL DEFAULT 0 COMMENT '状态（0待入库1部分入库2全部入库）', + `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE, + INDEX `specIndex`(`sku_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '入库单明细' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for erp_stock_out +-- ---------------------------- +DROP TABLE IF EXISTS `erp_stock_out`; +CREATE TABLE `erp_stock_out` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `stock_out_num` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '出库单编号', + `source_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源单据号', + `source_id` bigint NULL DEFAULT NULL COMMENT '来源单据Id', + `stock_out_type` int NOT NULL DEFAULT 1 COMMENT '出库类型1订单拣货出库2采购退货出库3盘点出库4报损出库', + `goods_unit` int NOT NULL COMMENT '商品数', + `spec_unit` int NOT NULL COMMENT '商品规格数', + `spec_unit_total` int NOT NULL COMMENT '总件数', + `out_total` int NULL DEFAULT NULL COMMENT '已出库数量', + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `status` int NOT NULL COMMENT '状态：0待出库1部分出库2全部出库', + `print_status` int NOT NULL COMMENT '打印状态：是否打印1已打印0未打印', + `print_time` datetime NULL DEFAULT NULL COMMENT '打印时间', + `out_time` datetime NULL DEFAULT NULL COMMENT '出库时间', + `complete_time` datetime NULL DEFAULT NULL COMMENT '完成出库时间', + `operator_id` int NULL DEFAULT 0 COMMENT '出库操作人userid', + `operator_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出库操作人', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建日期', + `create_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `update_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '出库单' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for erp_stock_out_item +-- ---------------------------- +DROP TABLE IF EXISTS `erp_stock_out_item`; +CREATE TABLE `erp_stock_out_item` ( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `stock_out_type` int NOT NULL COMMENT '出库类型1订单拣货出库2采购退货出库3盘点出库4报损出库', + `entry_id` bigint NOT NULL COMMENT '出库单id（外键）', + `source_order_id` bigint NOT NULL COMMENT '来源订单id', + `source_order_item_id` bigint NOT NULL COMMENT '来源订单itemId出库对应的itemId，如：order_item表id、invoice_info表id', + `source_order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '来源订单号', + `goods_id` int NOT NULL COMMENT '商品id', + `spec_id` int NOT NULL COMMENT '商品规格id', + `spec_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '规格编码', + `original_quantity` bigint NOT NULL COMMENT '总数量', + `out_quantity` bigint NOT NULL DEFAULT 0 COMMENT '已出库数量', + `complete_time` datetime NULL DEFAULT NULL COMMENT '完成出库时间', + `picked_time` datetime NULL DEFAULT NULL COMMENT '完成拣货时间', + `status` int NOT NULL DEFAULT 0 COMMENT '状态：0待出库1部分出库2全部出库', + `create_time` datetime NULL DEFAULT NULL, + `update_time` datetime NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE, + INDEX `specIndex`(`spec_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '出库单明细' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for erp_stock_out_item_position +-- ---------------------------- +DROP TABLE IF EXISTS `erp_stock_out_item_position`; +CREATE TABLE `erp_stock_out_item_position` ( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `entry_id` bigint NOT NULL COMMENT '出库单ID', + `entry_item_id` bigint NOT NULL DEFAULT 0 COMMENT '出库单ItemID', + `goods_inventory_id` bigint NOT NULL DEFAULT 0 COMMENT '库存ID', + `goods_inventory_detail_id` bigint NOT NULL DEFAULT 0 COMMENT '库存详情ID', + `quantity` bigint NOT NULL DEFAULT 0 COMMENT '出库数量', + `location_id` int NULL DEFAULT NULL COMMENT '出库仓位ID', + `operator_id` int NULL DEFAULT 0 COMMENT '出库操作人userid', + `operator_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出库操作人', + `out_time` datetime NULL DEFAULT NULL COMMENT '出库时间', + PRIMARY KEY (`id`) USING BTREE, + INDEX `goods_stock_info_item_id_index`(`goods_inventory_detail_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '出库仓位详情' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for erp_warehouse +-- ---------------------------- +DROP TABLE IF EXISTS `erp_warehouse`; +CREATE TABLE `erp_warehouse` ( + `id` int NOT NULL AUTO_INCREMENT, + `number` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库编号', + `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库名称', + `province` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省', + `city` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市', + `district` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '区', + `street` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '街道', + `address` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地址', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `status` int NOT NULL DEFAULT 0 COMMENT '状态0禁用 1正常', + `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '仓库表' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for erp_warehouse_position +-- ---------------------------- +DROP TABLE IF EXISTS `erp_warehouse_position`; +CREATE TABLE `erp_warehouse_position` ( + `id` int NOT NULL AUTO_INCREMENT, + `warehouse_id` int NOT NULL COMMENT '仓库id', + `number` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库/货架编号', + `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓位/货架名称', + `parent_id` int NOT NULL COMMENT '上级id', + `depth` int NULL DEFAULT 1 COMMENT '层级深度1级2级3级', + `parent_id1` int NOT NULL COMMENT '一级类目id', + `parent_id2` int NOT NULL COMMENT '二级类目id', + `address` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地址', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `is_delete` int NOT NULL DEFAULT 0 COMMENT '0正常 1删除', + `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 25 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '仓库仓位表' ROW_FORMAT = DYNAMIC; + -- ---------------------------- -- Table structure for o_after_sale -- ---------------------------- @@ -416,7 +662,8 @@ CREATE TABLE `o_order` ( `city` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市', `town` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '区', `order_time` datetime NULL DEFAULT NULL COMMENT '订单时间', - `ship_type` int NOT NULL DEFAULT 0 COMMENT '发货方式 0 自己发货1联合发货2供应商发货', + `shipper` int NOT NULL DEFAULT 0 COMMENT '发货方式 0 自己发货1联合发货2供应商发货', + `ship_type` int NOT NULL DEFAULT 0 COMMENT '发货方式1电子面单发货2手动发货', `ship_status` int NOT NULL DEFAULT 0 COMMENT '发货状态 0 待发货 1 已分配供应商发货 2全部发货', `ship_company` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '发货快递公司', `ship_code` varchar(33) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货物流公司', @@ -458,8 +705,9 @@ CREATE TABLE `o_order_item` ( `refund_count` int NULL DEFAULT 0 COMMENT '已退货数量', `refund_status` int NULL DEFAULT NULL COMMENT '售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 ', `order_status` int NULL DEFAULT NULL COMMENT '订单状态1：待发货，2：已发货，3：已完成，11已取消；21待付款', - `ship_type` int NOT NULL DEFAULT 0 COMMENT '发货类型（0仓库发货；1供应商代发；2联合发货-实际上不存在这种情况）', - `ship_status` int NOT NULL DEFAULT 0 COMMENT '发货状态 0 待发货 1 已发货', + `shipper` int NOT NULL DEFAULT 0 COMMENT '发货方式 0 自己发货1联合发货2供应商发货', + `ship_type` int NOT NULL DEFAULT 0 COMMENT '发货方式1电子面单发货2手动发货', + `ship_status` int NOT NULL DEFAULT 0 COMMENT '发货状态 0 待发货 2全部发货', `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', @@ -598,65 +846,6 @@ CREATE TABLE `o_ship_waybill` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货-电子面单记录表（打单记录）' ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Table structure for o_shipment --- ---------------------------- -DROP TABLE IF EXISTS `o_shipment`; -CREATE TABLE `o_shipment` ( - `id` bigint NOT NULL AUTO_INCREMENT, - `shop_id` bigint NOT NULL COMMENT '店铺id', - `shipment_type` int NOT NULL COMMENT '发货类型（1订单发货2商品补发3商品换货）', - `order_nums` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货的所有订单号，以逗号隔开', - `receiver_name` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人姓名', - `receiver_mobile` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人手机号', - `province` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省', - `city` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市', - `town` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '区', - `address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '详细地址', - `logistics_company` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司', - `logistics_company_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司编码', - `logistics_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流单号', - `shipment_fee` decimal(6, 2) NULL DEFAULT NULL COMMENT '物流费用', - `shipment_time` datetime NULL DEFAULT NULL COMMENT '发货时间', - `shipment_operator` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货操作人', - `shipment_status` int NULL DEFAULT NULL COMMENT '物流状态（1运输中2已完成）', - `package_weight` float NULL DEFAULT NULL COMMENT '包裹重量', - `package_length` float NULL DEFAULT NULL COMMENT '包裹长度', - `package_width` float NULL DEFAULT NULL COMMENT '包裹宽度', - `package_height` float NULL DEFAULT NULL COMMENT '包裹高度', - `package_operator` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '打包操作人', - `package_time` datetime NULL DEFAULT NULL COMMENT '打包时间', - `packages` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '包裹内容JSON', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_time` datetime NULL DEFAULT NULL, - `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `update_time` datetime NULL DEFAULT NULL, - `update_by` datetime NULL DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货-发货记录表' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Table structure for o_shipment_item --- ---------------------------- -DROP TABLE IF EXISTS `o_shipment_item`; -CREATE TABLE `o_shipment_item` ( - `id` bigint NOT NULL AUTO_INCREMENT, - `shipment_id` bigint NOT NULL COMMENT '发货表id', - `order_id` bigint NULL DEFAULT NULL COMMENT 'o_order表id', - `order_item_id` bigint NULL DEFAULT NULL COMMENT 'o_order_item表id', - `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号（第三方平台）', - `sub_order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '子订单号（第三方平台）', - `goods_id` bigint NULL DEFAULT 0 COMMENT 'erp系统商品id', - `sku_id` bigint NULL DEFAULT 0 COMMENT 'erp系统商品规格id', - `goods_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', - `goods_img` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', - `goods_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', - `sku_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格', - `sku_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', - `quantity` int NOT NULL COMMENT '商品数量', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货-发货记录明细表' ROW_FORMAT = DYNAMIC; - -- ---------------------------- -- Table structure for o_shop -- ---------------------------- @@ -2348,177 +2537,4 @@ CREATE TABLE `scm_purchase_order_ship` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '采购订单物流表' ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Table structure for wms_stock_in --- ---------------------------- -DROP TABLE IF EXISTS `wms_stock_in`; -CREATE TABLE `wms_stock_in` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `stock_in_num` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '入库单据编号', - `stock_in_type` int NOT NULL COMMENT '来源类型（1采购订单2退货订单）', - `source_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源单号', - `source_id` bigint NULL DEFAULT NULL COMMENT '来源单id', - `source_goods_unit` int NULL DEFAULT NULL COMMENT '采购订单商品数', - `source_spec_unit_total` int NULL DEFAULT NULL COMMENT '采购订单总件数', - `source_spec_unit` int NULL DEFAULT NULL COMMENT '采购订单商品规格数', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `stock_in_operator_id` bigint NULL DEFAULT NULL COMMENT '操作入库人id', - `stock_in_operator` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作入库人', - `stock_in_time` datetime NULL DEFAULT NULL COMMENT '入库时间', - `status` int NOT NULL DEFAULT 0 COMMENT '状态（0待入库1部分入库2全部入库）', - `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '入库单' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Table structure for wms_stock_in_item --- ---------------------------- -DROP TABLE IF EXISTS `wms_stock_in_item`; -CREATE TABLE `wms_stock_in_item` ( - `id` bigint NOT NULL AUTO_INCREMENT, - `stock_in_id` bigint NOT NULL COMMENT '入库单id', - `stock_in_type` int NULL DEFAULT NULL COMMENT '来源类型（1采购订单2退货订单）', - `source_no` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源单号', - `source_id` bigint NULL DEFAULT NULL COMMENT '来源单id', - `source_item_id` bigint NOT NULL COMMENT '来源单itemId', - `goods_id` bigint NOT NULL COMMENT '商品id', - `goods_num` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', - `goods_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品名称', - `goods_image` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', - `sku_id` bigint NOT NULL COMMENT '商品规格id', - `sku_code` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', - `sku_name` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '颜色', - `quantity` int NOT NULL COMMENT '原始数量', - `in_quantity` int NOT NULL DEFAULT 0 COMMENT '入库数量', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注', - `status` int NULL DEFAULT 0 COMMENT '状态（0待入库1部分入库2全部入库）', - `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - INDEX `specIndex`(`sku_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '入库单明细' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Table structure for wms_stock_out --- ---------------------------- -DROP TABLE IF EXISTS `wms_stock_out`; -CREATE TABLE `wms_stock_out` ( - `id` bigint NOT NULL AUTO_INCREMENT, - `stock_out_num` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '出库单编号', - `source_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源单据号', - `source_id` bigint NULL DEFAULT NULL COMMENT '来源单据Id', - `stock_out_type` int NOT NULL DEFAULT 1 COMMENT '出库类型1订单拣货出库2采购退货出库3盘点出库4报损出库', - `goods_unit` int NOT NULL COMMENT '商品数', - `spec_unit` int NOT NULL COMMENT '商品规格数', - `spec_unit_total` int NOT NULL COMMENT '总件数', - `out_total` int NULL DEFAULT NULL COMMENT '已出库数量', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `status` int NOT NULL COMMENT '状态：0待出库1部分出库2全部出库', - `print_status` int NOT NULL COMMENT '打印状态：是否打印1已打印0未打印', - `print_time` datetime NULL DEFAULT NULL COMMENT '打印时间', - `out_time` datetime NULL DEFAULT NULL COMMENT '出库时间', - `complete_time` datetime NULL DEFAULT NULL COMMENT '完成出库时间', - `operator_id` int NULL DEFAULT 0 COMMENT '出库操作人userid', - `operator_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出库操作人', - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建日期', - `create_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', - `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `update_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '出库单' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Table structure for wms_stock_out_item --- ---------------------------- -DROP TABLE IF EXISTS `wms_stock_out_item`; -CREATE TABLE `wms_stock_out_item` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `stock_out_type` int NOT NULL COMMENT '出库类型1订单拣货出库2采购退货出库3盘点出库4报损出库', - `entry_id` bigint NOT NULL COMMENT '出库单id（外键）', - `source_order_id` bigint NOT NULL COMMENT '来源订单id', - `source_order_item_id` bigint NOT NULL COMMENT '来源订单itemId出库对应的itemId，如：order_item表id、invoice_info表id', - `source_order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '来源订单号', - `goods_id` int NOT NULL COMMENT '商品id', - `spec_id` int NOT NULL COMMENT '商品规格id', - `spec_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '规格编码', - `original_quantity` bigint NOT NULL COMMENT '总数量', - `out_quantity` bigint NOT NULL DEFAULT 0 COMMENT '已出库数量', - `complete_time` datetime NULL DEFAULT NULL COMMENT '完成出库时间', - `picked_time` datetime NULL DEFAULT NULL COMMENT '完成拣货时间', - `status` int NOT NULL DEFAULT 0 COMMENT '状态：0待出库1部分出库2全部出库', - `create_time` datetime NULL DEFAULT NULL, - `update_time` datetime NULL DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE, - INDEX `specIndex`(`spec_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '出库单明细' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Table structure for wms_stock_out_item_position --- ---------------------------- -DROP TABLE IF EXISTS `wms_stock_out_item_position`; -CREATE TABLE `wms_stock_out_item_position` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `entry_id` bigint NOT NULL COMMENT '出库单ID', - `entry_item_id` bigint NOT NULL DEFAULT 0 COMMENT '出库单ItemID', - `goods_inventory_id` bigint NOT NULL DEFAULT 0 COMMENT '库存ID', - `goods_inventory_detail_id` bigint NOT NULL DEFAULT 0 COMMENT '库存详情ID', - `quantity` bigint NOT NULL DEFAULT 0 COMMENT '出库数量', - `location_id` int NULL DEFAULT NULL COMMENT '出库仓位ID', - `operator_id` int NULL DEFAULT 0 COMMENT '出库操作人userid', - `operator_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出库操作人', - `out_time` datetime NULL DEFAULT NULL COMMENT '出库时间', - PRIMARY KEY (`id`) USING BTREE, - INDEX `goods_stock_info_item_id_index`(`goods_inventory_detail_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '出库仓位详情' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Table structure for wms_warehouse --- ---------------------------- -DROP TABLE IF EXISTS `wms_warehouse`; -CREATE TABLE `wms_warehouse` ( - `id` int NOT NULL AUTO_INCREMENT, - `number` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库名称', - `province` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省', - `city` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市', - `district` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '区', - `street` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '街道', - `address` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地址', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `status` int NOT NULL DEFAULT 0 COMMENT '状态0禁用 1正常', - `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '仓库表' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Table structure for wms_warehouse_position --- ---------------------------- -DROP TABLE IF EXISTS `wms_warehouse_position`; -CREATE TABLE `wms_warehouse_position` ( - `id` int NOT NULL AUTO_INCREMENT, - `warehouse_id` int NOT NULL COMMENT '仓库id', - `number` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库/货架编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓位/货架名称', - `parent_id` int NOT NULL COMMENT '上级id', - `depth` int NULL DEFAULT 1 COMMENT '层级深度1级2级3级', - `parent_id1` int NOT NULL COMMENT '一级类目id', - `parent_id2` int NOT NULL COMMENT '二级类目id', - `address` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地址', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `is_delete` int NOT NULL DEFAULT 0 COMMENT '0正常 1删除', - `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 25 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '仓库仓位表' ROW_FORMAT = DYNAMIC; - SET FOREIGN_KEY_CHECKS = 1; diff --git a/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java index a9985c6b..c7db4a8c 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java @@ -4,19 +4,19 @@ import cn.qihangerp.module.order.domain.vo.OrderDiscountVo; import cn.qihangerp.module.order.domain.vo.OrderItemListVo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; - import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - +import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; -import java.math.BigDecimal; import java.util.Date; import java.util.List; +import lombok.Data; + /** - * 订单表 + * OMS订单表 * @TableName o_order */ +@TableName(value ="o_order") @Data public class OOrder implements Serializable { /** @@ -66,7 +66,7 @@ public class OOrder implements Serializable { private Integer refundStatus; /** - * 订单状态1：待发货，2：已发货，3：已完成 + * 订单状态0：新订单，1：待发货，2：已发货，3：已完成，11已取消；12退款中；21待付款；22锁定，29删除，101部分发货 */ private Integer orderStatus; @@ -74,17 +74,31 @@ public class OOrder implements Serializable { * 订单商品金额 */ private Double goodsAmount; + + /** + * 订单运费 + */ private Double postFee; + /** + * 商家优惠金额，单位：元 + */ + private Double sellerDiscount; + + /** + * 平台优惠金额，单位：元 + */ + private Double platformDiscount; + /** * 订单实际金额 */ private Double amount; + + /** + * 实付金额 + */ private Double payment; - //平台优惠金额，单位：元 - private Double platformDiscount; - //商家优惠金额，单位：元 - private Double sellerDiscount; /** * 收件人姓名 @@ -122,19 +136,34 @@ public class OOrder implements Serializable { private Date orderTime; /** - * 发货类型（0仓库发货；1联合发货;2供应商代发；） + * 发货方式 0 自己发货1联合发货2供应商发货 + */ + private Integer shipper; + + /** + * 发货方式1电子面单发货2手动发货 */ private Integer shipType; + /** - * 发货状态 0 待发货 1 部分发货 2全部发货 + * 发货状态 0 待发货 1 已分配供应商发货 2全部发货 */ private Integer shipStatus; - private Integer erpPushStatus; - private String erpPushResult; - private Date erpPushTime; + /** + * 发货快递公司 + */ + private String shipCompany; + /** + * 发货物流公司 + */ + private String shipCode; + /** + * 发货时间 + */ + private Date shipTime; /** * 创建时间 @@ -155,7 +184,6 @@ public class OOrder implements Serializable { * 更新人 */ private String updateBy; - @TableField(exist = false) private List itemList; @@ -165,6 +193,6 @@ public class OOrder implements Serializable { @TableField(exist = false) private List discounts; + @TableField(exist = false) private static final long serialVersionUID = 1L; - } \ No newline at end of file diff --git a/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderItem.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderItem.java index a8bd2379..583da769 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderItem.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderItem.java @@ -3,16 +3,16 @@ package cn.qihangerp.module.order.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.util.Date; import lombok.Data; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - /** - * 订单明细表 + * OMS订单明细表 * @TableName o_order_item */ +@TableName(value ="o_order_item") @Data public class OOrderItem implements Serializable { /** @@ -22,24 +22,29 @@ public class OOrderItem implements Serializable { private String id; /** - * 订单ID（o_order外键） + * 店铺ID */ - private String orderId; + private Long shopId; + /** * 店铺类型 */ private Integer shopType; /** - * 店铺ID + * 订单ID（o_order外键） */ - private Long shopId; + private String orderId; + + /** + * 订单号（第三方平台） + */ + private String orderNum; /** * 子订单号（第三方平台） */ private String subOrderNum; - private String orderNum; /** * 第三方平台skuId @@ -47,12 +52,12 @@ public class OOrderItem implements Serializable { private String skuId; /** - * erp系统商品id + * 商品id(o_goods外键) */ private Long goodsId; /** - * erp系统商品规格id + * 商品skuid(o_goods_sku外键) */ private Long goodsSkuId; @@ -90,7 +95,15 @@ public class OOrderItem implements Serializable { * 子订单金额 */ private Double itemAmount; + + /** + * 子订单优惠金额 + */ private Double discountAmount; + + /** + * 实际支付金额 + */ private Double payment; /** @@ -112,14 +125,24 @@ public class OOrderItem implements Serializable { * 售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 */ private Integer refundStatus; - private Integer orderStatus; - private Integer hasPushErp;//是否推送到ERP + /** - * 发货类型（0仓库发货；1供应商代发；2联合发货） + * 订单状态1：待发货，2：已发货，3：已完成，11已取消；21待付款 + */ + private Integer orderStatus; + + /** + * 发货方式 0 自己发货1联合发货2供应商发货 + */ + private Integer shipper; + + /** + * 发货方式1电子面单发货2手动发货 */ private Integer shipType; + /** - * 发货状态 0 待发货 1 部分发货 2全部发货 + * 发货状态 0 待发货 2全部发货 */ private Integer shipStatus; @@ -143,7 +166,6 @@ public class OOrderItem implements Serializable { */ private String updateBy; + @TableField(exist = false) private static final long serialVersionUID = 1L; - - } \ No newline at end of file diff --git a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java index 0764e7a7..45d4bc5c 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java @@ -1,22 +1,19 @@ package cn.qihangerp.module.order.mapper; - import cn.qihangerp.module.order.domain.OOrderItem; import cn.qihangerp.module.order.domain.bo.OrderItemListBo; import cn.qihangerp.module.order.domain.vo.OrderItemListVo; import cn.qihangerp.module.order.domain.vo.SalesTopSkuVo; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; - import java.util.List; /** -* @author TW -* @description 针对表【o_order_item(订单明细表)】的数据库操作Mapper -* @createDate 2024-03-11 14:24:49 +* @author qilip +* @description 针对表【o_order_item(OMS订单明细表)】的数据库操作Mapper +* @createDate 2025-06-02 11:23:55 * @Entity cn.qihangerp.module.order.domain.OOrderItem */ public interface OOrderItemMapper extends BaseMapper { diff --git a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java index cf79d0dd..627e4fe2 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java @@ -1,19 +1,16 @@ package cn.qihangerp.module.order.mapper; - import cn.qihangerp.module.order.domain.OOrder; import cn.qihangerp.module.order.domain.vo.OrderDiscountVo; import cn.qihangerp.module.order.domain.vo.SalesDailyVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** -* @author TW -* @description 针对表【o_order(订单表)】的数据库操作Mapper -* @createDate 2024-03-11 14:24:49 +* @author qilip +* @description 针对表【o_order(OMS订单表)】的数据库操作Mapper +* @createDate 2025-06-02 11:23:22 * @Entity cn.qihangerp.module.order.domain.OOrder */ public interface OOrderMapper extends BaseMapper { 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 cd029b5e..50254ffc 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 @@ -1355,25 +1355,11 @@ public class OOrderServiceImpl extends ServiceImpl .eq(bo.getOrderStatus()!=null,OOrder::getOrderStatus,bo.getOrderStatus()) .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),OOrder::getOrderTime,bo.getStartTime()+" 00:00:00") .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),OOrder::getOrderTime,bo.getEndTime()+" 23:59:59") - .eq(bo.getErpPushStatus()!=null && bo.getErpPushStatus() == 0,OOrder::getErpPushStatus,0) - .eq(bo.getErpPushStatus()!=null && bo.getErpPushStatus() == 100,OOrder::getErpPushStatus,100) - .eq(bo.getErpPushStatus()!=null && bo.getErpPushStatus() == 200,OOrder::getErpPushStatus,200) - .gt(bo.getErpPushStatus()!=null && bo.getErpPushStatus() == 500,OOrder::getErpPushStatus,200) -// .eq(org.springframework.util.StringUtils.hasText(bo.getReceiverName()),OOrder::getReceiverName,bo.getReceiverName()) -// .like(org.springframework.util.StringUtils.hasText(bo.getReceiverMobile()),OOrder::getReceiverMobile,bo.getReceiverMobile()) + + .eq(org.springframework.util.StringUtils.hasText(bo.getReceiverName()),OOrder::getReceiverName,bo.getReceiverName()) + .like(org.springframework.util.StringUtils.hasText(bo.getReceiverMobile()),OOrder::getReceiverMobile,bo.getReceiverMobile()) ; -// if(bo.getErpPushStatus()!=null) { -// if (bo.getErpPushStatus() == 0) { -// // 未推送 -// queryWrapper.eq(OOrder::getErpPushResult, 0); -// } else if (bo.getErpPushStatus() == 200) { -// // 推送成功 -// queryWrapper.eq(OOrder::getErpPushResult, 200); -// } else if (bo.getErpPushStatus() == 500) { -// // 推送失败 -// queryWrapper.gt(OOrder::getErpPushResult, 200); -// } -// } + pageQuery.setOrderByColumn("order_time"); pageQuery.setIsAsc("desc"); Page pages = orderMapper.selectPage(pageQuery.build(), queryWrapper); diff --git a/module/order/src/main/resources/mapper/OOrderItemMapper.xml b/module/order/src/main/resources/mapper/OOrderItemMapper.xml index 796abe21..8b6c01bb 100644 --- a/module/order/src/main/resources/mapper/OOrderItemMapper.xml +++ b/module/order/src/main/resources/mapper/OOrderItemMapper.xml @@ -6,9 +6,10 @@ + + - - + @@ -27,9 +28,9 @@ + - @@ -37,12 +38,15 @@ - id,order_id,sub_order_num,shop_id,shop_type,ship_type,ship_status, + id,shop_id,shop_type, + order_id,order_num,sub_order_num, sku_id,goods_id,goods_sku_id, goods_title,goods_img,goods_num, - goods_spec,sku_num,goods_price,discount_amount, - item_amount,payment,quantity,remark, - refund_count,refund_status,order_status,has_push_erp,create_time, + goods_spec,sku_num,goods_price, + item_amount,discount_amount,payment, + quantity,remark,refund_count, + refund_status,order_status,shipper, + ship_type,ship_status,create_time, create_by,update_time,update_by @@ -54,7 +58,7 @@ left join o_goods_sku as gs on gs.id = oi.goods_sku_id WHERE 1=1 - and o.shop_id = #{qw.shopId} + and o.shop_id = #{qw.shopId} and oi.order_num = #{qw.orderNum} @@ -82,10 +86,10 @@ diff --git a/module/order/src/main/resources/mapper/OOrderMapper.xml b/module/order/src/main/resources/mapper/OOrderMapper.xml index 046da5f2..34d89de8 100644 --- a/module/order/src/main/resources/mapper/OOrderMapper.xml +++ b/module/order/src/main/resources/mapper/OOrderMapper.xml @@ -17,10 +17,10 @@ + + - - @@ -28,29 +28,37 @@ + + + + + + id,order_num,shop_type, + shop_id,remark,buyer_memo, + seller_memo,tag,refund_status, + order_status,goods_amount,post_fee, + seller_discount,platform_discount,amount, + payment,receiver_name,receiver_mobile, + address,province,city, + town,order_time,shipper, + ship_type,ship_status,ship_company, + ship_code,ship_time,create_time, + create_by,update_time,update_by + + - - id,order_num,shop_type, - shop_id,remark,buyer_memo, - seller_memo,tag,refund_status, - order_status,goods_amount,amount,platform_discount,seller_discount,payment,post_fee, - receiver_name,receiver_mobile,address, - province,city,town, - order_time,ship_type,ship_status,create_time, - create_by,update_time,update_by - diff --git a/update_log.md b/update_log.md index 3928c73c..7ece8094 100644 --- a/update_log.md +++ b/update_log.md @@ -3,11 +3,11 @@ #### v2.6.1 -+ [ ] 备货清单新增出库功能-减少库存; -+ [ ] 供应商备货清单新增手动录入发货物流功能; -+ [ ] 新增供应商发货物流录入功能； -+ [ ] 新增发货处理订单功能（分配供应商发货、手动发货） -+ [ ] 优化电子面单打印功能（打印快递单、发货、面单补打） ++ [ ] 完善手动发货； ++ [ ] 完善分配供应商发货； ++ [ ] 新增发货中心； ++ [ ] 完善备货清单-新增供应商备货订单； ++ [ ] 供应商备货订单新增录入供应商发货物流并同步到店铺发货功能；