完善备货单生成出库单

This commit is contained in:
启航老齐 2025-10-09 15:00:54 +08:00
parent 7db2690985
commit 9cce8e039f
31 changed files with 1336 additions and 2075 deletions

View File

@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
@Configuration
@MapperScan({"cn.qihangerp.module.*.mapper","cn.qihangerp.module.mapper"})
@MapperScan({"cn.qihangerp.module.*.mapper","cn.qihangerp.module.mapper","cn.qihangerp.mapper"})
public class MybatisPlusConfig {
@Primary
@Bean

View File

@ -4,7 +4,7 @@ import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.module.stock.domain.ErpStockOut;
import cn.qihangerp.model.entity.ErpStockOut;
import cn.qihangerp.module.stock.request.StockOutCreateRequest;
import cn.qihangerp.module.stock.request.StockOutItemRequest;
import cn.qihangerp.module.stock.service.ErpStockOutService;

View File

@ -0,0 +1,52 @@
package cn.qihangerp.common.enums;
/**
* 描述发货状态
*
*
* @author qlp
* @date 2019-09-18 19:44
*/
public enum EnumStockOutType {
//出库类型1订单拣货出库2采购退货出库3盘点出库4报损出库
DDCK("订单发货出库", 1),
PUR_RETURN("采购退货出库", 2),
PD("盘点出库", 3),
BS("报损出库", 4)
;
private String name;
private int index;
// 构造方法
private EnumStockOutType(String name, int index) {
this.name = name;
this.index = index;
}
// 普通方法
public static String getName(int index) {
for (EnumStockOutType c : EnumStockOutType.values()) {
if (c.getIndex() == index) {
return c.name;
}
}
return null;
}
// get set 方法
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getIndex() {
return index;
}
public void setIndex(int index) {
this.index = index;
}
}

View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.stock.mapper;
package cn.qihangerp.mapper;
import cn.qihangerp.module.stock.domain.ErpStockOutItem;
import cn.qihangerp.model.entity.ErpStockOutItem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**

View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.stock.mapper;
package cn.qihangerp.mapper;
import cn.qihangerp.module.stock.domain.ErpStockOut;
import cn.qihangerp.model.entity.ErpStockOut;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**

View File

@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.stock.mapper.ErpStockOutItemMapper">
<mapper namespace="cn.qihangerp.mapper.ErpStockOutItemMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.stock.domain.ErpStockOutItem">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.ErpStockOutItem">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="stockOutType" column="stock_out_type" jdbcType="INTEGER"/>
<result property="entryId" column="entry_id" jdbcType="BIGINT"/>

View File

@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.stock.mapper.ErpStockOutMapper">
<mapper namespace="cn.qihangerp.mapper.ErpStockOutMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.stock.domain.ErpStockOut">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.ErpStockOut">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="stockOutNum" column="stock_out_num" jdbcType="VARCHAR"/>
<result property="sourceNum" column="source_num" jdbcType="VARCHAR"/>

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.stock.domain;
package cn.qihangerp.model.entity;
import java.io.Serializable;
import java.util.Date;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.stock.domain;
package cn.qihangerp.model.entity;
import java.io.Serializable;
import java.util.Date;

View File

@ -11,7 +11,7 @@
Target Server Version : 80043 (8.0.43)
File Encoding : 65001
Date: 09/10/2025 10:52:19
Date: 09/10/2025 14:59:38
*/
SET NAMES utf8mb4;
@ -290,11 +290,13 @@ CREATE TABLE `erp_stock_out` (
`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;
) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '出库单' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of erp_stock_out
-- ----------------------------
INSERT INTO `erp_stock_out` VALUES (5, 'DDCK-20251009144849', '251002-171237742200640', 5, 1, 1, 1, 1, 0, '备货单生成出库单', 0, 0, NULL, NULL, NULL, 0, '', '2025-10-09 14:48:49', '备货单生成出库单', '2025-10-09 06:48:49', NULL);
INSERT INTO `erp_stock_out` VALUES (6, 'DDCK-20251009145209', '251002-171237742200640', 5, 1, 1, 1, 1, 0, '备货单生成出库单', 0, 0, NULL, NULL, NULL, 0, '', '2025-10-09 14:52:09', '备货单生成出库单', '2025-10-09 06:52:09', NULL);
-- ----------------------------
-- Table structure for erp_stock_out_item
@ -319,11 +321,13 @@ CREATE TABLE `erp_stock_out_item` (
`update_time` datetime NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE,
INDEX `specIndex`(`spec_id` ASC) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '出库单明细' ROW_FORMAT = DYNAMIC;
) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '出库单明细' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of erp_stock_out_item
-- ----------------------------
INSERT INTO `erp_stock_out_item` VALUES (5, 1, 5, 5, 6, '251002-171237742200640', 0, 45, 'LEDDP00102', 1, 0, NULL, NULL, 0, '2025-10-09 14:48:49', NULL);
INSERT INTO `erp_stock_out_item` VALUES (6, 1, 6, 5, 6, '251002-171237742200640', 0, 45, 'LEDDP00102', 1, 0, NULL, NULL, 0, '2025-10-09 14:52:09', NULL);
-- ----------------------------
-- Table structure for erp_stock_out_item_position
@ -501,11 +505,12 @@ CREATE TABLE `o_goods` (
UNIQUE INDEX `goods_id_unique`(`outer_erp_goods_id` ASC) USING BTREE,
INDEX `number`(`goods_num` ASC) USING BTREE,
INDEX `id`(`id` ASC) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'OMS商品表' ROW_FORMAT = DYNAMIC;
) ENGINE = InnoDB AUTO_INCREMENT = 17 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'OMS商品表' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of o_goods
-- ----------------------------
INSERT INTO `o_goods` VALUES (16, '雷士照明LED光源灯芯正品保障客厅卧室餐厅书房吸顶灯LED灯板替换', 'https://img.pddpic.com/mms-material-img/2025-05-29/25bf5df9-764b-428c-aae2-59c3ee16f7e6.jpeg.a.jpeg', NULL, 'LSZMLED001', '', 4, '', '', 1, 0, 0, 0, 0, 0, 0, 0, 0, '0', 22.90, 0.00, 0.00, NULL, 34, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 'admin', '2025-10-09 14:40:12', NULL, NULL, NULL, NULL, NULL);
-- ----------------------------
-- Table structure for o_goods_brand
@ -545,11 +550,13 @@ CREATE TABLE `o_goods_category` (
`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_0900_ai_ci ROW_FORMAT = DYNAMIC;
) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of o_goods_category
-- ----------------------------
INSERT INTO `o_goods_category` VALUES (3, 'ZM', '照明', NULL, 0, '', 0, NULL, 0, 'admin', '2025-10-09 14:36:08', NULL, NULL);
INSERT INTO `o_goods_category` VALUES (4, 'LED', 'LED光源', NULL, 3, '', 0, NULL, 0, 'admin', '2025-10-09 14:36:32', NULL, NULL);
-- ----------------------------
-- Table structure for o_goods_category_attribute
@ -562,11 +569,13 @@ CREATE TABLE `o_goods_category_attribute` (
`title` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '\'\'',
`code` char(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '固定值color颜色size尺码style款式',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of o_goods_category_attribute
-- ----------------------------
INSERT INTO `o_goods_category_attribute` VALUES (2, 3, 1, '颜色', 'color');
INSERT INTO `o_goods_category_attribute` VALUES (3, 3, 1, '亮度', 'size');
-- ----------------------------
-- Table structure for o_goods_category_attribute_value
@ -580,11 +589,15 @@ CREATE TABLE `o_goods_category_attribute_value` (
`orderNum` int NULL DEFAULT 0,
`isDelete` int NOT NULL DEFAULT 0,
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 427 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
) ENGINE = InnoDB AUTO_INCREMENT = 431 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of o_goods_category_attribute_value
-- ----------------------------
INSERT INTO `o_goods_category_attribute_value` VALUES (427, 2, '白光', '00', 0, 0);
INSERT INTO `o_goods_category_attribute_value` VALUES (428, 3, '12W', '12W', 0, 0);
INSERT INTO `o_goods_category_attribute_value` VALUES (429, 3, '18W', '18W', 0, 0);
INSERT INTO `o_goods_category_attribute_value` VALUES (430, 3, '24W', '24W', 0, 0);
-- ----------------------------
-- Table structure for o_goods_inventory
@ -607,11 +620,14 @@ CREATE TABLE `o_goods_inventory` (
`update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
PRIMARY KEY (`id`) USING BTREE,
INDEX `specIdIndex`(`sku_id` ASC) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 45 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品库存表' ROW_FORMAT = DYNAMIC;
) ENGINE = InnoDB AUTO_INCREMENT = 48 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品库存表' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of o_goods_inventory
-- ----------------------------
INSERT INTO `o_goods_inventory` VALUES (45, 16, 'LSZMLED001', NULL, NULL, 45, 'LSZMLED0010012W', NULL, 0, 0, '2025-10-09 14:40:12', '添加商品', '2025-10-09 06:40:12', NULL);
INSERT INTO `o_goods_inventory` VALUES (46, 16, 'LSZMLED001', NULL, NULL, 46, 'LSZMLED0010018W', NULL, 0, 0, '2025-10-09 14:40:12', '添加商品', '2025-10-09 06:40:12', NULL);
INSERT INTO `o_goods_inventory` VALUES (47, 16, 'LSZMLED001', NULL, NULL, 47, 'LSZMLED0010024W', NULL, 0, 0, '2025-10-09 14:40:12', '添加商品', '2025-10-09 06:40:12', NULL);
-- ----------------------------
-- Table structure for o_goods_inventory_batch
@ -717,11 +733,14 @@ CREATE TABLE `o_goods_sku` (
UNIQUE INDEX `sku_id_unique`(`outer_erp_sku_id` ASC) USING BTREE,
INDEX `id`(`id` ASC) USING BTREE,
INDEX `number`(`sku_code` ASC) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 45 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'OMS商品SKU表' ROW_FORMAT = DYNAMIC;
) ENGINE = InnoDB AUTO_INCREMENT = 48 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'OMS商品SKU表' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of o_goods_sku
-- ----------------------------
INSERT INTO `o_goods_sku` VALUES (45, 16, NULL, NULL, '雷士照明LED光源灯芯正品保障客厅卧室餐厅书房吸顶灯LED灯板替换', NULL, '白光 12W', 'LSZMLED0010012W', NULL, 427, '白光', 'https://img.pddpic.com/mms-material-img/2025-05-29/25bf5df9-764b-428c-aae2-59c3ee16f7e6.jpeg.a.jpeg', NULL, 428, '12W', NULL, 0, '', NULL, 22.90, 0.00, 0.00, '', 1, 0, 0, NULL, '2025-10-09 06:40:12', NULL);
INSERT INTO `o_goods_sku` VALUES (46, 16, NULL, NULL, '雷士照明LED光源灯芯正品保障客厅卧室餐厅书房吸顶灯LED灯板替换', NULL, '白光 18W', 'LSZMLED0010018W', NULL, 427, '白光', 'https://img.pddpic.com/mms-material-img/2025-05-29/25bf5df9-764b-428c-aae2-59c3ee16f7e6.jpeg.a.jpeg', NULL, 429, '18W', NULL, 0, '', NULL, 22.90, 0.00, 0.00, '', 1, 0, 0, NULL, '2025-10-09 06:40:12', NULL);
INSERT INTO `o_goods_sku` VALUES (47, 16, NULL, NULL, '雷士照明LED光源灯芯正品保障客厅卧室餐厅书房吸顶灯LED灯板替换', NULL, '白光 24W', 'LSZMLED0010024W', NULL, 427, '白光', 'https://img.pddpic.com/mms-material-img/2025-05-29/25bf5df9-764b-428c-aae2-59c3ee16f7e6.jpeg.a.jpeg', NULL, 430, '24W', NULL, 0, '', NULL, 22.90, 0.00, 0.00, '', 1, 0, 0, NULL, '2025-10-09 06:40:12', NULL);
-- ----------------------------
-- Table structure for o_goods_sku_attr
@ -737,11 +756,16 @@ CREATE TABLE `o_goods_sku_attr` (
`v` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`img` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of o_goods_sku_attr
-- ----------------------------
INSERT INTO `o_goods_sku_attr` VALUES (1, 16, 'color', '颜色', 114, 427, NULL, NULL);
INSERT INTO `o_goods_sku_attr` VALUES (2, 16, 'size', '尺码', 115, 428, NULL, NULL);
INSERT INTO `o_goods_sku_attr` VALUES (3, 16, 'size', '尺码', 115, 429, NULL, NULL);
INSERT INTO `o_goods_sku_attr` VALUES (4, 16, 'size', '尺码', 115, 430, NULL, NULL);
INSERT INTO `o_goods_sku_attr` VALUES (5, 16, 'style', '款式', 116, 427, NULL, NULL);
-- ----------------------------
-- Table structure for o_goods_supplier
@ -792,13 +816,14 @@ CREATE TABLE `o_logistics_company` (
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`status` int NULL DEFAULT NULL COMMENT '状态0禁用1启用',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '快递公司表' ROW_FORMAT = DYNAMIC;
) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '快递公司表' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of o_logistics_company
-- ----------------------------
INSERT INTO `o_logistics_company` VALUES (1, 100, NULL, NULL, 'aad', 'avd', 'aaa', 1);
INSERT INTO `o_logistics_company` VALUES (2, 400, NULL, NULL, 'JTSD', '极兔速递', NULL, 1);
INSERT INTO `o_logistics_company` VALUES (4, 300, NULL, NULL, 'AA', 'AA', NULL, 1);
-- ----------------------------
-- Table structure for o_order
@ -851,13 +876,11 @@ INSERT INTO `o_order` VALUES (40, '6946634625004279575', 400, 1007, NULL, '', ''
INSERT INTO `o_order` VALUES (41, '6921344645306088915', 400, 1007, NULL, '', '', NULL, 1, 1, 0, 0, 0, 0, 0, 0.02, '仇*', '1**********', '*************', '山东省', '威海市', '环翠区', '2025-09-23 10:52:56', -1, 0, 0, '0', NULL, NULL, '2025-10-01 23:19:13', '手动确认订单', NULL, NULL, NULL);
INSERT INTO `o_order` VALUES (42, '6946198576192755115', 400, 1007, NULL, '', '', NULL, 1, 1, 0, 0, 0, 0, 0, 0.2, '雨*', '1**********', '**************', '浙江省', '杭州市', '余杭区', '2025-09-17 09:52:51', -1, 0, 0, '0', NULL, NULL, '2025-10-01 23:19:51', '手动确认订单', NULL, NULL, NULL);
INSERT INTO `o_order` VALUES (71, '6946157501303494059', 400, 1007, NULL, '', '', NULL, 1, 1, 0, 0, 0, 0, 0, 0, '雨*', '1**********', '**************', '浙江省', '杭州市', '余杭区', '2025-10-02 15:37:01', -1, 0, 0, '0', NULL, NULL, '2025-10-02 15:37:01', '手动确认订单', NULL, NULL, NULL);
INSERT INTO `o_order` VALUES (72, '4781369664948623818', 100, 1010, NULL, NULL, NULL, NULL, 1, 2, 12996, 0, 0, 0, 12996, 4060, '君**', '***********', '姚*街道**广场吾悦华府(南区**号**单元****', '山西省', '运城市', '盐湖区', '2025-10-01 17:40:02', 0, 2, 2, '0', NULL, NULL, '2025-10-06 09:40:31', '手动确认订单', '2025-10-06 20:12:09', '手动发货', NULL);
INSERT INTO `o_order` VALUES (73, '6921346817299348947', 400, 1007, NULL, '', '', NULL, 1, 1, 0, 0, 0, 0, 0, 0.03, '仇*', '1**********', '*************', '山东省', '威海市', '环翠区', '2025-10-06 09:57:09', -1, 0, 0, '0', NULL, NULL, '2025-10-06 09:57:09', '手动确认订单', NULL, NULL, NULL);
INSERT INTO `o_order` VALUES (74, '6921377343921159820', 400, 1007, NULL, '', '', NULL, 1, 2, 0, 0, 0, 0, 0, 0, '新*', '1**********', '***', '四川省', '成都市', '金牛区', '2025-10-06 10:16:50', 0, 2, 2, '0', NULL, NULL, '2025-10-06 10:16:50', '手动确认订单', '2025-10-06 20:30:12', '手动发货', NULL);
INSERT INTO `o_order` VALUES (75, '251002-171237742200640', 300, 1011, NULL, '', '', NULL, 1, 1, 12.49, 0, 0, 0, 12.49, 12.49, '彭**', '***********', '江西省***********************', '江西省', '南昌市', '西湖区', '2025-10-02 03:56:59', -1, 0, 0, '0', NULL, NULL, '2025-10-06 10:18:41', '手动确认订单', NULL, NULL, NULL);
INSERT INTO `o_order` VALUES (75, '251002-171237742200640', 300, 1011, NULL, '', '', NULL, 1, 2, 12.49, 0, 0, 0, 12.49, 12.49, '彭**', '***********', '江西省***********************', '江西省', '南昌市', '西湖区', '2025-10-02 03:56:59', 0, 0, 2, 'AA', 'AAAAA', NULL, '2025-10-06 10:18:41', '手动确认订单', '2025-10-09 12:53:46', '手动发货', NULL);
INSERT INTO `o_order` VALUES (76, '251002-085338365560640', 300, 1011, NULL, '', '', NULL, 1, 2, 9.9, 0, 0, 0, 9.9, 9.9, '彭**', '***********', '江西省***********************', '江西省', '南昌市', '西湖区', '2025-10-02 03:56:23', 34, 2, 2, '极兔速递', 'aaaaa', NULL, '2025-10-06 10:19:13', '手动确认订单', '2025-10-07 16:02:43', '供应商发货确认-全部发货完成', NULL);
INSERT INTO `o_order` VALUES (77, '3731295703781745408', 500, 1012, NULL, '', '', NULL, 1, 11, 39.9, 0, 0, 0, 39.9, 39.9, '齐**', '158****0119', '****', '广东省', '深圳市', '宝安区', '2025-10-02 10:55:14', -1, 0, 0, '0', NULL, NULL, '2025-10-06 10:31:11', '手动确认订单', '2025-10-07 08:23:08', 'admin 操作取消订单', 'aa');
INSERT INTO `o_order` VALUES (78, '4781177713430610710', 100, 1010, NULL, NULL, NULL, NULL, 1, 2, 4999, 0, 0, 0, 4999, 942, '潘**', '***********', '大*镇**路***号澜溪花苑***号', '浙江省', '台州市', '温岭市', '2025-10-01 17:16:36', 0, 2, 2, '0', NULL, NULL, '2025-10-06 10:41:40', '手动确认订单', '2025-10-06 20:03:03', '手动发货', NULL);
-- ----------------------------
-- Table structure for o_order_item
@ -908,18 +931,14 @@ INSERT INTO `o_order_item` VALUES (46, 1007, 400, 41, '6921344645306088915', '69
INSERT INTO `o_order_item` VALUES (47, 1007, 400, 42, '6946198576192755115', '6946198576192755115', '3553832070819586', 0, 0, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子组合商品2', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', '0', NULL, '', 0, 0, 0, 0, 1, NULL, 0, 1, NULL, -1, 0, 0, '2025-10-01 23:19:51', '手动确认订单', NULL, NULL);
INSERT INTO `o_order_item` VALUES (48, 1007, 400, 42, '6946198576192755115', '6946198576192820651', '3553850395099138', 0, 0, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子舒淇轮胎', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', '0', NULL, '', 0, 0, 0, 0, 1, NULL, 0, 1, NULL, -1, 0, 0, '2025-10-01 23:19:51', '手动确认订单', NULL, NULL);
INSERT INTO `o_order_item` VALUES (49, 1007, 400, 71, '6946157501303494059', '6946157501303494059', '3551675625798914', 0, 0, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子组合商品', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', '0', '[{\"name\":\"尺码大小\",\"value\":\"M\"},{\"name\":\"颜色分类\",\"value\":\"红色\"}]', '', 0, 0, 0, 0, 1, NULL, 0, 1, NULL, -1, 0, 0, '2025-10-02 15:37:01', '手动确认订单', NULL, NULL);
INSERT INTO `o_order_item` VALUES (50, 1010, 100, 72, '4781369664948623818', '4781369664949623818', '5380261056537', 0, 0, '【活动价】曲美lab墩墩沙发现代别墅客厅沙发组合沙发配件', 'https://img.alicdn.com/bao/uploaded/i2/351855490/O1CN01FiUI0u1qQTMAdoqZa_!!351855490.jpg', NULL, '适用人数:组合;颜色分类:蔷薇粉【灯芯绒】;尺寸:84x20x52cm', 'F7-23E-LAB-SJDZ-1', 1499, 1499, 0, 0, 1, NULL, 0, 1, NULL, -1, 0, 0, '2025-10-06 09:40:32', '手动确认订单', NULL, NULL);
INSERT INTO `o_order_item` VALUES (51, 1010, 100, 72, '4781369664948623818', '4781369664950623818', '5380261056515', 0, 0, '【活动价】曲美lab墩墩沙发现代别墅客厅沙发组合沙发配件', 'https://img.alicdn.com/bao/uploaded/i2/351855490/O1CN01FiUI0u1qQTMAdoqZa_!!351855490.jpg', NULL, '适用人数:组合;颜色分类:奶茶灰【灯芯绒】;尺寸:84x20x52cm', 'F2-23E-LAB-SJDZ-1', 1499, 1499, 0, 0, 1, NULL, 0, 1, NULL, -1, 0, 0, '2025-10-06 09:40:32', '手动确认订单', NULL, NULL);
INSERT INTO `o_order_item` VALUES (52, 1010, 100, 72, '4781369664948623818', '4781369664951623818', '5340247493414', 0, 0, '【活动价】曲美lab墩墩沙发现代简约模块布艺真皮沙发别墅客厅沙发自由搭配', 'https://img.alicdn.com/bao/uploaded/i4/351855490/O1CN01NspmnZ1qQTLR1LBVt_!!351855490.png', NULL, '适用人数:组合;颜色分类:灯芯绒扶手-燕麦白;尺寸:96x24x60cm', 'F1-23E-LAB-FS', 4999, 9998, 0, 0, 2, NULL, 0, 1, NULL, -1, 0, 0, '2025-10-06 09:40:32', '手动确认订单', NULL, NULL);
INSERT INTO `o_order_item` VALUES (53, 1007, 400, 73, '6921346817299348947', '6921346817299348947', '3415147054563330', 0, 0, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', '0', NULL, '', 0, 0, 0, 0, 3, NULL, 0, 1, NULL, -1, 0, 0, '2025-10-06 09:57:09', '手动确认订单', NULL, NULL);
INSERT INTO `o_order_item` VALUES (54, 1007, 400, 74, '6921377343921159820', '6921377343921159820', '3415147054562818', 0, 0, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', '0', '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"XL\"}]', '', 0, 0, 0, 0, 1, NULL, 0, 1, NULL, 0, 2, 2, '2025-10-06 10:16:50', '手动确认订单', '2025-10-06 20:30:07', '手动发货');
INSERT INTO `o_order_item` VALUES (55, 1007, 400, 74, '6921377343921159820', '6921377343921225356', '3415147054562562', 0, 0, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', '0', '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"L\"}]', '', 0, 0, 0, 0, 1, NULL, 0, 1, NULL, 0, 2, 2, '2025-10-06 10:16:50', '手动确认订单', '2025-10-06 20:30:12', '手动发货');
INSERT INTO `o_order_item` VALUES (56, 1007, 400, 74, '6921377343921159820', '6921377343921290892', '3415147054562306', 0, 0, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', '0', '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"M\"}]', '', 0, 0, 0, 0, 1, NULL, 0, 1, NULL, 0, 2, 2, '2025-10-06 10:16:50', '手动确认订单', '2025-10-06 20:30:12', '手动发货');
INSERT INTO `o_order_item` VALUES (57, 1007, 400, 74, '6921377343921159820', '6921377343921356428', '3415147054562050', 0, 0, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', '0', '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"S\"}]', '', 0, 0, 0, 0, 1, NULL, 0, 1, NULL, 0, 2, 2, '2025-10-06 10:16:50', '手动确认订单', '2025-10-06 20:30:12', '手动发货');
INSERT INTO `o_order_item` VALUES (58, 1011, 300, 75, '251002-171237742200640', '251002-171237742200640-1742373848730', '1742373848730', 0, 0, NULL, 'https://img.pddpic.com/mms-material-img/2025-06-02/0d875ad2-529b-43be-b699-96748b4c0bb4.jpeg.a.jpeg', 'LEDDP001', 'E27螺口 5瓦白光 1级能效', 'LEDDP00102', 12.49, 12.49, 0, 0, 1, NULL, 0, 1, NULL, -1, 0, 0, '2025-10-06 10:18:41', '手动确认订单', NULL, NULL);
INSERT INTO `o_order_item` VALUES (58, 1011, 300, 75, '251002-171237742200640', '251002-171237742200640-1742373848730', '1742373848730', 0, 0, NULL, 'https://img.pddpic.com/mms-material-img/2025-06-02/0d875ad2-529b-43be-b699-96748b4c0bb4.jpeg.a.jpeg', 'LEDDP001', 'E27螺口 5瓦白光 1级能效', 'LEDDP00102', 12.49, 12.49, 0, 0, 1, NULL, 0, 1, NULL, 0, 0, 2, '2025-10-06 10:18:41', '手动确认订单', '2025-10-09 12:53:46', '手动发货');
INSERT INTO `o_order_item` VALUES (59, 1011, 300, 76, '251002-085338365560640', '251002-085338365560640-1742373848729', '1742373848729', 0, 0, NULL, 'https://img.pddpic.com/mms-material-img/2025-06-02/0d875ad2-529b-43be-b699-96748b4c0bb4.jpeg.a.jpeg', 'LEDDP001', 'E27螺口 3瓦白光 1级能效', 'LEDDP00101', 9.9, 9.9, 0, 0, 1, NULL, 0, 1, 2, 34, 2, 2, '2025-10-06 10:19:13', '手动确认订单', '2025-10-07 16:02:43', '供应商发货手动确认');
INSERT INTO `o_order_item` VALUES (60, 1012, 500, 77, '3731295703781745408', '3731295703781745408-3531475359', '3531475359', 0, 0, '雷士照明led吸顶灯灯芯替换圆形灯板节能灯芯冷光高显6W至40W护眼', 'https://wst.wxapp.tc.qq.com/161/20304/snscosdownload/SZ/reserved/6839f1ff00015fba288ae5867af20115000000a000004f50', NULL, '', NULL, 39.9, 39.9, 0, 0, 1, NULL, 0, 1, 11, -1, 0, 0, '2025-10-06 10:31:11', '手动确认订单', '2025-10-07 08:23:08', 'admin 操作取消订单');
INSERT INTO `o_order_item` VALUES (61, 1010, 100, 78, '4781177713430610710', '4781177713431610710', '5933370327547', 0, 0, '【活动价】曲美家居复古实木斗柜中古风家用客厅电视柜餐边柜卧室储物收纳柜', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01RpHHdM1qQTRkcsBof_!!351855490.jpg', NULL, '颜色分类:床头柜 中古色单柜*1[【40天发货】]', 'ZH-ZG-DS-BL-QM25-NT2', 4999, 4999, 0, 0, 1, NULL, 0, 1, NULL, -1, 0, 0, '2025-10-06 10:41:40', '手动确认订单', NULL, NULL);
-- ----------------------------
-- Table structure for o_order_ship_list
@ -953,14 +972,14 @@ CREATE TABLE `o_order_ship_list` (
`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
) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货-备货表(取号发货加入备货清单、分配供应商发货加入备货清单)' ROW_FORMAT = DYNAMIC;
) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货-备货表(取号发货加入备货清单、分配供应商发货加入备货清单)' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of o_order_ship_list
-- ----------------------------
INSERT INTO `o_order_ship_list` VALUES (1, 1010, 100, 0, 0, '自由仓库发货', 72, '4781369664948623818', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'avd', 'aad', 'AAAAAA', 2, 0, '2025-10-06 20:12:09', '手动发货', NULL, NULL);
INSERT INTO `o_order_ship_list` VALUES (3, 1007, 400, 0, 0, '仓库发货', 74, '6921377343921159820', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '极兔速递', 'JTSD', 'AAAAA', 2, 2, '2025-10-06 20:29:42', '手动发货', '2025-10-07 13:52:45', '备货完成');
INSERT INTO `o_order_ship_list` VALUES (4, 1011, 300, 1, 34, 'ASAA', 76, '251002-085338365560640', '彭**', '***********', '江西省***********************', '江西省', '南昌市', '西湖区', NULL, '', '', '极兔速递', 'JTSD', 'aaaaa', 2, 3, '2025-10-07 14:43:05', '分配供应商发货', '2025-10-07 16:02:43', '供应商手动发货');
INSERT INTO `o_order_ship_list` VALUES (5, 1011, 300, 0, 0, '仓库发货', 75, '251002-171237742200640', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', 'AA', 'AA', 'AAAAA', 2, 3, '2025-10-09 12:53:46', '手动发货', '2025-10-09 14:52:09', '生成出库单');
-- ----------------------------
-- Table structure for o_order_ship_list_item
@ -992,7 +1011,7 @@ CREATE TABLE `o_order_ship_list_item` (
`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
) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货-备货表(打单加入备货清单)' ROW_FORMAT = DYNAMIC;
) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货-备货表(打单加入备货清单)' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of o_order_ship_list_item
@ -1002,6 +1021,7 @@ INSERT INTO `o_order_ship_list_item` VALUES (2, 3, 1007, 400, 0, 0, '仓库发
INSERT INTO `o_order_ship_list_item` VALUES (3, 3, 1007, 400, 0, 0, '仓库发货', 74, 56, '6921377343921159820', '3415147054562306', 0, 0, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', '0', '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"M\"}]', '', 1, 2, '2025-10-06 20:30:12', '手动发货', '2025-10-07 12:25:15', '备货完成');
INSERT INTO `o_order_ship_list_item` VALUES (4, 3, 1007, 400, 0, 0, '仓库发货', 74, 57, '6921377343921159820', '3415147054562050', 0, 0, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', '0', '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"S\"}]', '', 1, 2, '2025-10-06 20:30:12', '手动发货', '2025-10-07 12:25:15', '备货完成');
INSERT INTO `o_order_ship_list_item` VALUES (5, 4, 1011, 300, 1, 34, 'ASAA', 76, 59, '251002-085338365560640', '1742373848729', 0, 0, NULL, 'https://img.pddpic.com/mms-material-img/2025-06-02/0d875ad2-529b-43be-b699-96748b4c0bb4.jpeg.a.jpeg', 'LEDDP001', 'E27螺口 3瓦白光 1级能效', 'LEDDP00101', 1, 3, '2025-10-07 14:43:05', '分配供应商发货', '2025-10-07 16:02:43', '供应商发货手动确认');
INSERT INTO `o_order_ship_list_item` VALUES (6, 5, 1011, 300, 0, 0, '仓库发货', 75, 58, '251002-171237742200640', '0', 0, 45, NULL, 'https://img.pddpic.com/mms-material-img/2025-06-02/0d875ad2-529b-43be-b699-96748b4c0bb4.jpeg.a.jpeg', 'LEDDP001', 'E27螺口 5瓦白光 1级能效', 'LEDDP00102', 1, 3, '2025-10-09 12:53:46', '手动发货', '2025-10-09 14:52:09', '备货完成');
-- ----------------------------
-- Table structure for o_refund
@ -1128,7 +1148,7 @@ CREATE TABLE `o_shipment` (
`town` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
PRIMARY KEY (`id`) USING BTREE,
INDEX `order_id_index`(`order_id` ASC) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货记录表' ROW_FORMAT = DYNAMIC;
) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货记录表' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of o_shipment
@ -1137,6 +1157,7 @@ INSERT INTO `o_shipment` VALUES (1, 1007, 400, 74, '6921377343921159820', '2025-
INSERT INTO `o_shipment` VALUES (2, 1007, 2, 0, 'aaa', NULL, 0, 0, NULL, 2, '极兔速递', 'JTSD', 'aa', 0.00, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-10-07 17:23:55', '手动添加发货记录', NULL, NULL, 'a', 'a', 'a', NULL, NULL, NULL);
INSERT INTO `o_shipment` VALUES (3, 1007, 2, 0, 'aaa', NULL, 0, 0, NULL, 2, '极兔速递', 'JTSD', 'aa', 0.00, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-10-07 17:24:27', '手动添加发货记录', NULL, NULL, 'a', 'a', 'a', NULL, NULL, NULL);
INSERT INTO `o_shipment` VALUES (4, 1007, 1, 0, 'aa', NULL, 0, 0, NULL, 1, '极兔速递', 'JTSD', 'aa', 0.00, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-10-07 17:25:06', '手动添加发货记录', NULL, NULL, 'd', 'd', 'a', NULL, NULL, NULL);
INSERT INTO `o_shipment` VALUES (5, 1011, 300, 75, '251002-171237742200640', '2025-10-02 03:56:59', 0, 0, NULL, 1, 'AA', 'AA', 'AAAAA', 0.00, '2025-10-09 12:53:46', NULL, 1, 0, 0, 0, 0, NULL, NULL, NULL, NULL, '2025-10-09 12:53:46', 'admin', NULL, NULL, '彭**', '***********', '江西省***********************', '江西省', '南昌市', '西湖区');
-- ----------------------------
-- Table structure for o_shipment_item
@ -1171,7 +1192,7 @@ CREATE TABLE `o_shipment_item` (
PRIMARY KEY (`id`) USING BTREE,
INDEX `goodId_index`(`erp_goods_id` ASC) USING BTREE,
INDEX `order_id`(`order_item_id` ASC) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货明细表' ROW_FORMAT = DYNAMIC;
) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货明细表' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of o_shipment_item
@ -1180,6 +1201,7 @@ INSERT INTO `o_shipment_item` VALUES (1, 1, 0, 0, NULL, 400, 1007, 74, '69213773
INSERT INTO `o_shipment_item` VALUES (2, 1, 0, 0, NULL, 400, 1007, 74, '6921377343921159820', '2025-10-06 10:16:50', 55, 0, 0, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', '0', '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"L\"}]', '', 1, NULL, 0, '2025-10-06 20:30:12', 'admin', NULL, NULL);
INSERT INTO `o_shipment_item` VALUES (3, 1, 0, 0, NULL, 400, 1007, 74, '6921377343921159820', '2025-10-06 10:16:50', 56, 0, 0, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', '0', '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"M\"}]', '', 1, NULL, 0, '2025-10-06 20:30:12', 'admin', NULL, NULL);
INSERT INTO `o_shipment_item` VALUES (4, 1, 0, 0, NULL, 400, 1007, 74, '6921377343921159820', '2025-10-06 10:16:50', 57, 0, 0, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', '0', '[{\"name\":\"颜色分类\",\"value\":\"乳白色22234\"},{\"name\":\"尺码大小\",\"value\":\"S\"}]', '', 1, NULL, 0, '2025-10-06 20:30:12', 'admin', NULL, NULL);
INSERT INTO `o_shipment_item` VALUES (5, 5, 0, 0, NULL, 300, 1011, 75, '251002-171237742200640', '2025-10-02 03:56:59', 58, 0, 0, NULL, 'https://img.pddpic.com/mms-material-img/2025-06-02/0d875ad2-529b-43be-b699-96748b4c0bb4.jpeg.a.jpeg', 'LEDDP001', 'E27螺口 5瓦白光 1级能效', 'LEDDP00102', 1, NULL, 0, '2025-10-09 12:53:46', 'admin', NULL, NULL);
-- ----------------------------
-- Table structure for o_shop
@ -1216,7 +1238,7 @@ CREATE TABLE `o_shop` (
-- ----------------------------
INSERT INTO `o_shop` VALUES (1007, '抖店测试', 400, NULL, 9, 1, NULL, '4463798', NULL, NULL, 'c3tzx2q5p41h7zl69zjws9900002noae-11', NULL, NULL, '070t45roa51h7zl69zjws9900002noae-12', NULL, NULL, NULL, NULL, NULL, 0, 1759307372, 1759307261);
INSERT INTO `o_shop` VALUES (1010, '淘宝测试店铺', 100, NULL, 9, 1, NULL, '0', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1759365108, 1759365108);
INSERT INTO `o_shop` VALUES (1011, '爱顾家的小店', 300, NULL, 9, 1, NULL, '0', NULL, NULL, '223c18d1d3c4445a979af58d7c034127e68e9a9a', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1759371874, 1759371874);
INSERT INTO `o_shop` VALUES (1011, '爱顾家的小店', 300, NULL, 9, 1, NULL, '0', NULL, NULL, 'f8e7159a3af348729f9761df8252a8b24edd25ac', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1759371874, 1759371874);
INSERT INTO `o_shop` VALUES (1012, '微信小店测试', 500, NULL, 9, 1, NULL, '0', 'wx82dd65f284dd6ee3', 'a6054ccf2694e8dc51d2616e634cad39', '96_KI-x2ByMfcE_X37Orem1O7qW03jVdUdiQU8QtGbZWjWS1LqOn9lXaxArEhlnCAL-AFNhia6IGIN1gHyvCa2gkMK_KcofMs7AnKGqj_ssy3L6vKP9vVklqvNBIUgEGDgAGANPM', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1759373401, 1759373401);
-- ----------------------------
@ -2303,8 +2325,8 @@ CREATE TABLE `oms_pdd_order` (
-- ----------------------------
-- Records of oms_pdd_order
-- ----------------------------
INSERT INTO `oms_pdd_order` VALUES (6, 1011, '251002-085338365560640', 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 9.9, 0, 9.9, 0, '', NULL, NULL, '', '2025-10-02 03:57:33', '', '', NULL, '', '', '~AgAAAAOhO5MInXa06QH8IRBacOETAWSqXLvQu7vdF45Ae7EfXZyQKJicaJEp4XhpwavGCSTbc3s1dcnvaud4HQFQ9PX1vJI0AStTxREUB6uHZbz0kWU0XJ0hjLiu0GjrV7GHehiiKzKQ29WwCrXAELZvLtGbXd5XtJ8uxEWfnVU=~1~', '江西省***********************', '~AgAAAAOhO5MFnXa06QBqeTF7JP2ui0bt9Jfaki2jDDY=~1~', '$AgAAAAOhO5MGnXa06QBdJusrd7MfE+9eAdrHPybeyVc=$1$', '***********', '彭**', '江西省南昌市西湖区江西省***********************', '~AgAAAAOhO5MHnXa06QEbQYOSjwW2aXXlzwEdeQzJ7oP/u2dVfFe4gyFZaEwkuYBjokgvFm5gaYpUqQL6av8V0uTysfjOlFrmIoINGHkvStBANyLkuaOLIlf1e7LRT2eoPi7othOh/gnlD2M3nRjPAjoeBm7N7lkPX0RDFxRbXKPaxj1bOJuAFEkLpIgiyi+a~1~', '西湖区', 1959, '南昌市', 233, '江西省', 17, '中国', 0, '2025-10-02 03:56:23', '2025-10-02 03:56:25', '2025-10-02 03:56:25', '', '2025-10-02 23:59:59', NULL, 1, 0, 0, 0, 0, 0, NULL, 0, 0, 0, NULL, 0, 0, '', 1, '2025-10-06 10:19:13', '2025-10-06 02:19:12', NULL, NULL);
INSERT INTO `oms_pdd_order` VALUES (7, 1011, '251002-171237742200640', 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 12.49, 0, 12.49, 0, '', NULL, NULL, '', '2025-10-02 03:57:35', '', '', NULL, '', '', '~AgAAAAOhO5MIAbBgbAG6u+97LYFrbDQSVAen0u8BwsMnpHOXeYvU6n+CaP0LwneNZhtatu2ucf2VnPxVdhTRZ8pshhlditvmGkSYuqaxYOuDdZmDj6Mf3sk0aESbsFZnAPXXPLgbGX6a6qcGjrqHfKD+ML0iheUxyABa7Kxy1wo=~1~', '江西省***********************', '~AgAAAAOhO5MFAbBgbABnuTSr1xNRt06DzIRWNkT1BJM=~1~', '$AgAAAAOhO5MGAbBgbADCkPQ2wJa53mDwDS63qYiwi7M=$1$', '***********', '彭**', '江西省南昌市西湖区江西省***********************', '~AgAAAAOhO5MHAbBgbAFX5A8biQVlY8wyrhgrmT+v+8o0eCwE9AY2eLeC6NtLV9yRwYblBh6PTLRhs7ZqqdHGBLCWnSgjirHwvaDIplRuLyuF+yePXP34flpF74yJmkai7Rb2Dm2OryvxXZh6CkCTFiBLQ9+8ZubcRrEXT5vlFJsiggVgdcE3DRIruQMP/FZx~1~', '西湖区', 1959, '南昌市', 233, '江西省', 17, '中国', 0, '2025-10-02 03:56:59', '2025-10-02 03:57:00', '2025-10-02 03:57:00', '', '2025-10-02 23:59:59', NULL, 1, 0, 0, 0, 0, 0, NULL, 0, 0, 0, NULL, 0, 0, '', 1, '2025-10-06 10:18:41', '2025-10-06 02:18:41', NULL, NULL);
INSERT INTO `oms_pdd_order` VALUES (6, 1011, '251002-085338365560640', 0, 0, 1, 1, 1, 3, 1, 0, 0, 0, 0, 9.9, 0, 9.9, 0, '', NULL, NULL, '', '2025-10-04 19:58:35', '2025-10-02 11:23:00', 'JT5418053493040', NULL, '', '', '~AgAAAAOhO5MInXa06QH8IRBacOETAWSqXLvQu7vdF45Ae7EfXZyQKJicaJEp4XhpwavGCSTbc3s1dcnvaud4HQFQ9PX1vJI0AStTxREUB6uHZbz0kWU0XJ0hjLiu0GjrV7GHehiiKzKQ29WwCrXAELZvLtGbXd5XtJ8uxEWfnVU=~1~', '江西省***********************', '~AgAAAAOhO5MFnXa06QBqeTF7JP2ui0bt9Jfaki2jDDY=~1~', '$AgAAAAOhO5MGnXa06QBdJusrd7MfE+9eAdrHPybeyVc=$1$', '***********', '彭**', '江西省南昌市西湖区江西省***********************', '~AgAAAAOhO5MHnXa06QEbQYOSjwW2aXXlzwEdeQzJ7oP/u2dVfFe4gyFZaEwkuYBjokgvFm5gaYpUqQL6av8V0uTysfjOlFrmIoINGHkvStBANyLkuaOLIlf1e7LRT2eoPi7othOh/gnlD2M3nRjPAjoeBm7N7lkPX0RDFxRbXKPaxj1bOJuAFEkLpIgiyi+a~1~', '西湖区', 1959, '南昌市', 233, '江西省', 17, '中国', 0, '2025-10-02 03:56:23', '2025-10-02 03:56:25', '2025-10-02 03:56:25', '2025-10-04 19:47:21', '2025-10-02 23:59:59', NULL, 1, 0, 0, 0, 0, 0, NULL, 0, 0, 0, NULL, 0, 0, '', 0, '2025-10-06 10:19:13', '2025-10-09 03:24:07', '2025-10-09 11:24:08', NULL);
INSERT INTO `oms_pdd_order` VALUES (7, 1011, '251002-171237742200640', 0, 0, 1, 1, 1, 3, 1, 0, 0, 0, 0, 12.49, 0, 12.49, 0, '', NULL, NULL, '', '2025-10-04 19:56:53', '2025-10-02 11:23:00', 'JT5418053493040', NULL, '', '', '~AgAAAAOhO5MIAbBgbAG6u+97LYFrbDQSVAen0u8BwsMnpHOXeYvU6n+CaP0LwneNZhtatu2ucf2VnPxVdhTRZ8pshhlditvmGkSYuqaxYOuDdZmDj6Mf3sk0aESbsFZnAPXXPLgbGX6a6qcGjrqHfKD+ML0iheUxyABa7Kxy1wo=~1~', '江西省***********************', '~AgAAAAOhO5MFAbBgbABnuTSr1xNRt06DzIRWNkT1BJM=~1~', '$AgAAAAOhO5MGAbBgbADCkPQ2wJa53mDwDS63qYiwi7M=$1$', '***********', '彭**', '江西省南昌市西湖区江西省***********************', '~AgAAAAOhO5MHAbBgbAFX5A8biQVlY8wyrhgrmT+v+8o0eCwE9AY2eLeC6NtLV9yRwYblBh6PTLRhs7ZqqdHGBLCWnSgjirHwvaDIplRuLyuF+yePXP34flpF74yJmkai7Rb2Dm2OryvxXZh6CkCTFiBLQ9+8ZubcRrEXT5vlFJsiggVgdcE3DRIruQMP/FZx~1~', '西湖区', 1959, '南昌市', 233, '江西省', 17, '中国', 0, '2025-10-02 03:56:59', '2025-10-02 03:57:00', '2025-10-02 03:57:00', '2025-10-04 19:46:40', '2025-10-02 23:59:59', NULL, 1, 0, 0, 0, 0, 0, NULL, 0, 0, 0, NULL, 0, 0, '', 0, '2025-10-06 10:18:41', '2025-10-09 03:28:09', '2025-10-09 11:28:09', NULL);
-- ----------------------------
-- Table structure for oms_pdd_order_item
@ -2327,13 +2349,13 @@ CREATE TABLE `oms_pdd_order_item` (
`o_goods_sku_id` bigint NULL DEFAULT NULL COMMENT '商品skuid(o_goods_sku外键)',
PRIMARY KEY (`id`) USING BTREE,
INDEX `index_order_sn`(`order_sn` ASC) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '拼多多订单明细表' ROW_FORMAT = DYNAMIC;
) ENGINE = InnoDB AUTO_INCREMENT = 1976126504091607044 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '拼多多订单明细表' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of oms_pdd_order_item
-- ----------------------------
INSERT INTO `oms_pdd_order_item` VALUES (6, '251002-085338365560640', '753794079556', '1742373848729', NULL, 'https://img.pddpic.com/mms-material-img/2025-06-02/0d875ad2-529b-43be-b699-96748b4c0bb4.jpeg.a.jpeg', 'E27螺口 3瓦白光 1级能效', 9.9, 'LEDDP001', 'LEDDP00101', 1, NULL, NULL, NULL);
INSERT INTO `oms_pdd_order_item` VALUES (7, '251002-171237742200640', '753794079556', '1742373848730', NULL, 'https://img.pddpic.com/mms-material-img/2025-06-02/0d875ad2-529b-43be-b699-96748b4c0bb4.jpeg.a.jpeg', 'E27螺口 5瓦白光 1级能效', 12.49, 'LEDDP001', 'LEDDP00102', 1, NULL, NULL, NULL);
INSERT INTO `oms_pdd_order_item` VALUES (1976126504091607042, '251002-085338365560640', '753794079556', '1742373848729', '雷士照明超亮LED节能灯E27大功率强光均匀三色可选一级能效护眼', 'https://img.pddpic.com/mms-material-img/2025-06-02/0d875ad2-529b-43be-b699-96748b4c0bb4.jpeg.a.jpeg', 'E27螺口 3瓦白光 1级能效', 9.9, 'LEDDP001', 'LEDDP00101', 1, NULL, NULL, NULL);
INSERT INTO `oms_pdd_order_item` VALUES (1976126504091607043, '251002-171237742200640', '753794079556', '1742373848730', '雷士照明超亮LED节能灯E27大功率强光均匀三色可选一级能效护眼', 'https://img.pddpic.com/mms-material-img/2025-06-02/0d875ad2-529b-43be-b699-96748b4c0bb4.jpeg.a.jpeg', 'E27螺口 5瓦白光 1级能效', 12.49, 'LEDDP001', 'LEDDP00102', 1, NULL, NULL, NULL);
-- ----------------------------
-- Table structure for oms_pdd_refund
@ -2553,35 +2575,6 @@ CREATE TABLE `oms_tao_order` (
-- ----------------------------
-- Records of oms_tao_order
-- ----------------------------
INSERT INTO `oms_tao_order` VALUES (6, 1010, 4779976431876409626, '曲美家具官方旗舰店', 'fixed', '0', 'false', NULL, NULL, NULL, 'AAFTHVMUAAJ_dKyzaDUjhIJv', NULL, '紫**', NULL, NULL, NULL, 3999.00, 0.00, 0.00, 0.00, 2685.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-10-01 08:34:57', '2025-10-02 08:35:03', NULL, NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', NULL, NULL, NULL, 0, '2025-10-02 08:43:09', '2025-10-02 08:47:13', NULL, '1qrU4iasZvFia01a31WFsY8tO5u2zv2EQB4p59XvuticFh7sX7V5Sp3zlp5wTVVoz7Q7Nphic6', NULL, NULL, '湖北省', '鄂州市', '鄂城区', '凤凰街道', '凤*街道鄂州世纪**小区', NULL, '曹**', '***********', NULL, NULL, NULL, '0', NULL, '2025100123001105881434480798', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '4779976431876409626', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (7, 1010, 4764667284568652936, '曲美家具官方旗舰店', 'fixed', '1', 'false', '3108.00', NULL, NULL, 'AAEXHVMUAAJ_dKyzaDWXKULa', NULL, 'z**', NULL, NULL, NULL, 4999.00, 0.00, 0.00, 0.00, 3108.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-23 21:17:47', '2025-10-02 08:13:23', '2025-09-23 21:18:58', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'WAIT_BUYER_CONFIRM_GOODS', NULL, NULL, NULL, 0, '2025-10-02 08:43:09', '2025-10-02 08:47:13', NULL, '1ibgfTMfYr2exf6hG4WbUHCNER9Caa7ebzhSd3zv14CHSxSp5QiTVbD2fyZgqC4VibbsibuNWW', NULL, NULL, '河北省', '廊坊市', '广阳区', '新源道街道', '新**街道建**路北新里**号楼', NULL, '文**', '***********', NULL, NULL, NULL, '0', NULL, '2025092322001171721430097756', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '4764667284568652936', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (8, 1010, 2957245681988996758, '曲美家具官方旗舰店', 'fixed', '1', 'false', NULL, NULL, NULL, 'AAFOHVMUAAJ_dK6zaDYIpGh8', NULL, 't**', NULL, NULL, NULL, 3998.00, 0.00, 0.00, 0.00, 2224.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-25 20:15:16', '2025-10-01 22:56:08', '2025-09-25 20:15:23', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'WAIT_BUYER_CONFIRM_GOODS', NULL, NULL, NULL, 0, '2025-10-02 08:43:10', NULL, NULL, '12zNlq4RnGKCcQMHKPJIia7oCs26p5AUpkQNtvPM32NQ07wib2ic13lopA7ABGLnscfaTVojH', NULL, NULL, '江苏省', '泰州市', '海陵区', '凤凰街道', '凤*街道**路**园山河原**号**单元***', NULL, '刘**', '***********', NULL, NULL, NULL, '0', NULL, '2025092522001124691409198696', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '2957245681988996758', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (9, 1010, 2882250231964279377, '曲美家具官方旗舰店', 'fixed', '0', 'false', '2789.65', NULL, NULL, 'AAEuHVMUAAJ_dKyzaDWRYXsG', NULL, '作**', NULL, NULL, NULL, 3999.00, 0.00, 0.00, 499.35, 2829.65, 2829.65, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-08-17 15:10:05', '2025-10-01 22:41:11', '2025-08-17 15:10:20', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_FINISHED', NULL, NULL, NULL, 0, '2025-10-02 08:43:10', NULL, NULL, '1YzI3Iy87FOQP6TWDibzdq47cmu4pic7MVBuzoJp5bXUJ8ibHdd0mXjPEnPf63OqGd2bTVWTQ', NULL, NULL, '辽宁省', '阜新市', '海州区', '河北街道', '河*街道**路*****号水利勘测设计**院', NULL, '曹**', '***********', NULL, NULL, NULL, '0', NULL, '2025081722001189391403729687', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '2882250231964279377', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (10, 1010, 4736689704543141607, '曲美家具官方旗舰店', 'fixed', '5', 'false', NULL, NULL, NULL, 'AAG2HVMUAAJ_dKyzaDWStmjL', NULL, 't**', NULL, NULL, NULL, 9399.00, 0.00, 0.00, 0.00, 5031.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-11 22:17:52', '2025-10-01 22:24:45', '2025-09-11 22:18:01', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_CLOSED', NULL, NULL, NULL, 0, '2025-10-02 08:43:10', NULL, NULL, '1K9aGC4ibgaNd4GIDhYZSgrs8p5iclTX1icsKBdxL5CTVDG4PBd7835dicmqFRIWa8XPahmqw0', NULL, NULL, '江苏省', '常州市', '新北区', '西夏墅镇', '西**镇灵**路**号澜峯苑***单元****', NULL, '言**', '***********', NULL, NULL, NULL, '0', NULL, '2025091123001105961417548119', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '4736689704543141607', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (11, 1010, 2955450648003237790, '曲美家具官方旗舰店', 'fixed', '2', 'false', NULL, NULL, NULL, 'AAELHVMUAAJ_dKyzaDX6WHwC', NULL, 't**', NULL, NULL, NULL, 5999.00, 0.00, 0.00, 0.00, 2608.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-24 21:47:47', '2025-10-01 21:05:06', '2025-09-24 21:47:52', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'WAIT_SELLER_SEND_GOODS', NULL, NULL, NULL, 0, '2025-10-02 08:43:10', NULL, NULL, '1DfdmnTnH9DRGYyfH4iaI3ZwOXxvBnsHpzgsw0CFUQ4Fp5iaTV6KKUSCwUHfVibUB01I6jOBM', NULL, NULL, '河南省', '三门峡市', '灵宝市', '阳店镇', '阳*镇**村*组', NULL, '赵**', '***********', NULL, NULL, NULL, '0', NULL, '2025092422001125071425957448', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '2955450648003237790', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (12, 1010, 2955210242793344060, '曲美家具官方旗舰店', 'fixed', '1', 'false', NULL, NULL, NULL, 'AAEHHVMUAAJ_dKyzaDWT4vhf', NULL, 'a**', NULL, NULL, NULL, 9999.00, 0.00, 0.00, 0.00, 2998.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-24 22:17:36', '2025-10-01 20:09:45', '2025-09-24 22:34:30', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'WAIT_BUYER_CONFIRM_GOODS', NULL, NULL, NULL, 0, '2025-10-02 08:43:10', NULL, NULL, '1TTD0F8jR2dBgicqQ4iaagBsOktDFKOz0mp5TV1voYmE4EUmzhrwmdBvnnAXtLNHa1fVUU8c', NULL, NULL, '北京', '北京市', '丰台区', '看丹街道', '看*街道看丹欣**号**号**单元****', NULL, '刘**', '***********', NULL, NULL, NULL, '0', NULL, '2025092423001102741444820854', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '2955210242793344060', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (13, 1010, 4745978892673938327, '曲美家具官方旗舰店', 'fixed', '1', 'false', NULL, NULL, NULL, 'AAE8HVMUAAJ_dKyzaDWeT8xI', NULL, '银**', NULL, NULL, NULL, 9998.00, 0.00, 0.00, 708.90, 4017.10, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-15 18:41:13', '2025-10-01 20:08:49', '2025-09-15 19:38:04', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'WAIT_BUYER_CONFIRM_GOODS', NULL, NULL, NULL, 0, '2025-10-02 08:43:10', NULL, NULL, '1SWXicpREXlJ4m34frW7Tias3NdnbotQ4Le10p5nTVfYQGxfWLicDmWjm6Zwezz1DeJ3oS4ZW', NULL, NULL, '陕西省', '商洛市', '镇安县', '大坪镇', '大*镇**村五组火石沟口', NULL, '田**', '***********', NULL, NULL, NULL, '0', NULL, '2025091522001163351452023845', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '4745978892673938327', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (14, 1010, 4744159056482938327, '曲美家具官方旗舰店', 'fixed', '1', 'false', NULL, NULL, NULL, 'AAE8HVMUAAJ_dKyzaDWeT8xI', NULL, '银**', NULL, NULL, NULL, 11998.00, 0.00, 0.00, 0.00, 5216.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-14 22:02:45', '2025-10-01 20:07:48', '2025-09-15 19:38:04', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'WAIT_BUYER_CONFIRM_GOODS', NULL, NULL, NULL, 0, '2025-10-02 08:43:11', NULL, NULL, '1SWXicpREXlJ4m34frW7Tias3NdnbotQ4Le10p5nTVfYQGxfWLicDmWjm6Zwezz1DeJ3oS4ZW', NULL, NULL, '陕西省', '商洛市', '镇安县', '大坪镇', '大*镇**村五组火石沟口', NULL, '田**', '***********', NULL, NULL, NULL, '0', NULL, '2025091422001163351445937304', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '4744159056482938327', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (15, 1010, 4769092801752472343, '曲美家具官方旗舰店', 'fixed', '1', 'false', NULL, NULL, NULL, 'AAFcHVMUAAJ_dKyzaDWFKn50', NULL, 't**', NULL, NULL, NULL, 198.00, 0.00, 0.00, 0.00, 168.20, 168.20, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-26 00:13:03', '2025-10-01 19:10:59', '2025-09-26 00:13:38', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_FINISHED', NULL, NULL, NULL, 0, '2025-10-02 08:43:11', NULL, NULL, '1Xib2AjzUc06ibMB7T23rfrib6BUC2w7Ogiag48HsSp5TN8f45NTVdJdX84HreNHPoJ1Hd3ouW', NULL, NULL, '陕西省', '咸阳市', '渭城区', '北杜街道', '北*街道丰树空**城物流**号库*库@*********@【淘宝特惠集运-西安**中心】【勿删】', NULL, '牧**', '***********', NULL, NULL, NULL, '0', NULL, '2025092622001181261435545604', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '4769092801752472343', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (16, 1010, 4768235353572757234, '曲美家具官方旗舰店', 'fixed', '1', 'false', '1998.00', NULL, NULL, 'AAGqHVMUAAJ_dKyzaDUdZsWn', NULL, '小**', NULL, NULL, NULL, 4999.00, 0.00, 0.00, 0.00, 2008.00, 1957.75, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-25 16:57:45', '2025-10-01 18:51:24', '2025-09-25 16:57:59', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_FINISHED', NULL, NULL, NULL, 0, '2025-10-02 08:43:11', NULL, NULL, '1CB6Dhstia4XLc3Np5uTVQhUAeTl0e0yXfzuYm7icG5YhJAjj3iaMeMEr7ib1ytvnhvgRpvqPa', NULL, NULL, '河北省', '秦皇岛市', '海港区', '文化路街道', '文**街道西沙滩**-*-*', NULL, '小**', '***********', NULL, NULL, NULL, '0', NULL, '2025092522001139041426508947', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '4768235353572757234', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (17, 1010, 4781253132755757234, '曲美家具官方旗舰店', 'fixed', '0', 'false', NULL, NULL, NULL, 'AAGqHVMUAAJ_dKyzaDUdZsWn', NULL, '小**', NULL, NULL, NULL, 4999.00, 0.00, 0.00, 0.00, 1988.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-10-01 16:44:50', '2025-10-01 17:54:38', '2025-10-01 16:44:54', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_CLOSED', NULL, NULL, NULL, 0, '2025-10-02 08:43:11', NULL, NULL, '18yHaXzmbSFG40VNEZq0kZp5EkSZOYPiblxs6zG7h1MOJWApPTN0WBeNoXYgCSg8D8OTVdY', NULL, NULL, '河北省', '秦皇岛市', '海港区', '文化路街道', '文**街道迪信通(**店)', NULL, '姜**', '***********', NULL, NULL, NULL, '0', NULL, '2025100122001139041407747974', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '4781253132755757234', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (18, 1010, 4781369664948623818, '曲美家具官方旗舰店', 'fixed', '0', 'false', NULL, NULL, NULL, 'AAGuHVMUAAJ_dKyzaDUDY-Sp', NULL, '我**', NULL, NULL, NULL, 12996.00, 0.00, 0.00, 0.00, 4060.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-10-01 17:40:02', '2025-10-01 17:44:50', '2025-10-01 17:40:27', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'WAIT_SELLER_SEND_GOODS', NULL, NULL, NULL, 0, '2025-10-02 08:43:11', '2025-10-02 10:05:08', NULL, '1tR04xIVEJAkicKAJpONkicavfyNDTf7p5lqia681elfDFttgsEdibTlguhZPoTVrnYriaIdfhe', NULL, NULL, '山西省', '运城市', '盐湖区', '姚孟街道', '姚*街道**广场吾悦华府(南区**号**单元****', NULL, '君**', '***********', NULL, NULL, NULL, '0', NULL, '2025100122001113001446942573', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '4781369664948623818', NULL, 1, '2025-10-06 09:40:32');
INSERT INTO `oms_tao_order` VALUES (19, 1010, 4781177713430610710, '曲美家具官方旗舰店', 'fixed', '0', 'false', NULL, NULL, NULL, 'AAFQHVMUAAJ_dKyzaDWRhyVY', NULL, '和**', NULL, NULL, NULL, 4999.00, 0.00, 0.00, 0.00, 942.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-10-01 17:16:36', '2025-10-01 17:16:43', '2025-10-01 17:16:43', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'WAIT_SELLER_SEND_GOODS', NULL, NULL, NULL, 0, '2025-10-02 08:43:12', NULL, NULL, '1PFeGzFTa8WEpiagoH14mVmAzrZVnQp5pnm6h2DwIb0Dh0rTVJzeLdmPZEBo7xQG4v0FJp6', NULL, NULL, '浙江省', '台州市', '温岭市', '大溪镇', '大*镇**路***号澜溪花苑***号', NULL, '潘**', '***********', NULL, NULL, NULL, '0', NULL, '2025100122001184171435170915', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '4781177713430610710', NULL, 1, '2025-10-06 10:41:40');
INSERT INTO `oms_tao_order` VALUES (20, 1010, 2906254527799501094, '曲美家具官方旗舰店', 'fixed', '5', 'false', NULL, NULL, NULL, 'AAECHVMUAAJ_dKyzaDVCfsLF', NULL, '1**', NULL, NULL, NULL, 1999.00, 0.00, 0.00, 92.85, 526.15, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-01 16:29:26', '2025-10-01 16:32:09', '2025-09-01 16:31:04', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_CLOSED', NULL, NULL, NULL, 0, '2025-10-02 08:43:12', NULL, NULL, '1fmCeM8sO1c66L6z4ShfgVS0lAIDy3s8VhRCBicGgfTwOJp5N4IYLRqTVRssxZZRqjXrCFU', NULL, NULL, '浙江省', '杭州市', '拱墅区', '潮鸣街道', '潮*街道环**路*****单元***', NULL, '欧**', '***********', NULL, NULL, NULL, '0', NULL, '2025090122001185621410252332', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '2906254527799501094', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (21, 1010, 4769970048747824611, '曲美家具官方旗舰店', 'fixed', '1', 'false', '3536.20', NULL, NULL, 'AAE3HVMUAAJ_dKyzaDUXfKw9', NULL, '蓝**', NULL, NULL, NULL, 7999.00, 0.00, 0.00, 0.00, 3538.00, 3538.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-26 12:12:58', '2025-10-01 16:24:07', '2025-09-26 12:13:19', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_FINISHED', NULL, NULL, NULL, 0, '2025-10-02 08:43:12', NULL, NULL, '1UnlddID4G8zgNMdldmrJT6T5jDlgmshqI445r0SnTCquiaHamrgp5zzTVqHl8NqzNPcicKG', NULL, NULL, '北京', '北京市', '昌平区', '回龙观街道', '回**街道北京**小区**号楼*-***', NULL, '徐**', '***********', NULL, NULL, NULL, '0', NULL, '2025092622001136091425793800', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '4769970048747824611', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (22, 1010, 4779070308838830200, '曲美家具官方旗舰店', 'fixed', '0', 'false', NULL, NULL, NULL, 'AAFlHVMUAAJ_dKyzaDW1umZV', NULL, '南**', NULL, NULL, NULL, 11992.00, 0.00, 0.00, 0.00, 3816.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-30 15:47:31', '2025-10-01 15:47:33', NULL, NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', NULL, NULL, NULL, 0, '2025-10-02 08:43:13', NULL, NULL, '1mR3x9I4XJSLepZNWRNl52fSD7qMKERlp5UshuqVdylNKnjw6k2P3IbTVXGAQibQARZmuzE', NULL, NULL, '北京', '北京市', '昌平区', '北七家镇', '北**镇东**村***号***', NULL, '李**', '***********', NULL, NULL, NULL, '0', NULL, '2025093022001155621417014220', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '4779070308838830200', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (23, 1010, 4778846679944830200, '曲美家具官方旗舰店', 'fixed', '0', 'false', NULL, NULL, NULL, 'AAFlHVMUAAJ_dKyzaDW1umZV', NULL, '南**', NULL, NULL, NULL, 4497.00, 0.00, 0.00, 0.00, 1134.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-30 15:43:58', '2025-10-01 15:44:07', NULL, NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', NULL, NULL, NULL, 0, '2025-10-02 08:43:13', NULL, NULL, '1mR3x9I4XJSLepZNWRNl52fSD7qMKERlp5UshuqVdylNKnjw6k2P3IbTVXGAQibQARZmuzE', NULL, NULL, '北京', '北京市', '昌平区', '北七家镇', '北**镇东**村***号***', NULL, '李**', '***********', NULL, NULL, NULL, '0', NULL, '2025093022001155621417482852', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '4778846679944830200', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (24, 1010, 4778912197701623818, '曲美家具官方旗舰店', 'fixed', '0', 'false', NULL, NULL, NULL, 'AAGuHVMUAAJ_dKyzaDUDY-Sp', NULL, '我**', NULL, NULL, NULL, 12996.00, 0.00, 0.00, 0.00, 4060.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-30 15:34:01', '2025-10-01 15:34:03', NULL, NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', NULL, NULL, NULL, 0, '2025-10-02 08:43:14', NULL, NULL, '1tR04xIVEJAkicKAJpONkicavfyNDTf7p5lqia681elfDFttgsEdibTlguhZPoTVrnYriaIdfhe', NULL, NULL, '山西省', '运城市', '盐湖区', '姚孟街道', '姚*街道**广场吾悦华府(南区**号**单元****', NULL, '君**', '***********', NULL, NULL, NULL, '0', NULL, '2025093022001113001443075250', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '4778912197701623818', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (25, 1010, 2961805369467001653, '曲美家具官方旗舰店', 'fixed', '0', 'false', '1155.00', NULL, NULL, 'AAFvHVMUAAJ_dKyzaDUfujgj', NULL, 'w**', NULL, NULL, NULL, 2799.00, 0.00, 0.00, 0.00, 1155.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-27 22:36:52', '2025-10-01 14:01:53', '2025-09-27 22:36:56', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_CLOSED', NULL, NULL, NULL, 0, '2025-10-02 08:43:14', NULL, NULL, '1Jib3zV7icMZujGjqflDwsy4gfrMf35nuxQSRRCwfup59O0TYCFTVho6ibLeI1TicuPrFoSNj7', NULL, NULL, '浙江省', '金华市', '磐安县', '尖山镇', '尖**楼*村*路下 新**号', NULL, '楼**', '***********', NULL, NULL, NULL, '0', NULL, '2025092722001181081459163662', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '2961805369467001653', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (26, 1010, 2961633398805001653, '曲美家具官方旗舰店', 'fixed', '0', 'false', NULL, NULL, NULL, 'AAFvHVMUAAJ_dKyzaDUfujgj', NULL, 'w**', NULL, NULL, NULL, 3999.00, 0.00, 0.00, 0.00, 1937.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-27 22:24:31', '2025-10-01 14:01:40', NULL, NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', NULL, NULL, NULL, 0, '2025-10-02 08:43:15', NULL, NULL, '1Jib3zV7icMZujGjqflDwsy4gfrMf35nuxQSRRCwfup59O0TYCFTVho6ibLeI1TicuPrFoSNj7', NULL, NULL, '浙江省', '金华市', '磐安县', '尖山镇', '尖**楼*村*路下 新**号', NULL, '楼**', '***********', NULL, NULL, NULL, '0', NULL, '2025092722001181081459818887', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '2961633398805001653', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (27, 1010, 2966705005968263599, '曲美家具官方旗舰店', 'fixed', '0', 'false', NULL, NULL, NULL, 'AAEVHVMUAAJ_dKyzaDUYHB4I', NULL, '毛**', NULL, NULL, NULL, 6798.00, 0.00, 0.00, 0.00, 3041.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-30 13:52:27', '2025-10-01 13:52:32', NULL, NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', NULL, NULL, NULL, 0, '2025-10-02 08:43:15', NULL, NULL, '1bJbhr94cLNxe1jDv2rBOlb4DUQ9yg7AzBcMzibeibp5TVXKltaw9zOXgbWDicT3Ye8mCmNiaV', NULL, NULL, '北京', '北京市', '朝阳区', '黑庄户乡', '黑**乡黑**镇 双**路*城暖山***号', NULL, '张**', '***********', NULL, NULL, NULL, '0', NULL, '2025093022001142511407184250', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '2966705005968263599', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (28, 1010, 2946756758362966788, '曲美家具官方旗舰店', 'fixed', '1', 'false', NULL, NULL, NULL, 'AAHVHVMUAAJ_dKyzaDWn9HuE', NULL, 't**', NULL, NULL, NULL, 6798.00, 0.00, 0.00, 541.35, 3067.65, 3067.65, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-20 22:30:00', '2025-10-01 12:17:58', '2025-09-21 09:47:54', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_FINISHED', NULL, NULL, NULL, 0, '2025-10-02 08:43:15', NULL, NULL, '1VHItYIb6UYsibnnkBENH4ip5cicGCwx10B4geTVC5tLnb2eOoMpR7Y0ibYEeVicHu2gclhZBfJ', NULL, NULL, '陕西省', '西安市', '灞桥区', '新筑街道', '新*街道西滨大**号陆港金海岸一**号**单元***室', NULL, '唐**', '***********', NULL, NULL, NULL, '0', NULL, '2025092022001112941429485119', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '2946756758362966788', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (29, 1010, 2897744990247223355, '曲美家具官方旗舰店', 'fixed', '1', 'false', '5841.00', NULL, NULL, 'AAFnHVMUAAJ_dKyzaDU4Sw8a', NULL, 't**', NULL, NULL, NULL, 9999.00, 0.00, 0.00, 0.00, 5991.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-08-27 11:10:12', '2025-10-01 12:01:33', '2025-08-27 11:10:22', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'WAIT_BUYER_CONFIRM_GOODS', NULL, NULL, NULL, 0, '2025-10-02 08:43:15', NULL, NULL, '1WIF1b7pCFLaicIxnQO4c4xp5PTagesE1uaGibiTVc6p1BZMK9icmInOSH4BxxKdraXXPdKAcx', NULL, NULL, '辽宁省', '锦州市', '太和区', '营盘街道', '营*街道(**街凌**街以西)**街 戎兴苑**号**单元*层**号', NULL, '邢**', '***********', NULL, NULL, NULL, '0', NULL, '2025082722001155401438646913', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '2897744990247223355', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (30, 1010, 2966134443991077288, '曲美家具官方旗舰店', 'fixed', '0', 'false', NULL, NULL, NULL, 'AAEgHVMUAAJ_dKyzaDUz4VL_', NULL, 'w**', NULL, NULL, NULL, 5999.00, 0.00, 0.00, 0.00, 3654.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-30 11:20:02', '2025-10-01 11:20:10', NULL, NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', NULL, NULL, NULL, 0, '2025-10-02 08:43:15', NULL, NULL, '1ibIu7UaZHuYLcK9yV7PsJ4TGnpk8HTkjEeJq19GlLp5XKR5qdaTVEsun87LZJKayO7alSQ', NULL, NULL, '湖南省', '长沙市', '岳麓区', '梅溪湖街道', '梅**街道近**路与**路交叉口卓越·湾汇**栋****', NULL, '张**', '***********', NULL, NULL, NULL, '0', NULL, '2025093022001198991451282335', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '2966134443991077288', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (31, 1010, 2894341441004928576, '曲美家具官方旗舰店', 'fixed', '1', 'true', '954.92', NULL, NULL, 'AAGxHVMUAAJ_dKyzaDU3Hn-i', NULL, 'd**', NULL, NULL, NULL, 2999.00, 0.00, 0.00, 0.00, 976.00, 976.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-08-25 09:15:55', '2025-10-01 11:09:00', '2025-08-25 09:16:04', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_FINISHED', NULL, NULL, NULL, 0, '2025-10-02 08:43:15', NULL, NULL, '1p7VUbiaaI94v11qJStibiaC3cia31CKgv50p5k5zhEl2WB56NEYS1lX5xTVPaXgp8cRxnOkTk', NULL, NULL, '吉林省', '长春市', '南关区', '桃源街道', '桃*街道中海金域中央***栋***', NULL, '李**', '***********', NULL, NULL, NULL, '0', NULL, '2025082522001124591442852645', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '2894341441004928576', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (32, 1010, 2912223073878775781, '曲美家具官方旗舰店', 'fixed', '1', 'false', NULL, NULL, NULL, 'AAEgHVMUAAJ_dKyzaDUAzU7K', NULL, '安**', NULL, NULL, NULL, 129.00, 0.00, 0.00, 0.00, 109.00, 109.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-05 11:36:17', '2025-10-01 10:25:03', '2025-09-05 11:36:21', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_FINISHED', NULL, NULL, NULL, 0, '2025-10-02 08:43:16', NULL, NULL, '1rJNptyTGCR962WoeZibpAJ4LL7mp5Aic3RUm3swMsqmpLdtiaYtDr5QV1EJTVJyUYxGquaQ5', NULL, NULL, '河北省', '石家庄市', '新华区', '赵陵铺路街道', '赵陵**街道友谊**街***号丽都河畔**号**单元', NULL, '张**', '***********', NULL, NULL, NULL, '0', NULL, '2025090522001117681419735356', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '2912223073878775781', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (33, 1010, 4775628888209611911, '曲美家具官方旗舰店', 'fixed', '1', 'false', '21.20', NULL, NULL, 'AAHgHVMUAAJ_dKyzaDUHGL7I', NULL, 'g**', NULL, NULL, NULL, 89.00, 0.00, 0.00, 0.00, 21.20, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-28 20:44:40', '2025-10-01 09:07:42', '2025-09-28 20:44:44', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'WAIT_BUYER_CONFIRM_GOODS', NULL, NULL, NULL, 0, '2025-10-02 08:43:16', NULL, NULL, '1j0V4icbGdadQes10CxbJgluWLhiaSicpJ9Dp5POeLEbF9fcgFp5TVSOLPicgqPHLq7j8KSqGM', NULL, NULL, '广东省', '深圳市', '龙岗区', '龙城街道', '龙*街道深圳市龙岗**城**路学府**园*栋***', NULL, '刘**', '***********', NULL, NULL, NULL, '0', NULL, '2025092822001124321446435489', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '4775628888209611911', NULL, 0, NULL);
INSERT INTO `oms_tao_order` VALUES (34, 1010, 2932989422218307069, '曲美家具官方旗舰店', 'fixed', '1', 'true', '3188.00', NULL, NULL, 'AAEiHVMUAAJ_dKyzaDVBxCU9', NULL, '朱**', NULL, NULL, NULL, 4999.00, 0.00, 0.00, 0.00, 3188.00, 3188.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2025-09-14 15:00:37', '2025-10-02 08:47:09', '2025-09-14 15:00:41', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, NULL, 'TRADE_FINISHED', NULL, NULL, NULL, 0, '2025-10-02 08:47:13', NULL, NULL, '1Je1D4wRMEm7jEGicYFy0ib8p5mZKhRTbYQEYayc4CicQViTVcxZyNU5ib6LvibwE6Ynctwja4EW', NULL, NULL, '广西壮族自治区', '北海市', '海城区', '地角街道', '地*街道**路**号嘉和冠山海爱丁**栋****', NULL, '齐**', '***********', NULL, NULL, NULL, '0', NULL, '2025091422001137061412479677', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', NULL, NULL, '2932989422218307069', NULL, 0, NULL);
-- ----------------------------
-- Table structure for oms_tao_order_item
@ -2637,49 +2630,6 @@ CREATE TABLE `oms_tao_order_item` (
-- ----------------------------
-- Records of oms_tao_order_item
-- ----------------------------
INSERT INTO `oms_tao_order_item` VALUES (6, 4779976431876409626, 4779976431877409626, 2685.00, 1314.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美家居中古风简约家用小户型主卧床高端大气1米8双人卧室床', 'https://img.alicdn.com/bao/uploaded/i4/351855490/O1CN01mLxAEc1qQTSmWI0Gq_!!351855490.jpg', 3999.00, 903329812842, '5759787448076', NULL, 'ZH-NP-DS-F1-QM25-B14-18', '颜色分类:头层牛皮 奶油白;适用床垫尺寸:1800mm*2000mm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020000, NULL, '2025-10-02 08:35:03', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (7, 4764667284568652936, 4764667284569652936, 3108.00, 1891.00, 0.00, 3108.00, 0.00, 3108.00, '曲美家居中古风1米5实木单人床架1米8双人床家用小户型简约卧室床', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01wKmPeB1qQTSl1Vf9e_!!351855490.jpg', 4999.00, 898893488285, '5921501274937', NULL, 'ZH-YM-DS-F3-QM25-B8-15&M2-15', '颜色分类:床+椰云床垫 原木色;适用床垫尺寸:1500mm*2000mm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50019997, NULL, NULL, NULL, NULL, '2025-09-28 14:45:27', 'express', '红背心', 'F526920200', NULL, 'WAIT_BUYER_CONFIRM_GOODS', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (8, 2957245681988996758, 2957245681989996758, 1333.00, 666.00, 0.00, 1333.00, 0.00, 1333.00, '【优惠价】曲美家居家用现代简约卧室抽屉柜客厅收纳储物柜白色奶油风斗柜', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01kZbIFv1qQTSdW6lpB_!!351855490.jpg', 1999.00, 932009228513, '5818178621825', NULL, 'ZH-NYB-DS-F6-QM25-NT8', '颜色分类:海量九斗柜', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50015740, NULL, NULL, NULL, NULL, '2025-10-01 22:56:08', 'express', '红背心', 'F527220328', NULL, 'WAIT_BUYER_CONFIRM_GOODS', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (9, 2957245681988996758, 2957245681990996758, 891.00, 1108.00, 0.00, 891.00, 0.00, 891.00, '【优惠价】曲美家居家用现代简约卧室抽屉柜客厅收纳储物柜白色奶油风斗柜', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01FLNUKZ1qQTSbQa7cj_!!351855490.jpg', 1999.00, 932009228513, '5818178621823', NULL, 'ZH-NYB-DS-F4-QM25-NT8', '颜色分类:双排六斗柜', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50015740, NULL, NULL, NULL, NULL, '2025-10-01 22:56:08', 'express', '红背心', 'F527220328', NULL, 'WAIT_BUYER_CONFIRM_GOODS', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (10, 2882250231964279377, 2882250231965279377, 3329.00, 670.00, 0.00, 2829.65, 499.35, 2829.65, '曲美家居2025新款现代简约小户型客厅家用饭桌长方形桌子岩板餐桌', 'https://img.alicdn.com/bao/uploaded/i4/351855490/O1CN01ABfMOD1qQTS7IdYTC_!!351855490.jpg', 3999.00, 916046662995, '5949959662239', NULL, 'ZH-ZG-DS-QM25-TD5-1.4&QM25-C2', '颜色分类:一桌四椅 1.4米餐桌+华夫格焦糖棕餐椅*4', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 201846803, NULL, '2025-10-01 22:41:12', NULL, NULL, '2025-09-20 16:25:08', 'express', '跨越速运', 'KY4000824469485', NULL, 'TRADE_FINISHED', 'CLOSED', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (11, 4736689704543141607, 4736689704544141607, 5031.00, 4368.00, 0.00, 5031.00, 0.00, 0.00, '【优惠价】曲美家居现代简约北欧风头层真皮床轻奢主卧室弯曲木工艺月半湾', 'https://img.alicdn.com/bao/uploaded/i4/351855490/O1CN012CLP1p1qQTJMLYFnH_!!351855490.jpg', 9399.00, 739038496267, '5098391736116', NULL, 'F2-HGHT-23E-WQM-B1-180', '颜色分类:烟雨灰【进口头层牛皮】;适用床垫尺寸:1800mm*2000mm;床结构:框架结构', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020000, NULL, '2025-09-11 22:31:25', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED', 'SUCCESS', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (12, 2955450648003237790, 2955450648004237790, 2608.00, 3391.00, 0.00, 2608.00, 0.00, 2608.00, '曲美家居中古风实木1.8米双人床家用现代简约主卧床齐边软包大床', 'https://img.alicdn.com/bao/uploaded/i3/351855490/O1CN01jfH7Kq1qQTSj5N8kq_!!351855490.jpg', 5999.00, 898066226436, '5751519136097', NULL, 'ZH-HT-DS-F1-QM25-B9-18', '颜色分类:胡桃色;适用床垫尺寸:1800mm*2000mm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50019997, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'WAIT_SELLER_SEND_GOODS', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (13, 2955210242793344060, 2955210242794344060, 2998.00, 7001.00, 0.00, 2998.00, 0.00, 2998.00, '曲美家居官方中古风实木大衣柜家用卧室家具平开门柜子衣橱储物柜', 'https://img.alicdn.com/bao/uploaded/i4/351855490/O1CN01ixwHJh1qQTSawtrUh_!!351855490.jpg', 9999.00, 898971517594, '5919684074048', NULL, 'ZH-HT-DS-F1-QM25-WG1-1', '颜色分类:胡桃色;门数量:2门', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50015744, NULL, NULL, NULL, NULL, '2025-10-01 20:09:46', 'express', '红背心', 'F527320239', NULL, 'WAIT_BUYER_CONFIRM_GOODS', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (14, 4745978892673938327, 4745978892673938327, 4726.00, 5272.00, 0.00, 4017.10, 708.90, 4017.10, '曲美家居中古风1米5实木单人床架1米8双人床家用小户型简约卧室床', 'https://img.alicdn.com/bao/uploaded/i2/351855490/O1CN01ilOM3j1qQTSl1V3jX_!!351855490.jpg', 4999.00, 898893488285, '5920190999172', NULL, 'ZH-HT-DS-F1-QM25-B8-15', '颜色分类:胡桃色;适用床垫尺寸:1500mm*2000mm', NULL, NULL, 2, NULL, NULL, NULL, NULL, 'B', 50019997, NULL, NULL, NULL, NULL, '2025-10-01 20:08:45', 'express', '红背心', 'F527320143', NULL, 'WAIT_BUYER_CONFIRM_GOODS', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (15, 4744159056482938327, 4744159056482938327, 5216.00, 6782.00, 0.00, 5216.00, 0.00, 5216.00, '曲美家居中古风实木1.8米双人床家用现代简约主卧床齐边软包大床', 'https://img.alicdn.com/bao/uploaded/i3/351855490/O1CN01jfH7Kq1qQTSj5N8kq_!!351855490.jpg', 5999.00, 898066226436, '5751519136097', NULL, 'ZH-HT-DS-F1-QM25-B9-18', '颜色分类:胡桃色;适用床垫尺寸:1800mm*2000mm', NULL, NULL, 2, NULL, NULL, NULL, NULL, 'B', 50019997, NULL, NULL, NULL, NULL, '2025-10-01 20:07:43', 'express', '红背心', 'F527320143', NULL, 'WAIT_BUYER_CONFIRM_GOODS', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (16, 4769092801752472343, 4769092801752472343, 168.20, 29.80, 0.00, 168.20, 0.00, 168.20, '曲美家居官方慢回弹记忆枕家用成人专用护颈椎助睡眠枕芯枕头', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01BxHCko1qQTR4wS33P_!!351855490.jpg', 99.00, 889064775944, '5735963817978', NULL, 'ZH-ZT-DS-SM-QM25-ZT4', '颜色分类:70*42*10cm【15天发货】', NULL, NULL, 2, NULL, NULL, NULL, NULL, 'B', 202149818, NULL, '2025-10-01 19:10:59', NULL, NULL, '2025-09-27 15:04:30', 'express', '京东快递', 'JDX043398469676', NULL, 'TRADE_FINISHED', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (17, 4768235353572757234, 4768235353573757234, 2008.00, 2991.00, 0.00, 2008.00, 0.00, 1957.75, '曲美家居中古风1米5实木单人床架1米8双人床家用小户型简约卧室床', 'https://img.alicdn.com/bao/uploaded/i4/351855490/O1CN01zhxg0T1qQTSiYaEo2_!!351855490.jpg', 4999.00, 898893488285, '5920190999166', NULL, 'ZH-YM-DS-F3-QM25-B8-15', '颜色分类:原木色;适用床垫尺寸:1500mm*2000mm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50019997, NULL, '2025-10-01 18:24:08', NULL, NULL, '2025-09-28 15:21:05', 'express', '红背心', 'F526920195', NULL, 'TRADE_FINISHED', 'SUCCESS', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (18, 4781253132755757234, 4781253132756757234, 1988.00, 3011.00, 0.00, 1988.00, 0.00, 0.00, '【活动价】曲美家居中古风1米5实木单人床架1米8双人床家用小户型简约卧室床', 'https://img.alicdn.com/bao/uploaded/i4/351855490/O1CN01zhxg0T1qQTSiYaEo2_!!351855490.jpg', 4999.00, 898893488285, '5920190999166', NULL, 'ZH-YM-DS-F3-QM25-B8-15', '颜色分类:原木色;适用床垫尺寸:1500mm*2000mm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50019997, NULL, '2025-10-01 17:54:39', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED', 'SUCCESS', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (19, 4781369664948623818, 4781369664949623818, 378.00, 1121.00, 0.00, 378.00, 0.00, 378.00, '【活动价】曲美lab墩墩沙发现代别墅客厅沙发组合沙发配件', 'https://img.alicdn.com/bao/uploaded/i2/351855490/O1CN01FiUI0u1qQTMAdoqZa_!!351855490.jpg', 1499.00, 730871350821, '5380261056537', NULL, 'F7-23E-LAB-SJDZ-1', '适用人数:组合;颜色分类:蔷薇粉【灯芯绒】;尺寸:84x20x52cm', NULL, NULL, 1, NULL, NULL, 'false', 'false', 'B', 50020633, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'WAIT_SELLER_SEND_GOODS', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (20, 4781369664948623818, 4781369664950623818, 378.00, 1121.00, 0.00, 378.00, 0.00, 378.00, '【活动价】曲美lab墩墩沙发现代别墅客厅沙发组合沙发配件', 'https://img.alicdn.com/bao/uploaded/i2/351855490/O1CN01FiUI0u1qQTMAdoqZa_!!351855490.jpg', 1499.00, 730871350821, '5380261056515', NULL, 'F2-23E-LAB-SJDZ-1', '适用人数:组合;颜色分类:奶茶灰【灯芯绒】;尺寸:84x20x52cm', NULL, NULL, 1, NULL, NULL, 'false', 'false', 'B', 50020633, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'WAIT_SELLER_SEND_GOODS', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (21, 4781369664948623818, 4781369664951623818, 3304.00, 6694.00, 0.00, 3304.00, 0.00, 3304.00, '【活动价】曲美lab墩墩沙发现代简约模块布艺真皮沙发别墅客厅沙发自由搭配', 'https://img.alicdn.com/bao/uploaded/i4/351855490/O1CN01NspmnZ1qQTLR1LBVt_!!351855490.png', 4999.00, 770344068923, '5340247493414', NULL, 'F1-23E-LAB-FS', '适用人数:组合;颜色分类:灯芯绒扶手-燕麦白;尺寸:96x24x60cm', NULL, NULL, 2, NULL, NULL, 'false', 'false', 'B', 50020633, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'WAIT_SELLER_SEND_GOODS', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (22, 4781177713430610710, 4781177713431610710, 942.00, 4057.00, 0.00, 942.00, 0.00, 942.00, '【活动价】曲美家居复古实木斗柜中古风家用客厅电视柜餐边柜卧室储物收纳柜', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01RpHHdM1qQTRkcsBof_!!351855490.jpg', 4999.00, 906063805860, '5933370327547', NULL, 'ZH-ZG-DS-BL-QM25-NT2', '颜色分类:床头柜 中古色单柜*1[【40天发货】]', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50015740, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'WAIT_SELLER_SEND_GOODS', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (23, 2906254527799501094, 2906254527800501094, 619.00, 1380.00, 0.00, 526.15, 92.85, 0.00, '曲美家居家用现代简约卧室抽屉柜客厅收纳储物柜白色奶油风斗柜', 'https://img.alicdn.com/bao/uploaded/i2/351855490/O1CN019jemMo1qQTSbQa3Sn_!!351855490.jpg', 1999.00, 932009228513, '5818178621820', NULL, 'ZH-NYB-DS-F1-QM25-NT8', '颜色分类:小巧三斗柜', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50015740, NULL, '2025-09-01 16:36:09', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED', 'SUCCESS', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (24, 4769970048747824611, 4769970048748824611, 3538.00, 4461.00, 0.00, 3538.00, 0.00, 3538.00, '曲美家居真皮婚床次卧轻奢悬浮现代简约高端大气主卧室双人左岸床', 'https://img.alicdn.com/bao/uploaded/i2/351855490/O1CN01pF9mAE1qQTFrWXkWd_!!351855490.jpg', 7999.00, 718529179488, '5024925108638', NULL, 'DS-F1-QM23-B1-12&QM23-M1-12', '颜色分类:架子款-浅咖色 进口真皮软床+独袋弹簧乳胶床垫;适用床垫尺寸:1200mm*2000mm;床结构:框架结构', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020000, NULL, '2025-10-01 15:41:01', NULL, NULL, '2025-09-27 23:57:08', 'express', '顺丰速运', 'SF3297741286482', NULL, 'TRADE_FINISHED', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (25, 4779070308838830200, 4779070308839830200, 378.00, 1121.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美lab墩墩沙发现代别墅客厅沙发组合沙发配件', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01gnsf7b1qQTMCTnI4c_!!351855490.jpg', 1499.00, 730871350821, '5380261056486', NULL, 'F9-23E-LAB-ZDB-2', '适用人数:组合;颜色分类:石墨灰【灯芯绒】;尺寸:94x45x35cm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020633, NULL, '2025-10-01 15:47:33', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (26, 4779070308838830200, 4779070308840830200, 378.00, 1121.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美lab墩墩沙发现代别墅客厅沙发组合沙发配件', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01gnsf7b1qQTMCTnI4c_!!351855490.jpg', 1499.00, 730871350821, '5380261056464', NULL, 'F8-23E-LAB-ZDB-2', '适用人数:组合;颜色分类:焦糖棕【灯芯绒】;尺寸:94x45x35cm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020633, NULL, '2025-10-01 15:47:33', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (27, 4779070308838830200, 4779070308841830200, 378.00, 1121.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美lab墩墩沙发现代别墅客厅沙发组合沙发配件', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01gnsf7b1qQTMCTnI4c_!!351855490.jpg', 1499.00, 730871350821, '5380261056530', NULL, 'F7-23E-LAB-ZDB-2', '适用人数:组合;颜色分类:蔷薇粉【灯芯绒】;尺寸:94x45x35cm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020633, NULL, '2025-10-01 15:47:33', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (28, 4779070308838830200, 4779070308842830200, 1134.00, 3363.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美lab墩墩沙发现代别墅客厅沙发组合沙发配件', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01gnsf7b1qQTMCTnI4c_!!351855490.jpg', 1499.00, 730871350821, '5380261056508', NULL, 'F2-23E-LAB-ZDB-2', '适用人数:组合;颜色分类:奶茶灰【灯芯绒】;尺寸:94x45x35cm', NULL, NULL, 3, NULL, NULL, NULL, NULL, 'B', 50020633, NULL, '2025-10-01 15:47:33', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (29, 4779070308838830200, 4779070308843830200, 1027.00, 472.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美lab墩墩沙发现代别墅客厅沙发组合沙发配件', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01gnsf7b1qQTMCTnI4c_!!351855490.jpg', 1499.00, 730871350821, '5380261056552', NULL, 'F5-23E-LAB-ZDB-2', '适用人数:组合;颜色分类:冰川灰【头层牛皮】;尺寸:94x45x35cm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020633, NULL, '2025-10-01 15:47:33', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (30, 4779070308838830200, 4779070308844830200, 521.00, 978.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美lab墩墩沙发现代别墅客厅沙发组合沙发配件', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01gnsf7b1qQTMCTnI4c_!!351855490.jpg', 1499.00, 730871350821, '5380261056497', NULL, 'F4-23E-LAB-ZDB-2', '适用人数:组合;颜色分类:蜜糖棕【硅胶皮】;尺寸:94x45x35cm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020633, NULL, '2025-10-01 15:47:33', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (31, 4778846679944830200, 4778846679945830200, 378.00, 1121.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美lab墩墩沙发现代别墅客厅沙发组合沙发配件', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01gnsf7b1qQTMCTnI4c_!!351855490.jpg', 1499.00, 730871350821, '5380261056464', NULL, 'F8-23E-LAB-ZDB-2', '适用人数:组合;颜色分类:焦糖棕【灯芯绒】;尺寸:94x45x35cm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020633, NULL, '2025-10-01 15:44:08', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (32, 4778846679944830200, 4778846679946830200, 378.00, 1121.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美lab墩墩沙发现代别墅客厅沙发组合沙发配件', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01gnsf7b1qQTMCTnI4c_!!351855490.jpg', 1499.00, 730871350821, '5380261056530', NULL, 'F7-23E-LAB-ZDB-2', '适用人数:组合;颜色分类:蔷薇粉【灯芯绒】;尺寸:94x45x35cm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020633, NULL, '2025-10-01 15:44:08', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (33, 4778846679944830200, 4778846679947830200, 378.00, 1121.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美lab墩墩沙发现代别墅客厅沙发组合沙发配件', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01gnsf7b1qQTMCTnI4c_!!351855490.jpg', 1499.00, 730871350821, '5380261056475', NULL, 'F1-23E-LAB-ZDB-2', '适用人数:组合;颜色分类:燕麦白【灯芯绒】;尺寸:94x45x35cm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020633, NULL, '2025-10-01 15:44:08', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (34, 4778912197701623818, 4778912197702623818, 3304.00, 6694.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美lab墩墩沙发现代简约模块布艺真皮沙发别墅客厅沙发自由搭配', 'https://img.alicdn.com/bao/uploaded/i4/351855490/O1CN01NspmnZ1qQTLR1LBVt_!!351855490.png', 4999.00, 770344068923, '5340247493414', NULL, 'F1-23E-LAB-FS', '适用人数:组合;颜色分类:灯芯绒扶手-燕麦白;尺寸:96x24x60cm', NULL, NULL, 2, NULL, NULL, NULL, NULL, 'B', 50020633, NULL, '2025-10-01 15:34:03', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (35, 4778912197701623818, 4778912197703623818, 378.00, 1121.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美lab墩墩沙发现代别墅客厅沙发组合沙发配件', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01gnsf7b1qQTMCTnI4c_!!351855490.jpg', 1499.00, 730871350821, '5380261056508', NULL, 'F2-23E-LAB-ZDB-2', '适用人数:组合;颜色分类:奶茶灰【灯芯绒】;尺寸:94x45x35cm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020633, NULL, '2025-10-01 15:34:03', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (36, 4778912197701623818, 4778912197704623818, 378.00, 1121.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美lab墩墩沙发现代别墅客厅沙发组合沙发配件', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01gnsf7b1qQTMCTnI4c_!!351855490.jpg', 1499.00, 730871350821, '5380261056530', NULL, 'F7-23E-LAB-ZDB-2', '适用人数:组合;颜色分类:蔷薇粉【灯芯绒】;尺寸:94x45x35cm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020633, NULL, '2025-10-01 15:34:03', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (37, 2961805369467001653, 2961805369467001653, 1155.00, 1644.00, 0.00, 1155.00, 0.00, 1155.00, '【活动价】曲美家居独袋弹簧天然乳胶床垫家用软硬厚床垫保护脊椎舒星床垫', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01KEw5x51qQTM9XzZaz_!!351855490.jpg', 2799.00, 35211712394, '5431176608029', NULL, 'ZH-PTCD-DS-QM23-M1-18', '尺寸:1800mm*2000mm;颜色分类:【升级款】独袋弹簧乳胶床垫', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 122920001, NULL, '2025-09-27 22:38:20', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED', 'SUCCESS', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (38, 2961633398805001653, 2961633398805001653, 1937.00, 2062.00, 0.00, NULL, 0.00, 1937.00, '【活动价】曲美家居中古风简约轻奢新款主卧1.8米双人储物高档时尚软包婚床', 'https://img.alicdn.com/bao/uploaded/i4/351855490/O1CN01Yzlz2n1qQTSmq4MMy_!!351855490.jpg', 3999.00, 900953533248, '5923270990467', NULL, 'ZH-PC-DS-F1-QM25-B12-18', '颜色分类:皓月白 1.8*2.0m', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020000, NULL, '2025-09-27 22:24:47', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (39, 2966705005968263599, 2966705005969263599, 1886.00, 2113.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美家居中古风网红款1.5米床法式轻奢现代简约主卧1.8米双人大床', 'https://img.alicdn.com/bao/uploaded/i2/351855490/O1CN01eTxPYL1qQTSfjqQWj_!!351855490.jpg', 3999.00, 900792623897, '5756844568507', NULL, 'ZH-PC-DS-F3-QM25-B11-15', '颜色分类:奶咖棕 1.5*2.0m', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020000, NULL, '2025-10-01 13:52:33', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (40, 2966705005968263599, 2966705005970263599, 1155.00, 1644.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美家居独袋弹簧天然乳胶床垫家用软硬厚床垫保护脊椎舒星床垫', 'https://img.alicdn.com/bao/uploaded/i2/351855490/O1CN01pEjTkN1qQTMIx0EfL_!!351855490.jpg', 2799.00, 35211712394, '5431176608028', NULL, 'ZH-PTCD-DS-QM23-M1-15', '尺寸:1500mm*2000mm;颜色分类:【升级款】独袋弹簧乳胶床垫', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 122920001, NULL, '2025-10-01 13:52:33', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (41, 2946756758362966788, 2946756758363966788, 1387.00, 1412.00, 0.00, 1178.95, 208.05, 1178.95, '曲美家居独袋弹簧天然乳胶床垫家用软硬厚床垫保护脊椎舒星床垫', 'https://img.alicdn.com/bao/uploaded/i2/351855490/O1CN01pEjTkN1qQTMIx0EfL_!!351855490.jpg', 2799.00, 35211712394, '5431176608028', NULL, 'ZH-PTCD-DS-QM23-M1-15', '尺寸:1500mm*2000mm;颜色分类:【升级款】独袋弹簧乳胶床垫', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 122920001, NULL, '2025-10-01 12:17:59', NULL, NULL, '2025-09-25 15:24:14', 'express', '顺丰速运', 'SF3234854229048', NULL, 'TRADE_FINISHED', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (42, 2946756758362966788, 2946756758364966788, 2222.00, 1777.00, 0.00, 1888.70, 333.30, 1888.70, '曲美家居现代简约网红钢琴键真皮床2025新款主卧齐边双人软包大床', 'https://img.alicdn.com/bao/uploaded/i4/351855490/O1CN015X8dBg1qQTSnFcbF5_!!351855490.jpg', 3999.00, 902332861164, '5758540476958', NULL, 'ZH-CQP-DS-F1-QM25-B13-15', '颜色分类:超纤皮 皓月白;适用床垫尺寸:1500mm*2000mm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020000, NULL, '2025-10-01 12:17:59', NULL, NULL, '2025-09-25 15:24:14', 'express', '顺丰速运', 'SF3234854229048', NULL, 'TRADE_FINISHED', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (43, 2897744990247223355, 2897744990248223355, 5991.00, 4008.00, 0.00, 5991.00, 0.00, 5991.00, '【优惠价】曲美家居官方中古风实木大衣柜家用卧室家具平开门柜子衣橱储物柜', 'https://img.alicdn.com/bao/uploaded/i1/351855490/O1CN01gaAk1T1qQTSZhPhhE_!!351855490.jpg', 9999.00, 898971517594, '5919684074050', NULL, 'ZH-HT-DS-F1-QM25-WG1-1*2', '颜色分类:胡桃色;门数量:4门', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50015744, NULL, NULL, NULL, NULL, '2025-10-01 10:47:24', 'express', '跨越速运', 'KY4000833509554', NULL, 'WAIT_BUYER_CONFIRM_GOODS', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (44, 2966134443991077288, 2966134443992077288, 3654.00, 2345.00, 0.00, NULL, 0.00, 0.00, '【活动价】曲美家居复古中古客厅家用焦糖色皮艺沙发直排三人位意式黑色沙发', 'https://img.alicdn.com/bao/uploaded/i4/351855490/O1CN011OQbwO1qQTSbtK4jF_!!351855490.jpg', 5999.00, 931501825773, '5816379652977', NULL, 'ZH-YLP-DS-F1-QM25-S9-XZP', '颜色分类:红棕咖 超纤油蜡皮 2.2m', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50020633, NULL, '2025-10-01 11:20:10', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'TRADE_CLOSED_BY_TAOBAO', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (45, 2894341441004928576, 2894341441005928576, 976.00, 2023.00, 0.00, 976.00, 0.00, 976.00, '【优惠价】曲美家居包豪斯中古风现代家用客厅设计师侘寂风休闲疯马皮沙发椅', 'https://img.alicdn.com/bao/uploaded/i3/351855490/O1CN01X2Whhh1qQTPgfwZt5_!!351855490.jpg', 2999.00, 855765648267, '5826335378148', NULL, 'ZH-PC-2-DS-F3-QM24-C2', '颜色分类:疯马皮 琥珀棕-单椅含靠包【35天发货】', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50015483, NULL, '2025-09-16 13:50:26', NULL, NULL, '2025-09-10 08:24:26', 'express', '红背心', 'F525120240', NULL, 'TRADE_FINISHED', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (46, 2912223073878775781, 2912223073878775781, 109.00, 20.00, 0.00, 109.00, 0.00, 109.00, '曲美家居夏季凝胶枕成人透气面料家用颈椎枕助睡眠护颈椎记忆枕头', 'https://img.alicdn.com/bao/uploaded/i4/351855490/O1CN01M1rqVS1qQTR3zWE0P_!!351855490.jpg', 129.00, 889068427445, '5735968321913', NULL, 'ZH-ZT-DS-QY-QM25-ZT5', '颜色分类:68*40*10cm【15天发货】', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 202149818, NULL, '2025-10-01 10:25:04', NULL, NULL, '2025-09-06 10:24:55', 'express', '京东快递', 'JDX042858054068', NULL, 'TRADE_FINISHED', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (47, 4775628888209611911, 4775628888209611911, 21.20, 67.80, 0.00, 21.20, 0.00, 21.20, '【活动价】曲美家居轻北欧柔软舒适坐垫 四季通用客厅餐椅创意垫子懒人坐垫', 'https://img.alicdn.com/bao/uploaded/TB1_mJnpOOYBuNjSsD4L6TSkFXa', 89.00, 571525956101, '3873068238087', NULL, 'ZH-JKSP-106720237010-1', '颜色分类:奥法雷尔坐垫-玫瑰色L40*W40*H2.5cm[【12天发货】];尺寸:其他规格', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50024799, NULL, NULL, NULL, NULL, '2025-09-29 15:27:27', 'express', '中通快递', '73574521493195', NULL, 'WAIT_BUYER_CONFIRM_GOODS', 'NO_REFUND', NULL, NULL, NULL, NULL);
INSERT INTO `oms_tao_order_item` VALUES (48, 2932989422218307069, 2932989422219307069, 3188.00, 1811.00, 0.00, 3188.00, 0.00, 3188.00, '曲美家居中古风1米5实木单人床架1米8双人床家用小户型简约卧室床', 'https://img.alicdn.com/bao/uploaded/i3/351855490/O1CN01TzlgR71qQTSk3mWR3_!!351855490.jpg', 4999.00, 898893488285, '5921501274941', NULL, 'ZH-NY-DS-F2-QM25-B8-18&M2-18', '颜色分类:床+椰云床垫 奶油色;适用床垫尺寸:1800mm*2000mm', NULL, NULL, 1, NULL, NULL, NULL, NULL, 'B', 50019997, NULL, '2025-09-29 10:24:34', NULL, NULL, '2025-09-19 10:24:27', 'express', '顺丰速运', 'SF3282167327730', NULL, 'TRADE_FINISHED', 'NO_REFUND', NULL, NULL, NULL, NULL);
-- ----------------------------
-- Table structure for oms_tao_order_promotion
@ -3210,7 +3160,7 @@ INSERT INTO `sys_menu` VALUES (3, '店铺&平台设置', 0, 90, 'shop', 'Layout'
INSERT INTO `sys_menu` VALUES (4, '商品管理', 0, 0, 'goods', 'Layout', '', 1, 0, 'M', '0', '0', '', 'international', 'admin', '2023-12-29 16:53:03', 'admin', '2025-10-01 12:16:48', '');
INSERT INTO `sys_menu` VALUES (5, '系统设置', 0, 99, '/system', 'Layout', '', 1, 0, 'M', '0', '0', '', 'system', 'admin', '2023-12-27 15:00:27', 'admin', '2023-12-29 09:07:42.856856', '系统管理目录');
INSERT INTO `sys_menu` VALUES (6, '发货管理', 0, 20, 'ship', 'Layout', 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 (7, '管理', 0, 40, 'stock', 'Layout', NULL, 1, 0, 'M', '0', '0', '', 'lock', 'admin', '2024-08-25 15:54:14', 'admin', '2025-03-24 13:32:20', '');
INSERT INTO `sys_menu` VALUES (7, '库管理', 0, 40, 'stock', 'Layout', NULL, 1, 0, 'M', '0', '0', '', 'lock', 'admin', '2024-08-25 15:54:14', 'admin', '2025-10-09 05:04:48', '');
INSERT INTO `sys_menu` VALUES (8, '采购管理', 0, 5, '/purchase', 'Layout', NULL, 1, 0, 'M', '0', '0', NULL, 'shopping', 'admin', '2025-09-08 19:35:08', '', NULL, '');
INSERT INTO `sys_menu` VALUES (100, '发货订单库', 1, 1, 'order_list', 'order/index', '', 1, 0, 'C', '0', '0', '', 'shopping', 'admin', '2023-12-27 15:00:27', 'admin', '2025-10-01 08:35:56', '用户管理菜单');
INSERT INTO `sys_menu` VALUES (101, '订单拉取日志', 1, 32, 'order_pull_logs', 'order/shopOrder/pull_log', '', 1, 0, 'C', '0', '0', '', 'documentation', 'admin', '2023-12-27 15:00:27', 'admin', '2025-05-19 14:11:59', '角色管理菜单');
@ -3247,12 +3197,12 @@ INSERT INTO `sys_menu` VALUES (2097, '物流跟踪', 6, 5, 'logistics', 'shippin
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', '');
INSERT INTO `sys_menu` VALUES (2103, '手动创建私域订单', 1, 49, 'offline_order_create', 'order/private/create', NULL, 1, 0, 'C', '1', '0', '', 'date', 'admin', '2024-07-27 20:30:07', 'admin', '2025-03-24 11:46:51', '');
INSERT INTO `sys_menu` VALUES (2106, '商品入库管理', 7, 10, 'stock_in', 'stock/stockIn/index.vue', NULL, 1, 0, 'C', '0', '0', '', 'download', 'admin', '2024-08-25 15:56:04', 'admin', '2025-03-24 13:35:21', '');
INSERT INTO `sys_menu` VALUES (2114, '仓库仓位设置', 7, 90, 'warehouse', 'stock/warehouse/index.vue', NULL, 1, 0, 'C', '0', '0', '', 'cascader', 'admin', '2024-09-21 20:07:26', 'admin', '2025-03-24 13:46:52', '');
INSERT INTO `sys_menu` VALUES (2115, '商品库存管理', 7, 0, 'goods_inventory', 'stock/goodsInventory/index.vue', NULL, 1, 0, 'C', '0', '0', '', 'chart', 'admin', '2024-09-21 20:43:00', 'admin', '2025-03-24 13:34:55', '');
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 (2106, '入库管理', 7, 10, 'stock_in', 'stock/stockIn/index.vue', NULL, 1, 0, 'C', '0', '0', '', 'download', 'admin', '2024-08-25 15:56:04', 'admin', '2025-10-09 05:05:09', '');
INSERT INTO `sys_menu` VALUES (2114, '仓库管理', 7, 90, 'warehouse', 'stock/warehouse/index.vue', NULL, 1, 0, 'C', '0', '0', '', 'cascader', 'admin', '2024-09-21 20:07:26', 'admin', '2025-10-09 05:06:14', '');
INSERT INTO `sys_menu` VALUES (2115, '库存管理', 7, 0, 'goods_inventory', 'stock/goodsInventory/index.vue', NULL, 1, 0, 'C', '0', '0', '', 'chart', 'admin', '2024-09-21 20:43:00', 'admin', '2025-10-09 05:05:02', '');
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-10-09 05:05:24', '');
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 (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-10-09 05:05:17', '');
INSERT INTO `sys_menu` VALUES (2129, '订单发货', 6, 0, 'ship_order', 'shipping/wait_ship.vue', NULL, 1, 0, 'C', '0', '0', '', 'checkbox', 'admin', '2025-06-01 13:36:57', 'admin', '2025-10-09 02:43:33', '');
-- ----------------------------
@ -3573,7 +3523,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-10-09 10:36:15', 'admin', '2023-08-07 19:31:37', '', '2025-10-09 02:36:14', '管理员');
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-10-09 14:32:01', 'admin', '2023-08-07 19:31:37', '', '2025-10-09 06:32:01', '管理员');
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);

View File

@ -0,0 +1,9 @@
package cn.qihangerp.api.order;
import lombok.Data;
@Data
public class ShipOrderItemSkuIdUpdateBo {
private Long id;
private Long erpGoodsSkuId;
}

View File

@ -0,0 +1,8 @@
package cn.qihangerp.api.order;
import lombok.Data;
@Data
public class StockOutEntryGenerateBo {
private Long id;
}

View File

@ -1,5 +1,7 @@
package cn.qihangerp.api.order.controller;
import cn.qihangerp.api.order.ShipOrderItemSkuIdUpdateBo;
import cn.qihangerp.api.order.StockOutEntryGenerateBo;
import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.ResultVo;
@ -23,7 +25,6 @@ import org.springframework.web.bind.annotation.*;
public class OrderShipController extends BaseController {
private final OOrderShipListService shipStockUpService;
private final OOrderShipListItemService shipStockUpItemService;
/**
* 备货列表(仓库发货)
* @param bo
@ -32,6 +33,18 @@ public class OrderShipController extends BaseController {
*/
@GetMapping("/stock_up_list_by_warehouse")
public TableDataInfo stock_up_list(ShipStockUpBo bo, PageQuery pageQuery)
{
var pageList = shipStockUpService.queryWarehousePageList(bo,pageQuery);
return getDataTable(pageList);
}
/**
* 备货列表(仓库发货)
* @param bo
* @param pageQuery
* @return
*/
@GetMapping("/stock_up_list_item_by_warehouse")
public TableDataInfo stock_up_list_item(ShipStockUpBo bo, PageQuery pageQuery)
{
var pageList = shipStockUpItemService.queryWarehousePageList(bo,pageQuery);
return getDataTable(pageList);
@ -59,38 +72,26 @@ public class OrderShipController extends BaseController {
return getDataTable(pageList);
}
/**
* 仓库备货完善
* @param bo
* @return
*/
@PostMapping("/stock_up_complete")
public AjaxResult stock_up_complete(@RequestBody ShipStockUpCompleteBo bo)
{
int result = shipStockUpService.stockUpComplete(bo);
if(result == -1) return AjaxResult.error("参数错误orderItemIds为空");
if(result == -2) return AjaxResult.error("参数错误:没有要添加的");
else if(result == -1001) return AjaxResult.error("存在错误的orderItemId状态不对不能生成出库单");
else if(result == -1002) return AjaxResult.error("存在错误的订单数据名单明细中没有skuId请修改");
//wmsStockOutEntryService.insertWmsStockOutEntry(wmsStockOutEntry)
return toAjax(1);
}
/**
* 仓库备货完善
* @param bo
* @return
* 生成出库单
*/
@PostMapping("/stock_up_complete_by_order")
public AjaxResult stock_up_completeByOrder(@RequestBody ShipStockUpCompleteBo bo)
@PostMapping("/generate_stock_out_entry")
public AjaxResult generateStockOutEntry(@RequestBody StockOutEntryGenerateBo bo)
{
int result = shipStockUpService.stockUpCompleteByOrder(bo);
if(result == -1) return AjaxResult.error("参数错误orderItemIds为空");
if(result == -2) return AjaxResult.error("参数错误:没有要添加的");
else if(result == -1001) return AjaxResult.error("存在错误的orderItemId状态不对不能生成出库单");
else if(result == -1002) return AjaxResult.error("存在错误的订单数据名单明细中没有skuId请修改");
//wmsStockOutEntryService.insertWmsStockOutEntry(wmsStockOutEntry)
return toAjax(1);
log.info("============生成出库单========={}", JSON.toJSONString(bo));
if(bo.getId()==null||bo.getId()==0) return AjaxResult.error("缺少参数id");
var result = shipStockUpService.generateStockOutEntryByShipOrderId(bo.getId());
if(result.getCode()==0) return AjaxResult.success();
else return AjaxResult.error(result.getMsg());
// int result = stockOutEntryService.generateStockOutEntryForOrderItem(bo);
// if(result == -1) return AjaxResult.error("参数错误orderItemIds为空");
// if(result == -2) return AjaxResult.error("参数错误:没有要添加的");
// else if(result == -1001) return AjaxResult.error("存在错误的orderItemId状态不对不能生成出库单");
// else if(result == -1002) return AjaxResult.error("存在错误的订单数据名单明细中没有skuId请修改");
// //wmsStockOutEntryService.insertWmsStockOutEntry(wmsStockOutEntry)
// return toAjax(1);
}
/**
@ -113,4 +114,22 @@ public class OrderShipController extends BaseController {
return AjaxResult.success();
}else return AjaxResult.error(result.getMsg());
}
/**
* 修改订单明细skuId
* @param bo
* @return
*/
@PostMapping("/order_item_sku_id_update")
public AjaxResult orderItemSpecIdUpdate(@RequestBody ShipOrderItemSkuIdUpdateBo bo)
{
if(bo.getId()==null || bo.getId() ==0) return AjaxResult.error("参数错误id为空");
if(bo.getErpGoodsSkuId()==null || bo.getErpGoodsSkuId() ==0) return AjaxResult.error("参数错误ErpGoodsSkuId为空");
var result = shipStockUpItemService.updateErpSkuId(bo.getId(),bo.getErpGoodsSkuId());
if (result.getCode() == 0) {
return AjaxResult.success();
} else return AjaxResult.error(result.getMsg());
}
}

View File

@ -33,6 +33,11 @@
<artifactId>shop</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>cn.qihangerp.mapper</groupId>
<artifactId>mapper</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>

View File

@ -2,6 +2,7 @@ package cn.qihangerp.module.order.service;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.module.order.domain.OOrderShipListItem;
import cn.qihangerp.module.order.domain.bo.ShipStockUpBo;
import com.baomidou.mybatisplus.extension.service.IService;
@ -14,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface OOrderShipListItemService extends IService<OOrderShipListItem> {
PageResult<OOrderShipListItem> queryWarehousePageList(ShipStockUpBo bo, PageQuery pageQuery);
PageResult<OOrderShipListItem> querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery);
ResultVo<Integer> updateErpSkuId(Long id, Long erpSkuId);
}

View File

@ -16,13 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface OOrderShipListService extends IService<OOrderShipList> {
PageResult<OOrderShipList> querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery);
int stockUpCompleteByOrder(ShipStockUpCompleteBo bo);
/**
* 备货完成
* @param bo
* @return
*/
int stockUpComplete(ShipStockUpCompleteBo bo);
PageResult<OOrderShipList> queryWarehousePageList(ShipStockUpBo bo, PageQuery pageQuery);
/**
* 供应商发货手动填写发货物流信息
@ -31,4 +25,11 @@ public interface OOrderShipListService extends IService<OOrderShipList> {
* @return
*/
ResultVo<Integer> supplierShipOrderManualLogistics(SupplierOrderShipBo bo, String operator);
/**
* 生成出库单按发货订单
* @param shipOrderId
* @return
*/
ResultVo<Long> generateStockOutEntryByShipOrderId(Long shipOrderId);
}

View File

@ -2,6 +2,9 @@ package cn.qihangerp.module.order.service.impl;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.module.order.domain.bo.ShipStockUpBo;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -9,18 +12,22 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.module.order.domain.OOrderShipListItem;
import cn.qihangerp.module.order.service.OOrderShipListItemService;
import cn.qihangerp.module.order.mapper.OOrderShipListItemMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.Date;
/**
* @author qilip
* @description 针对表o_order_ship_list_item(发货-备货表打单加入备货清单)的数据库操作Service实现
* @createDate 2025-05-24 16:03:35
*/
@AllArgsConstructor
@Service
public class OOrderShipListItemServiceImpl extends ServiceImpl<OOrderShipListItemMapper, OOrderShipListItem>
implements OOrderShipListItemService{
private final OGoodsSkuMapper goodsSkuMapper;
@Override
public PageResult<OOrderShipListItem> queryWarehousePageList(ShipStockUpBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OOrderShipListItem> queryWrapper = new LambdaQueryWrapper<OOrderShipListItem>()
@ -46,6 +53,28 @@ public class OOrderShipListItemServiceImpl extends ServiceImpl<OOrderShipListIte
return PageResult.build(pages);
}
@Override
public ResultVo<Integer> updateErpSkuId(Long id, Long erpSkuId) {
var oOrderItem = this.baseMapper.selectById(id);
if(oOrderItem==null){
return ResultVo.error("找不到数据");
}else if(oOrderItem.getStatus()==3) return ResultVo.error("发货之后不允许修改");
OGoodsSku oGoodsSku = goodsSkuMapper.selectById(erpSkuId);
if(oGoodsSku==null){
return ResultVo.error("找不到商品Sku数据");
}
OOrderShipListItem update = new OOrderShipListItem();
update.setId(oOrderItem.getId());
update.setSkuId(erpSkuId);
update.setOriginalSkuId(oOrderItem.getSkuId()==null?"":oOrderItem.getSkuId().toString());
update.setUpdateBy("手动修改ERP SKU ID");
update.setUpdateTime(new Date());
this.baseMapper.updateById(update);
return ResultVo.success();
}
}

View File

@ -3,9 +3,12 @@ package cn.qihangerp.module.order.service.impl;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.entity.OLogisticsCompany;
import cn.qihangerp.model.entity.OOrder;
import cn.qihangerp.model.entity.OOrderItem;
import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.enums.EnumStockOutType;
import cn.qihangerp.common.utils.DateUtils;
import cn.qihangerp.mapper.ErpStockOutItemMapper;
import cn.qihangerp.mapper.ErpStockOutMapper;
import cn.qihangerp.model.entity.*;
import cn.qihangerp.module.mapper.OLogisticsCompanyMapper;
import cn.qihangerp.module.order.domain.OOrderShipListItem;
import cn.qihangerp.module.order.domain.OfflineOrder;
@ -25,8 +28,10 @@ import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -44,6 +49,8 @@ public class OOrderShipListServiceImpl extends ServiceImpl<OOrderShipListMapper,
private final OOrderMapper orderMapper;
private final OOrderItemMapper orderItemMapper;
private final OLogisticsCompanyMapper logisticsCompanyMapper;
private final ErpStockOutMapper outMapper;
private final ErpStockOutItemMapper outItemMapper;
@Override
public PageResult<OOrderShipList> querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery) {
@ -64,87 +71,24 @@ public class OOrderShipListServiceImpl extends ServiceImpl<OOrderShipListMapper,
return PageResult.build(pages);
}
/**
* 备货完成 by Order
* @param bo
* @return
*/
@Transactional(rollbackFor = Exception.class)
@Override
public int stockUpCompleteByOrder(ShipStockUpCompleteBo bo) {
if(bo.getOrderNums() == null || bo.getOrderNums().length == 0) return -1;
int total=0;
// 循环判断状态
for (String orderNum:bo.getOrderNums()) {
List<OOrderShipList> oOrderShipLists = this.baseMapper.selectList(new LambdaQueryWrapper<OOrderShipList>().eq(OOrderShipList::getOrderNum, orderNum));
if(oOrderShipLists == null || oOrderShipLists.size() == 0) continue;
// 更新订单
OOrderShipList update = new OOrderShipList();
update.setId(oOrderShipLists.get(0).getId());
update.setStatus(2);
update.setUpdateBy("备货完成");
update.setUpdateTime(new Date());
this.baseMapper.updateById(update);
List<OOrderShipListItem> upList = shipListItemMapper.selectList(new LambdaQueryWrapper<OOrderShipListItem>().eq(OOrderShipListItem::getListId,oOrderShipLists.get(0).getId()));
if (upList != null) {
for(OOrderShipListItem up : upList) {
if (up.getStatus() == 0 || up.getStatus() == 1) {
OOrderShipListItem updateItem = new OOrderShipListItem();
updateItem.setId(up.getId());
updateItem.setStatus(2);//备货完成
updateItem.setUpdateBy("备货完成");
updateItem.setUpdateTime(new Date());
shipListItemMapper.updateById(updateItem);
}
}
public PageResult<OOrderShipList> queryWarehousePageList(ShipStockUpBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OOrderShipList> queryWrapper = new LambdaQueryWrapper<OOrderShipList>()
.eq(OOrderShipList::getShipper,0)
.eq(bo.getShipSupplierId()!=null,OOrderShipList::getShipSupplierId,bo.getShipSupplierId())
.eq(bo.getShopId()!=null,OOrderShipList::getShopId,bo.getShopId())
.eq(bo.getStatus()!=null,OOrderShipList::getStatus,bo.getStatus())
.eq(StringUtils.hasText(bo.getOrderNum()),OOrderShipList::getOrderNum,bo.getOrderNum())
;
Page<OOrderShipList> pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper);
if(pages.getRecords()!=null && pages.getRecords().size()>0){
for(OOrderShipList o : pages.getRecords()){
o.setItems(shipListItemMapper.selectList(new LambdaQueryWrapper<OOrderShipListItem>().eq(OOrderShipListItem::getListId,o.getId())));
}
}
return 1;
}
/**
* 备货完成
* @param bo
* @return
*/
@Transactional(rollbackFor = Exception.class)
@Override
public int stockUpComplete(ShipStockUpCompleteBo bo) {
if(bo.getIds() == null || bo.getIds().length == 0) return -1;
int total=0;
// 循环判断状态
for (Long id:bo.getIds()) {
OOrderShipListItem up = shipListItemMapper.selectById(id);
if (up != null) {
if (up.getStatus() == 0 || up.getStatus() == 1) {
OOrderShipListItem update = new OOrderShipListItem();
update.setId(id);
update.setStatus(2);//备货完成
update.setUpdateBy("备货完成");
update.setUpdateTime(new Date());
shipListItemMapper.updateById(update);
}
List<OOrderShipListItem> oOrderShipListItems = shipListItemMapper.selectList(new LambdaQueryWrapper<OOrderShipListItem>().eq(OOrderShipListItem::getListId, up.getListId()).eq(OOrderShipListItem::getStatus, 0));
if(oOrderShipListItems == null || oOrderShipListItems.size() == 0) {
// 订单备货全部完成更新订单状态
OOrderShipList listUpdate = new OOrderShipList();
listUpdate.setId(up.getListId());
listUpdate.setStatus(2);
listUpdate.setUpdateBy("备货完成");
listUpdate.setUpdateTime(new Date());
this.baseMapper.updateById(listUpdate);
}
}
}
return 1;
return PageResult.build(pages);
}
/**
@ -243,6 +187,85 @@ public class OOrderShipListServiceImpl extends ServiceImpl<OOrderShipListMapper,
// 推送到店铺由controller进行操作
return ResultVo.success();
}
@Transactional(rollbackFor = Exception.class)
@Override
public ResultVo<Long> generateStockOutEntryByShipOrderId(Long shipOrderId) {
OOrderShipList oOrderShipList = this.baseMapper.selectById(shipOrderId);
if(oOrderShipList==null) return ResultVo.error("发货单不存在");
else if (oOrderShipList.getStatus()==3) {
return ResultVo.error("已经生成出库单");
}
List<OOrderShipListItem> oOrderShipListItems = shipListItemMapper.selectList(new LambdaQueryWrapper<OOrderShipListItem>().eq(OOrderShipListItem::getListId, oOrderShipList.getId()));
if(oOrderShipListItems.isEmpty()){
return ResultVo.error("没有找到发货单明细");
}
int sum = oOrderShipListItems.stream().mapToInt(OOrderShipListItem::getQuantity).sum();
// 开始生成出库单
// 组合出库单子表
List<ErpStockOutItem> itemList = new ArrayList<>();
for (OOrderShipListItem item : oOrderShipListItems) {
if(item.getSkuId()==null||item.getSkuId()==0){
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
log.error("======出库错误发货单明细没有找到SkuId:{}",item.getSkuId());
return ResultVo.error("发货单明细没有找到SkuId:"+item.getId());
}
ErpStockOutItem outItem = new ErpStockOutItem();
outItem.setStockOutType(EnumStockOutType.DDCK.getIndex());
outItem.setSourceOrderId(item.getListId());
outItem.setSourceOrderItemId(item.getId());
outItem.setSourceOrderNum(oOrderShipList.getOrderNum());
outItem.setGoodsId(item.getGoodsId());
outItem.setSpecId(item.getSkuId());
outItem.setSpecNum(item.getSkuNum());
outItem.setOriginalQuantity(item.getQuantity());
outItem.setOutQuantity(0);
outItem.setStatus(0);
outItem.setCreateTime(new Date());
itemList.add(outItem);
// 更新自己
OOrderShipListItem update = new OOrderShipListItem();
update.setId(item.getId());
update.setStatus(3);//备货完成
update.setUpdateBy("备货完成");
update.setUpdateTime(new Date());
shipListItemMapper.updateById(update);
}
//添加主表信息
ErpStockOut insert = new ErpStockOut();
insert.setStockOutNum("DDCK-"+ DateUtils.parseDateToStr("yyyyMMddHHmmss",new Date()));
insert.setStockOutType(EnumStockOutType.DDCK.getIndex());
insert.setSourceNum(oOrderShipList.getOrderNum());
insert.setSourceId(oOrderShipList.getId());
insert.setRemark("备货单生成出库单");
insert.setCreateBy("备货单生成出库单");
insert.setCreateTime(new Date());
insert.setGoodsUnit(oOrderShipListItems.size());
insert.setSpecUnit(oOrderShipListItems.size());
insert.setSpecUnitTotal(sum);
insert.setOutTotal(0);
insert.setOperatorId(0L);
insert.setOperatorName("");
insert.setPrintStatus(0);
insert.setStatus(0);//状态0待出库1部分出库2全部出库
outMapper.insert(insert);
itemList.forEach(oItem -> {
oItem.setEntryId(insert.getId());
outItemMapper.insert(oItem);
});
// 更新发货订单
OOrderShipList shipOrderUpdate = new OOrderShipList();
shipOrderUpdate.setId(oOrderShipList.getId());
shipOrderUpdate.setStatus(3);
shipOrderUpdate.setUpdateTime(new Date());
shipOrderUpdate.setUpdateBy("生成出库单");
this.baseMapper.updateById(shipOrderUpdate);
return ResultVo.success();
}
}

View File

@ -31,10 +31,10 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
<groupId>cn.qihangerp.mapper</groupId>
<artifactId>mapper</artifactId>
<version>2.0.0</version>
</dependency>
</dependencies>
</project>

View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.stock.service;
import cn.qihangerp.module.stock.domain.ErpStockOutItem;
import cn.qihangerp.model.entity.ErpStockOutItem;
import com.baomidou.mybatisplus.extension.service.IService;
/**

View File

@ -4,7 +4,7 @@ package cn.qihangerp.module.stock.service;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.module.stock.domain.ErpStockOut;
import cn.qihangerp.model.entity.ErpStockOut;
import cn.qihangerp.module.stock.request.StockOutCreateRequest;
import cn.qihangerp.module.stock.request.StockOutItemRequest;
import com.baomidou.mybatisplus.extension.service.IService;

View File

@ -1,7 +1,8 @@
package cn.qihangerp.module.stock.service.impl;
import cn.qihangerp.module.stock.domain.ErpStockOutItem;
import cn.qihangerp.module.stock.mapper.ErpStockOutItemMapper;
import cn.qihangerp.mapper.ErpStockOutItemMapper;
import cn.qihangerp.model.entity.ErpStockOutItem;
import cn.qihangerp.module.stock.service.ErpStockOutItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

View File

@ -5,15 +5,15 @@ import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.utils.DateUtils;
import cn.qihangerp.mapper.ErpStockOutMapper;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService;
import cn.qihangerp.module.goods.service.OGoodsInventoryService;
import cn.qihangerp.module.stock.domain.ErpStockOut;
import cn.qihangerp.module.stock.domain.ErpStockOutItem;
import cn.qihangerp.model.entity.ErpStockOut;
import cn.qihangerp.model.entity.ErpStockOutItem;
import cn.qihangerp.module.stock.domain.ErpStockOutItemPosition;
import cn.qihangerp.module.stock.mapper.ErpStockOutItemPositionMapper;
import cn.qihangerp.module.stock.mapper.ErpStockOutMapper;
import cn.qihangerp.module.stock.request.GoodsSkuInventoryVo;
import cn.qihangerp.module.stock.request.StockOutCreateRequest;
import cn.qihangerp.module.stock.request.StockOutItemRequest;
@ -127,8 +127,6 @@ public class ErpStockOutServiceImpl extends ServiceImpl<ErpStockOutMapper, ErpSt
outItem.setStatus(0);
outItem.setCreateTime(new Date());
itemList.add(outItem);
}
outItemService.saveBatch(itemList);
return ResultVo.success();

View File

@ -20,30 +20,10 @@ export function listShipStockupSupplier(query) {
}
// 备货完成
export function shipStockupComplete(data) {
return request({
url: '/api/oms-api/ship/stock_up_complete',
method: 'post',
data: data
})
}
// 备货完成by order
export function shipStockupCompleteByOrder(data) {
return request({
url: '/api/oms-api/ship/stock_up_complete_by_order',
method: 'post',
data: data
})
}
// 生成出库单(备货清单生成出库单)
export function generateStockOutEntry(data) {
return request({
url: '/shipping/generate_stock_out_entry',
url: '/api/oms-api/ship/generate_stock_out_entry',
method: 'post',
data: data
})
@ -66,6 +46,15 @@ export function supplierShipConfirm(data) {
})
}
// 修改备货单item skuId
export function shipOrderItemSkuIdUpdate(data) {
return request({
url: '/api/oms-api/ship/order_item_sku_id_update',
method: 'post',
data: data
})
}
// 订单待出库列表
export function listOrderStockOutEntry(query) {
@ -84,3 +73,4 @@ export function listOrderStockOutEntryItem(query) {
params: query
})
}

View File

@ -0,0 +1,601 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
<el-form-item label="商品名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入商品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="商品编号" prop="number">
<el-input
v-model="queryParams.number"
placeholder="请输入商品编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="商品分类" prop="categoryId">
<!-- <el-input
v-model="queryParams.categoryId"
placeholder="请输入商品分类ID"
clearable
@keyup.enter.native="handleQuery"
/> -->
<treeselect :options="categoryTree" placeholder="请选择上级菜单" v-model="queryParams.categoryId" style="width: 230px;"/>
</el-form-item>
<el-form-item label="供应商" prop="supplierId">
<el-select v-model="queryParams.supplierId" filterable placeholder="请选择供应商名称">
<el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="disable">
<el-select v-model="queryParams.status" filterable placeholder="状态">
<el-option label="销售中" value="1"></el-option>
<el-option label="已下架" value="2"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="条码" prop="barCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.barCode"-->
<!-- placeholder="请输入条码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="状态" prop="disable">
<el-input
v-model="queryParams.disable"
placeholder="请输入0启用 1禁用"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['goods:goods:add']"
>添加商品</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- @click="handleImport"-->
<!-- v-hasPermi="['goods:goods:edit']"-->
<!-- >推送到线下渠道店铺</el-button>-->
<!-- </el-col>-->
<!--
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['goods:goods:remove']"
>删除</el-button>
</el-col> -->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['goods:goods:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="goodsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="商品名称" align="left" prop="name" width="300"/>
<el-table-column label="商品图片" align="center" prop="image" width="100">
<template slot-scope="scope">
<image-preview :src="scope.row.image" :width="50" :height="50"/>
</template>
</el-table-column>
<el-table-column label="商品编号" align="center" prop="goodsNum" />
<!-- <el-table-column label="单位名称" align="center" prop="unitName" /> -->
<el-table-column label="商品分类" align="center" prop="categoryId" >
<template slot-scope="scope">
<el-tag size="small">{{categoryList.find(x=>x.id === scope.row.categoryId)?categoryList.find(x=>x.id === scope.row.categoryId).name:''}}</el-tag>
</template>
</el-table-column>
<!-- <el-table-column label="条码" align="center" prop="barCode" /> -->
<el-table-column label="SKU明细" align="center" >
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-info"
@click="handleViewSkuList(scope.row)"
>查看SKU明细</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="衣长/裙长/裤长" align="center" prop="length" />
<el-table-column label="高度/袖长" align="center" prop="height" />
<el-table-column label="宽度/胸阔(围)" align="center" prop="width" />
<el-table-column label="肩阔" align="center" prop="width1" />
<el-table-column label="腰阔" align="center" prop="width2" />
<el-table-column label="臀阔" align="center" prop="width3" />
<el-table-column label="重量" align="center" prop="weight" />
<el-table-column label="0启用 1禁用" align="center" prop="disable" />
<el-table-column label="保质期" align="center" prop="period" /> -->
<el-table-column label="预计采购价格" align="center" prop="purPrice" />
<el-table-column label="建议批发价" align="center" prop="wholePrice" />
<el-table-column label="建议零售价" align="center" prop="retailPrice" />
<!-- <el-table-column label="单位成本" align="center" prop="unitCost" /> -->
<el-table-column label="供应商" align="center" prop="supplierId" >
<template slot-scope="scope">
<el-tag size="small">{{supplierList.find(x=>x.id == scope.row.supplierId)?supplierList.find(x=>x.id == scope.row.supplierId).name:''}}</el-tag>
</template>
</el-table-column>
<!-- <el-table-column label="品牌id" align="center" prop="brandId" />
<el-table-column label="属性1季节" align="center" prop="attr1" />
<el-table-column label="属性2分类" align="center" prop="attr2" />
<el-table-column label="属性3风格" align="center" prop="attr3" />
<el-table-column label="属性4年份" align="center" prop="attr4" />
<el-table-column label="属性5面料" align="center" prop="attr5" />
<el-table-column label="外链url" align="center" prop="linkUrl" />
<el-table-column label="最低库存" align="center" prop="lowQty" />
<el-table-column label="最高库存" align="center" prop="highQty" /> -->
<el-table-column label="状态" align="center" prop="status" >
<template slot-scope="scope">
<el-tag size="small" v-if="scope.row.status === 1">销售中</el-tag>
<el-tag size="small" v-if="scope.row.status === 2">已下架</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['goods:goods:edit']"
>修改基本资料</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['goods:goods:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 导入ERP商品 -->
<el-dialog title="导入商品" :visible.sync="importOpen" width="400px" append-to-body>
<el-upload
class="upload-demo"
:headers="headers"
drag
action="/dev-api/tao/order/order_import"
accept="xlsx"
multiple >
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
<div class="el-upload__tip" slot="tip">只能上传jpg/png文件且不超过500kb</div>
</el-upload>
</el-dialog>
<el-dialog :title="title" :visible.sync="skuOpen" width="1000px" append-to-body>
<el-table v-loading="loading" :data="skuList">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="Sku Id" align="center" prop="id" />
<el-table-column label="商品名称" align="center" prop="goodsName" />
<el-table-column label="SKU名称" align="center" prop="skuName" />
<el-table-column label="SKU编码" align="center" prop="skuCode" />
<el-table-column label="商品图片" align="center" prop="colorImage" width="100">
<template slot-scope="scope">
<image-preview :src="scope.row.colorImage" :width="50" :height="50"/>
</template>
</el-table-column>
<el-table-column label="预计采购价" align="center" prop="purPrice" />
<el-table-column label="状态" align="center" prop="status" >
<template slot-scope="scope">
<el-tag size="small" v-if="scope.row.status === 1">销售中</el-tag>
<el-tag size="small" v-if="scope.row.status === 2">已下架</el-tag>
</template>
</el-table-column>
</el-table>
</el-dialog>
<!-- 添加或修改商品管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="商品名称" prop="name">
<el-input v-model="form.name" placeholder="请输入商品名称" />
</el-form-item>
<el-form-item label="商品图片地址" prop="image">
<image-upload v-model="form.image"/>
</el-form-item>
<el-form-item label="商品编号" prop="number">
<el-input v-model="form.goodsNum" placeholder="请输入商品编号" />
</el-form-item>
<!-- <el-form-item label="单位名称" prop="unitName">-->
<!-- <el-input v-model="form.unitName" placeholder="请输入单位名称" />-->
<!-- </el-form-item>-->
<el-form-item label="商品分类" prop="categoryId">
<!-- <el-input v-model="form.categoryId" placeholder="请输入商品分类ID" />-->
<treeselect :options="categoryTree" placeholder="请选择上级菜单" v-model="form.categoryId" style="width: 230px;"/>
</el-form-item>
<!-- <el-form-item label="条码" prop="barCode">-->
<!-- <el-input v-model="form.barCode" placeholder="请输入条码" />-->
<!-- </el-form-item>-->
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
<!-- <el-form-item label="衣长/裙长/裤长" prop="length">-->
<!-- <el-input v-model="form.length" placeholder="请输入衣长/裙长/裤长" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="高度/袖长" prop="height">-->
<!-- <el-input v-model="form.height" placeholder="请输入高度/袖长" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="宽度/胸阔(围)" prop="width">-->
<!-- <el-input v-model="form.width" placeholder="请输入宽度/胸阔(围)" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="肩阔" prop="width1">-->
<!-- <el-input v-model="form.width1" placeholder="请输入肩阔" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="腰阔" prop="width2">-->
<!-- <el-input v-model="form.width2" placeholder="请输入腰阔" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="臀阔" prop="width3">-->
<!-- <el-input v-model="form.width3" placeholder="请输入臀阔" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="重量" prop="weight">-->
<!-- <el-input v-model="form.weight" placeholder="请输入重量" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="0启用 1禁用" prop="disable">-->
<!-- <el-input v-model="form.disable" placeholder="请输入0启用 1禁用" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="保质期" prop="period">-->
<!-- <el-input v-model="form.period" placeholder="请输入保质期" />-->
<!-- </el-form-item>-->
<el-form-item label="预计采购价格" prop="purPrice">
<el-input v-model="form.purPrice" placeholder="请输入预计采购价格" />
</el-form-item>
<el-form-item label="建议批发价" prop="wholePrice">
<el-input v-model="form.wholePrice" placeholder="请输入建议批发价" />
</el-form-item>
<el-form-item label="建议零售价" prop="retailPrice">
<el-input v-model="form.retailPrice" placeholder="请输入建议零售价" />
</el-form-item>
<!-- <el-form-item label="单位成本" prop="unitCost">-->
<!-- <el-input v-model="form.unitCost" placeholder="请输入单位成本" />-->
<!-- </el-form-item>-->
<el-form-item label="供应商" prop="supplierId">
<!-- <el-input v-model="form.supplierId" placeholder="请输入供应商id" />-->
<el-select v-model="form.supplierId" filterable placeholder="请选择供应商名称">
<el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="状态">
<el-option label="销售中" :value="1"></el-option>
<el-option label="已下架" :value="2"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="品牌" prop="brandId">-->
<!-- <el-input v-model="form.brandId" placeholder="请输入品牌id" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="属性1季节" prop="attr1">-->
<!-- <el-input v-model="form.attr1" placeholder="请输入属性1季节" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="属性2分类" prop="attr2">-->
<!-- <el-input v-model="form.attr2" placeholder="请输入属性2分类" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="属性3风格" prop="attr3">-->
<!-- <el-input v-model="form.attr3" placeholder="请输入属性3风格" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="属性4年份" prop="attr4">-->
<!-- <el-input v-model="form.attr4" placeholder="请输入属性4年份" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="属性5面料" prop="attr5">-->
<!-- <el-input v-model="form.attr5" placeholder="请输入属性5面料" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="外链url" prop="linkUrl">-->
<!-- <el-input v-model="form.linkUrl" type="textarea" placeholder="请输入内容" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="最低库存" prop="lowQty">-->
<!-- <el-input v-model="form.lowQty" placeholder="请输入最低库存" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="最高库存" prop="highQty">-->
<!-- <el-input v-model="form.highQty" placeholder="请输入最高库存" />-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listGoods, getGoods, delGoods, addGoods, updateGoods } from "@/api/goods/goods";
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { listCategory } from "@/api/goods/category";
import {getToken} from "@/utils/auth";
import {listSupplier} from "@/api/goods/supplier";
export default {
name: "Goods",
components: { Treeselect },
data() {
return {
importOpen:false,
headers: { 'Authorization': 'Bearer ' + getToken() },
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
goodsList: [],
//
title: "",
//
open: false,
skuOpen: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
name: null,
image: null,
number: null,
unitName: null,
categoryId: null,
barCode: null,
status: null,
disable: null,
supplierId: null,
brandId: null,
},
//
form: {},
categoryList: [],
categoryTree: [],
supplierList: [],
skuList: [],
//
rules: {
status: [
{ required: true, message: "状态1销售中2已下架不能为空", trigger: "change" }
],
length: [
{ required: true, message: "衣长/裙长/裤长不能为空", trigger: "blur" }
],
height: [
{ required: true, message: "高度/袖长不能为空", trigger: "blur" }
],
width: [
{ required: true, message: "宽度/胸阔(围)不能为空", trigger: "blur" }
],
width1: [
{ required: true, message: "肩阔不能为空", trigger: "blur" }
],
width2: [
{ required: true, message: "腰阔不能为空", trigger: "blur" }
],
width3: [
{ required: true, message: "臀阔不能为空", trigger: "blur" }
],
weight: [
{ required: true, message: "重量不能为空", trigger: "blur" }
],
}
};
},
created() {
listCategory(this.queryParams).then(response => {
this.categoryList = response.rows
this.categoryTree = this.buildTree(response.rows,0)
listSupplier({}).then(response => {
this.supplierList = response.rows;
// this.supplierLoading = false;
this.getList();
});
// this.getList();
});
},
methods: {
normalizer(node) {
return {
id: node.id,
label: node.value
};
},
buildTree(list, parentId) {
let tree = [];
for (let i = 0; i < list.length; i++) {
if (list[i].parentId === parentId) {
let node = {
id: list[i].id,
label: list[i].name,
children: this.buildTree(list, list[i].id)
};
tree.push(node);
}
}
return tree;
},
/** 查询商品管理列表 */
getList() {
this.loading = true;
listGoods(this.queryParams).then(response => {
this.goodsList = response.rows;
this.total = response.total;
this.loading = false;
});
},
handleAdd(){
this.$router.push('/goods/create');
},
//
cancel() {
this.open = false;
this.skuOpen = false;
this.skuList = []
this.reset();
},
//
reset() {
this.form = {
id: null,
name: null,
image: null,
number: null,
unitName: null,
categoryId: null,
barCode: null,
remark: null,
status: null,
length: null,
height: null,
width: null,
width1: null,
width2: null,
width3: null,
weight: null,
disable: null,
period: null,
purPrice: null,
wholePrice: null,
retailPrice: null,
unitCost: null,
supplierId: null,
brandId: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
attr5: null,
linkUrl: null,
lowQty: null,
highQty: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 查看SKU List*/
handleViewSkuList(row){
this.skuList = row.skuList
this.skuOpen = true;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getGoods(id).then(response => {
this.form = response.data;
this.form.disable = response.data.disable+''
this.open = true;
this.title = "修改商品基本信息";
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除商品管理编号为"' + ids + '"的数据项?').then(function() {
return delGoods(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateGoods(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 导出按钮操作 */
handleExport() {
this.download('goods/goods/export', {
...this.queryParams
}, `goods_${new Date().getTime()}.xlsx`)
},
handleImport(){
this.importOpen = true
}
}
};
</script>

View File

@ -0,0 +1,311 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
<el-form-item label="ERP商品SKUID" prop="outerErpSkuId">
<el-input
v-model="queryParams.outerErpSkuId"
placeholder="请输入ERP商品SKUID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="SKU编码" prop="skuCode">
<el-input
v-model="queryParams.skuCode"
placeholder="请输入SKU编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="disable">
<el-select v-model="queryParams.status" filterable placeholder="状态">
<el-option label="销售中" value="1"></el-option>
<el-option label="已下架" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['goods:goods:add']"-->
<!-- >添加商品SKU</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- @click="handleImport"-->
<!-- v-hasPermi="['goods:goods:edit']"-->
<!-- >导入商品SKU</el-button>-->
<!-- </el-col>-->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="goodsSpecList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="SkuId" align="center" prop="id" />
<el-table-column label="外部ErpSkuId" align="center" prop="outerErpSkuId" />
<el-table-column label="商品名" align="center" prop="goodsName" />
<el-table-column label="Sku名" align="center" prop="skuName" />
<el-table-column label="Sku编码" align="center" prop="skuCode" />
<el-table-column label="规格1" align="center" prop="colorValue" />
<el-table-column label="图片" align="center" prop="colorImage" width="100">
<template slot-scope="scope">
<image-preview :src="scope.row.colorImage" :width="50" :height="50"/>
</template>
</el-table-column>
<el-table-column label="规格2" align="center" prop="sizeValue" />
<el-table-column label="规格3" align="center" prop="styleValue" />
<el-table-column label="建议零售价" align="center" prop="retailPrice" :formatter="amountFormatter"/>
<el-table-column label="状态" align="center" prop="status" >
<template slot-scope="scope">
<el-tag size="small" v-if="scope.row.status===1">销售中</el-tag>
<el-tag size="small" v-if="scope.row.status===2">已下架</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['api:goodsSpec:edit']"
>修改</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改商品规格库存管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<!-- <el-form-item label="商品名" prop="goodsName">-->
<!-- <el-input v-model="form.goodsName" placeholder="请输入商品名" />-->
<!-- </el-form-item>-->
<el-form-item label="SKU名" prop="skuName">
<el-input v-model="form.skuName" placeholder="请输入SKU名" />
</el-form-item>
<el-form-item label="SKU编码" prop="skuCode">
<el-input v-model="form.skuCode" placeholder="请输入SKU编码" />
</el-form-item>
<el-form-item label="图片URL" prop="colorImage">
<!-- <image-upload v-model="form.colorImage" :limit="1" />-->
<el-input v-model="form.colorImage" placeholder="图片URL" />
</el-form-item>
<el-form-item label="售价" prop="retailPrice">
<el-input type="number" v-model.number="form.retailPrice" placeholder="售价" />
</el-form-item>
<!-- <el-form-item label="规格1" prop="colorValue">-->
<!-- <el-input v-model="form.colorValue" placeholder="请输入规格1" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="规格2" prop="sizeValue">-->
<!-- <el-input v-model="form.sizeValue" placeholder="请输入规格2" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="规格3" prop="styleValue">-->
<!-- <el-input v-model="form.styleValue" placeholder="请输入规格3" />-->
<!-- </el-form-item>-->
<el-form-item label="ERP商品ID" prop="outerErpGoodsId">
<el-input type="number" v-model.number="form.outerErpGoodsId" placeholder="请输入ERP商品ID" />
</el-form-item>
<el-form-item label="ERP商品SkuID" prop="outerErpSkuId">
<el-input type="number" v-model.number="form.outerErpSkuId" placeholder="请输入ERP商品SkuID" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" filterable placeholder="状态">
<el-option label="销售中" :value="1"></el-option>
<el-option label="已下架" :value="2"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
<!-- 导入ERP商品sku -->
<el-dialog title="导入商品SKU" :visible.sync="importOpen" width="400px" append-to-body>
<el-upload
class="upload-demo"
:headers="headers"
drag
action="/dev-api/api/oms-api/goods/goods_sku_import"
accept="xlsx"
multiple >
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
<div class="el-upload__tip" slot="tip">只能上传jpg/png文件且不超过500kb</div>
</el-upload>
</el-dialog>
</div>
</template>
<script>
import {listGoodsSpec, getGoodsSpec, updateGoodsSpec, addGoodsSpec} from "@/api/goods/goodsSpec";
import {getToken} from "@/utils/auth";
export default {
name: "GoodsSpec",
data() {
return {
importOpen:false,
headers: { 'Authorization': 'Bearer ' + getToken() },
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
goodsSpecList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
erpGoodsId: null,
erpSkuId: null,
skuName: null,
skuNum: null,
},
//
form: {},
//
rules: {
goodsName: [{ required: true, message: "不能为空", trigger: "blur" }],
skuName: [{ required: true, message: "不能为空", trigger: "blur" }],
skuCode: [{ required: true, message: "SKU不能为空", trigger: "blur" }],
retailPrice: [{ required: true, message: "不能为空", trigger: "blur" }],
}
};
},
created() {
this.getList();
},
methods: {
amountFormatter(row, column, cellValue, index) {
return '¥' + parseFloat(cellValue).toFixed(2).replace(/\d(?=(\d{3})+\.)/g, '$&,');
},
/** 查询商品规格库存管理列表 */
getList() {
this.loading = true;
listGoodsSpec(this.queryParams).then(response => {
this.goodsSpecList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
goodsId: null,
skuName: null,
skuNum: null,
colorValue: null,
colorImage: null,
sizeValue: null,
styleValue: null,
erpGoodsId: null,
erpSkuId: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getGoodsSpec(id).then(response => {
this.form = response.data;
this.form.disable = response.data.disable+''
this.open = true;
this.title = "修改商品规格库存管理";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateGoodsSpec(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
}else{
addGoodsSpec(this.form).then(response => {
this.$modal.msgSuccess("添加成功");
this.open = false;
this.getList();
});
}
}
});
},
handleAdd(){
this.open = true
},
handleImport(){
this.importOpen = true
}
}
};
</script>

View File

@ -1,604 +1,43 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
<el-form-item label="商品名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入商品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="商品编号" prop="number">
<el-input
v-model="queryParams.number"
placeholder="请输入商品编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-form-item label="商品分类" prop="categoryId">
<!-- <el-input
v-model="queryParams.categoryId"
placeholder="请输入商品分类ID"
clearable
@keyup.enter.native="handleQuery"
/> -->
<treeselect :options="categoryTree" placeholder="请选择上级菜单" v-model="queryParams.categoryId" style="width: 230px;"/>
</el-form-item>
<el-form-item label="供应商" prop="supplierId">
<el-select v-model="queryParams.supplierId" filterable placeholder="请选择供应商名称">
<el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="disable">
<el-select v-model="queryParams.status" filterable placeholder="状态">
<el-option label="销售中" value="1"></el-option>
<el-option label="已下架" value="2"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="条码" prop="barCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.barCode"-->
<!-- placeholder="请输入条码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-tab-pane label="商品管理" name="ProductList" >
<product-list></product-list>
</el-tab-pane>
<!-- <el-form-item label="状态" prop="disable">
<el-input
v-model="queryParams.disable"
placeholder="请输入0启用 1禁用"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-tab-pane label="商品Sku" name="ProductSkuList" lazy>
<product-sku-list></product-sku-list>
</el-tab-pane>
</el-tabs>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['goods:goods:add']"
>添加商品</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- @click="handleImport"-->
<!-- v-hasPermi="['goods:goods:edit']"-->
<!-- >推送到线下渠道店铺</el-button>-->
<!-- </el-col>-->
<!--
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['goods:goods:remove']"
>删除</el-button>
</el-col> -->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['goods:goods:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="goodsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" width="80" />
<el-table-column label="商品图片" align="center" prop="image" width="100">
<template slot-scope="scope">
<image-preview :src="scope.row.image" :width="50" :height="50"/>
</template>
</el-table-column>
<el-table-column label="商品名称" align="left" prop="name" width="300"/>
<el-table-column label="商品编号" align="center" prop="goodsNum" />
<!-- <el-table-column label="单位名称" align="center" prop="unitName" /> -->
<el-table-column label="商品分类" align="center" prop="categoryId" >
<template slot-scope="scope">
<el-tag size="small">{{categoryList.find(x=>x.id === scope.row.categoryId)?categoryList.find(x=>x.id === scope.row.categoryId).name:''}}</el-tag>
</template>
</el-table-column>
<!-- <el-table-column label="条码" align="center" prop="barCode" /> -->
<el-table-column label="SKU" align="center" >
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-info"
@click="handleViewSkuList(scope.row)"
>{{scope.row.skuList.length}} 条SKU</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="衣长/裙长/裤长" align="center" prop="length" />
<el-table-column label="高度/袖长" align="center" prop="height" />
<el-table-column label="宽度/胸阔(围)" align="center" prop="width" />
<el-table-column label="肩阔" align="center" prop="width1" />
<el-table-column label="腰阔" align="center" prop="width2" />
<el-table-column label="臀阔" align="center" prop="width3" />
<el-table-column label="重量" align="center" prop="weight" />
<el-table-column label="0启用 1禁用" align="center" prop="disable" />
<el-table-column label="保质期" align="center" prop="period" /> -->
<el-table-column label="采购价" align="center" prop="purPrice" />
<!-- <el-table-column label="建议批发价" align="center" prop="wholePrice" />-->
<el-table-column label="零售价" align="center" prop="retailPrice" />
<!-- <el-table-column label="单位成本" align="center" prop="unitCost" /> -->
<el-table-column label="供应商" align="center" prop="supplierId" >
<template slot-scope="scope">
<el-tag size="small">{{supplierList.find(x=>x.id == scope.row.supplierId)?supplierList.find(x=>x.id == scope.row.supplierId).name:''}}</el-tag>
</template>
</el-table-column>
<!-- <el-table-column label="品牌id" align="center" prop="brandId" />
<el-table-column label="属性1季节" align="center" prop="attr1" />
<el-table-column label="属性2分类" align="center" prop="attr2" />
<el-table-column label="属性3风格" align="center" prop="attr3" />
<el-table-column label="属性4年份" align="center" prop="attr4" />
<el-table-column label="属性5面料" align="center" prop="attr5" />
<el-table-column label="外链url" align="center" prop="linkUrl" />
<el-table-column label="最低库存" align="center" prop="lowQty" />
<el-table-column label="最高库存" align="center" prop="highQty" /> -->
<el-table-column label="状态" align="center" prop="status" >
<template slot-scope="scope">
<el-tag size="small" v-if="scope.row.status === 1">销售中</el-tag>
<el-tag size="small" v-if="scope.row.status === 2">已下架</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['goods:goods:edit']"
>修改基本资料</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['goods:goods:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 导入ERP商品 -->
<el-dialog title="导入商品" :visible.sync="importOpen" width="400px" append-to-body>
<el-upload
class="upload-demo"
:headers="headers"
drag
action="/dev-api/tao/order/order_import"
accept="xlsx"
multiple >
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
<div class="el-upload__tip" slot="tip">只能上传jpg/png文件且不超过500kb</div>
</el-upload>
</el-dialog>
<el-dialog :title="title" :visible.sync="skuOpen" width="1200px" append-to-body>
<el-table v-loading="loading" :data="skuList">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="Sku Id" align="center" prop="id" width="80" />
<el-table-column label="商品名称" align="left" prop="goodsName" />
<!-- <el-table-column label="SKU名称" align="center" prop="skuName" />-->
<el-table-column label="SKU编码" align="center" prop="skuCode" />
<el-table-column label="商品图片" align="center" prop="colorImage" width="100">
<template slot-scope="scope">
<image-preview :src="scope.row.colorImage" :width="50" :height="50"/>
</template>
</el-table-column>
<el-table-column label="颜色属性" align="left" prop="colorValue" />
<el-table-column label="尺寸属性" align="left" prop="sizeValue" />
<el-table-column label="款式属性" align="left" prop="styleValue" />
<el-table-column label="零售价" align="center" prop="retailPrice" />
<el-table-column label="状态" align="center" prop="status" >
<template slot-scope="scope">
<el-tag size="small" v-if="scope.row.status === 1">销售中</el-tag>
<el-tag size="small" v-if="scope.row.status === 2">已下架</el-tag>
</template>
</el-table-column>
</el-table>
</el-dialog>
<!-- 添加或修改商品管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-form-item label="商品名称" prop="name">
<el-input v-model="form.name" placeholder="请输入商品名称" />
</el-form-item>
<el-form-item label="商品图片地址" prop="image">
<image-upload v-model="form.image"/>
</el-form-item>
<el-form-item label="商品编号" prop="number">
<el-input v-model="form.goodsNum" placeholder="请输入商品编号" />
</el-form-item>
<!-- <el-form-item label="单位名称" prop="unitName">-->
<!-- <el-input v-model="form.unitName" placeholder="请输入单位名称" />-->
<!-- </el-form-item>-->
<el-form-item label="商品分类" prop="categoryId">
<!-- <el-input v-model="form.categoryId" placeholder="请输入商品分类ID" />-->
<treeselect :options="categoryTree" placeholder="请选择上级菜单" v-model="form.categoryId" style="width: 230px;"/>
</el-form-item>
<!-- <el-form-item label="条码" prop="barCode">-->
<!-- <el-input v-model="form.barCode" placeholder="请输入条码" />-->
<!-- </el-form-item>-->
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
<!-- <el-form-item label="衣长/裙长/裤长" prop="length">-->
<!-- <el-input v-model="form.length" placeholder="请输入衣长/裙长/裤长" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="高度/袖长" prop="height">-->
<!-- <el-input v-model="form.height" placeholder="请输入高度/袖长" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="宽度/胸阔(围)" prop="width">-->
<!-- <el-input v-model="form.width" placeholder="请输入宽度/胸阔(围)" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="肩阔" prop="width1">-->
<!-- <el-input v-model="form.width1" placeholder="请输入肩阔" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="腰阔" prop="width2">-->
<!-- <el-input v-model="form.width2" placeholder="请输入腰阔" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="臀阔" prop="width3">-->
<!-- <el-input v-model="form.width3" placeholder="请输入臀阔" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="重量" prop="weight">-->
<!-- <el-input v-model="form.weight" placeholder="请输入重量" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="0启用 1禁用" prop="disable">-->
<!-- <el-input v-model="form.disable" placeholder="请输入0启用 1禁用" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="保质期" prop="period">-->
<!-- <el-input v-model="form.period" placeholder="请输入保质期" />-->
<!-- </el-form-item>-->
<el-form-item label="采购价" prop="purPrice">
<el-input v-model="form.purPrice" placeholder="请输入预计采购价格" />
</el-form-item>
<!-- <el-form-item label="建议批发价" prop="wholePrice">-->
<!-- <el-input v-model="form.wholePrice" placeholder="请输入建议批发价" />-->
<!-- </el-form-item>-->
<el-form-item label="零售价" prop="retailPrice">
<el-input v-model="form.retailPrice" placeholder="请输入建议零售价" />
</el-form-item>
<!-- <el-form-item label="单位成本" prop="unitCost">-->
<!-- <el-input v-model="form.unitCost" placeholder="请输入单位成本" />-->
<!-- </el-form-item>-->
<el-form-item label="供应商" prop="supplierId">
<!-- <el-input v-model="form.supplierId" placeholder="请输入供应商id" />-->
<el-select v-model="form.supplierId" filterable placeholder="请选择供应商名称">
<el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="状态">
<el-option label="销售中" :value="1"></el-option>
<el-option label="已下架" :value="2"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="品牌" prop="brandId">-->
<!-- <el-input v-model="form.brandId" placeholder="请输入品牌id" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="属性1季节" prop="attr1">-->
<!-- <el-input v-model="form.attr1" placeholder="请输入属性1季节" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="属性2分类" prop="attr2">-->
<!-- <el-input v-model="form.attr2" placeholder="请输入属性2分类" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="属性3风格" prop="attr3">-->
<!-- <el-input v-model="form.attr3" placeholder="请输入属性3风格" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="属性4年份" prop="attr4">-->
<!-- <el-input v-model="form.attr4" placeholder="请输入属性4年份" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="属性5面料" prop="attr5">-->
<!-- <el-input v-model="form.attr5" placeholder="请输入属性5面料" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="外链url" prop="linkUrl">-->
<!-- <el-input v-model="form.linkUrl" type="textarea" placeholder="请输入内容" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="最低库存" prop="lowQty">-->
<!-- <el-input v-model="form.lowQty" placeholder="请输入最低库存" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="最高库存" prop="highQty">-->
<!-- <el-input v-model="form.highQty" placeholder="请输入最高库存" />-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listGoods, getGoods, delGoods, addGoods, updateGoods } from "@/api/goods/goods";
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { listCategory } from "@/api/goods/category";
import {getToken} from "@/utils/auth";
import {listSupplier} from "@/api/goods/supplier";
import ProductList from "@/views/goods/goods/goods.vue";
import ProductSkuList from "@/views/goods/goods/goods_sku.vue";
export default {
name: "Goods",
components: { Treeselect },
name: "GoodsLibs",
components:{ProductList,ProductSkuList},
data() {
return {
importOpen:false,
headers: { 'Authorization': 'Bearer ' + getToken() },
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
goodsList: [],
//
title: "",
//
open: false,
skuOpen: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
name: null,
image: null,
number: null,
unitName: null,
categoryId: null,
barCode: null,
status: null,
disable: null,
supplierId: null,
brandId: null,
},
//
form: {},
categoryList: [],
categoryTree: [],
supplierList: [],
skuList: [],
//
rules: {
status: [
{ required: true, message: "状态1销售中2已下架不能为空", trigger: "change" }
],
length: [
{ required: true, message: "衣长/裙长/裤长不能为空", trigger: "blur" }
],
height: [
{ required: true, message: "高度/袖长不能为空", trigger: "blur" }
],
width: [
{ required: true, message: "宽度/胸阔(围)不能为空", trigger: "blur" }
],
width1: [
{ required: true, message: "肩阔不能为空", trigger: "blur" }
],
width2: [
{ required: true, message: "腰阔不能为空", trigger: "blur" }
],
width3: [
{ required: true, message: "臀阔不能为空", trigger: "blur" }
],
weight: [
{ required: true, message: "重量不能为空", trigger: "blur" }
],
}
activeName: 'ProductList'
};
},
created() {
listCategory(this.queryParams).then(response => {
this.categoryList = response.rows
this.categoryTree = this.buildTree(response.rows,0)
listSupplier({}).then(response => {
this.supplierList = response.rows;
// this.supplierLoading = false;
this.getList();
});
// this.getList();
});
},
mounted() {
},
methods: {
normalizer(node) {
return {
id: node.id,
label: node.value
};
},
buildTree(list, parentId) {
let tree = [];
for (let i = 0; i < list.length; i++) {
if (list[i].parentId === parentId) {
let node = {
id: list[i].id,
label: list[i].name,
children: this.buildTree(list, list[i].id)
};
tree.push(node);
}
}
return tree;
},
/** 查询商品管理列表 */
getList() {
this.loading = true;
listGoods(this.queryParams).then(response => {
this.goodsList = response.rows;
this.total = response.total;
this.loading = false;
});
},
handleAdd(){
this.$router.push('/goods/create');
},
//
cancel() {
this.open = false;
this.skuOpen = false;
this.skuList = []
this.reset();
},
//
reset() {
this.form = {
id: null,
name: null,
image: null,
number: null,
unitName: null,
categoryId: null,
barCode: null,
remark: null,
status: null,
length: null,
height: null,
width: null,
width1: null,
width2: null,
width3: null,
weight: null,
disable: null,
period: null,
purPrice: null,
wholePrice: null,
retailPrice: null,
unitCost: null,
supplierId: null,
brandId: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
attr5: null,
linkUrl: null,
lowQty: null,
highQty: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 查看SKU List*/
handleViewSkuList(row){
this.skuList = row.skuList
this.skuOpen = true;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getGoods(id).then(response => {
this.form = response.data;
this.form.disable = response.data.disable+''
this.open = true;
this.title = "修改商品基本信息";
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除商品管理编号为"' + ids + '"的数据项?').then(function() {
return delGoods(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateGoods(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 导出按钮操作 */
handleExport() {
this.download('goods/goods/export', {
...this.queryParams
}, `goods_${new Date().getTime()}.xlsx`)
},
handleImport(){
this.importOpen = true
handleClick(tab, event) {
console.log(tab, event);
}
}
};

View File

@ -134,7 +134,7 @@
</table>
</template>
<template slot-scope="scope">
<el-table :data="scope.row.children" :show-header="false" style="width: 100%" >
<el-table :data="scope.row.items" :show-header="false" style="width: 100%" >
<el-table-column label="图片" width="50px">
<template slot-scope="scope">
<el-image style="width: 40px; height: 40px;" :src="scope.row.goodsImg" :preview-src-list="[scope.row.goodsImg]"></el-image>
@ -184,19 +184,20 @@
<el-tag size="small" v-if="scope.row.status === 0">待备货</el-tag>
<el-tag size="small" v-if="scope.row.status === 1">备货中</el-tag>
<el-tag size="small" v-if="scope.row.status === 2">备货完成</el-tag>
<el-tag size="small" v-if="scope.row.status === 3">发货</el-tag>
<el-tag size="small" v-if="scope.row.status === 3">生成出库单</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="150">
<template slot-scope="scope">
<!--v-if="scope.row.status ===0 || scope.row.status === 1"-->
<el-button
size="mini"
v-if="scope.row.status ===0 || scope.row.status === 1"
v-if="scope.row.status !=3"
plain
type="success"
icon="el-icon-document-copy"
@click="stockupCompleteByOrder(scope.row)"
>确认备货完成</el-button>
>生成出库单</el-button>
</template>
</el-table-column>
</el-table>
@ -270,8 +271,8 @@
<!-- <el-form-item label="ERP商品ID" prop="erpGoodsId" >-->
<!-- <el-input v-model="form2.erpGoodsId" disabled placeholder="请输入ERP商品ID" />-->
<!-- </el-form-item>-->
<el-form-item label="ERP商品SkuId" prop="erpGoodsSpecId" >
<el-input type="number" v-model="form2.erpGoodsSpecId" placeholder="请输入ERP商品SkuId" />
<el-form-item label="商品SkuId" prop="erpGoodsSkuId" >
<el-input type="number" v-model="form2.erpGoodsSkuId" placeholder="请输入商品库商品SkuId" />
</el-form-item>
</el-form>
@ -287,12 +288,14 @@
<script>
import {
listShipStockupWarehouse,
shipStockupCompleteByOrder
generateStockOutEntry,
shipOrderItemSkuIdUpdate
} from "@/api/shipping/shipping";
import {orderItemSpecIdUpdate} from "@/api/order/order";
import { listShop } from "@/api/shop/shop";
import Clipboard from "clipboard";
export default {
name: "ShipStockupOrder",
// computed: {
@ -348,15 +351,14 @@ export default {
shopList: [],
skuList:[],
supplierList:[],
//
shippingListOrigin:[],
statusList: [
{
value: '0',
label: '待备货'
}, {
value: '2',
label: '备货完成'
value: '3',
label: '已生成出库单'
}
],
//
@ -371,7 +373,7 @@ export default {
supplierId: [{ required: true, message: "请选择供应商", trigger: "blur" }],
},
rules2: {
erpGoodsSpecId: [{ required: true, message: "请选择填写ERP商品SkuId", trigger: "blur" }],
erpGoodsSkuId: [{ required: true, message: "请选择填写商品库商品SkuId", trigger: "blur" }],
}
};
},
@ -423,44 +425,8 @@ export default {
getList() {
this.loading = true;
listShipStockupWarehouse(this.queryParams).then(response => {
this.shippingListOrigin = response.rows;
// this.shippingList = response.rows;
// this.total = response.total;
//
// [obj...]
let newList=[]
// Array.prototype.reduct groupBy
var categoryAndObjMapList = response.rows.reduce((result, currValue) => {
let currCategory = currValue.orderNum;
//
if (Object.keys(result).includes(currCategory)) {
result[currCategory].push(currValue);
} else {
//
result[currCategory] = [currValue];
}
console.log({currCategory, result});
return result;
}, {});
console.log(categoryAndObjMapList);
Object.keys(categoryAndObjMapList).forEach(x=>{
let newObj = {
orderNum:x,
status:categoryAndObjMapList[x][0].status,
shopId:categoryAndObjMapList[x][0].shopId,
hasChildren:true,
children:categoryAndObjMapList[x]
}
newList.push(newObj)
// newList.push(...categoryAndObjMapList[x])
// console.log("============")
// console.log(categoryAndObjMapList[x])
})
console.log("----------------",newList)
this.shippingList = newList
this.total = newList.length
this.shippingList = response.rows
this.total = response.total
this.loading = false;
});
},
@ -495,7 +461,7 @@ export default {
this.$modal.msgError("请选择备货商品");
}
this.form.orderNums = this.ids;
shipStockupCompleteByOrder(this.form).then(response => {
generateStockOutEntry(this.form).then(response => {
this.$modal.msgSuccess("备货完成");
this.open = false;
this.getList();
@ -506,13 +472,30 @@ export default {
},
/** 单个备货 **/
stockupCompleteByOrder(row) {
this.form.orderNums = [];
this.form.orderNums.push(row.orderNum)
shipStockupCompleteByOrder(this.form).then(response => {
this.$modal.msgSuccess("备货完成");
this.open = false;
this.getList();
});
const form= {
id : row.id
}
this.$confirm('确认生成订单出库单吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.loading = true
generateStockOutEntry(form).then(response => {
if(response.code===200) {
this.$modal.msgSuccess("出库单生成完成");
this.open = false;
this.getList();
}else{
this.$modal.msgError(response.msg)
}
}).finally(() => {
this.loading = false
})
})
},
@ -595,13 +578,14 @@ export default {
/** 修改商品关联 */
handleUpdateLink(row){
this.skuIdUpdateOpen = true
this.form2.orderItemId = row.id
// this.form2.orderItemId = row.id
this.form2.id = row.id
// this.$modal.msgError("");
},
submitSkuIdUpdateForm(){
this.$refs["form2"].validate(valid => {
if (valid) {
orderItemSpecIdUpdate(this.form2).then(response => {
shipOrderItemSkuIdUpdate(this.form2).then(response => {
this.$modal.msgSuccess("SkuId修改成功");
this.skuIdUpdateOpen = false;
this.getList();

View File

@ -1,41 +0,0 @@
<template>
<div class="app-container">
<el-tabs v-model="activeName" @tab-click="handleClick" type="card">
<el-tab-pane label="发货订单" name="stockShip">
<warehouse-shipment></warehouse-shipment>
</el-tab-pane>
<el-tab-pane label="发货订单商品" name="stockShipItem" lazy>
<warehouse-shipment-item></warehouse-shipment-item>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import warehouseShipment from "@/views/shipping/stockup/warehouse/order_list.vue";
import warehouseShipmentItem from "@/views/shipping/stockup/warehouse/order_item_list.vue";
export default {
name: "stocking",
components:{warehouseShipment,warehouseShipmentItem},
data() {
return {
activeName: 'stockShip'
};
},
created() {
},
mounted() {
},
methods: {
handleClick(tab, event) {
console.log(tab, event);
}
}
};
</script>

View File

@ -1,505 +0,0 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单号" prop="orderNum">
<el-input
v-model="queryParams.orderNum"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格编码" prop="specNum">
<el-input
v-model="queryParams.specNum"
placeholder="请输入商品规格编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="店铺" prop="shopId">
<el-select v-model="queryParams.shopId" filterable placeholder="搜索店铺" clearable @change="handleQuery">
<el-option v-for="item in shopList" :key="item.id" :label="item.name" :value="item.id">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 500">视频号小店</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 200">京东POP</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 280">京东自营</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 100">淘宝天猫</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 300">拼多多</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 400">抖店</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 999">线下渠道</span>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="商品ID" prop="goodsId">-->
<!-- <el-input-->
<!-- v-model="queryParams.goodsId"-->
<!-- placeholder="请输入erp系统商品id"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="商品编码" prop="goodsNum">-->
<!-- <el-input-->
<!-- v-model="queryParams.goodsNum"-->
<!-- placeholder="请输入商品编码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="规格ID" prop="specId">-->
<!-- <el-input-->
<!-- v-model="queryParams.specId"-->
<!-- placeholder="请输入erp系统商品规格id"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="备货状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" clearable @change="handleQuery">
<el-option
v-for="item in statusList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-document-copy"
size="mini"
:disabled="multiple"
@click="handleSelection"
>备货完成</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-data-analysis"
size="mini"
:disabled="multiple"
@click="handleStatistics"
>统计</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="shippingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键" align="center" prop="id" /> -->
<el-table-column label="订单号" align="left" prop="orderNum" width="200px">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
>{{scope.row.orderNum}} </el-button>
<i class="el-icon-copy-document tag-copy" :data-clipboard-text="scope.row.orderNum" @click="copyActiveCode($event,scope.row.orderNum)" ></i>
</template>>
</el-table-column>
<el-table-column label="店铺" align="center" prop="shopId" >
<template slot-scope="scope">
<span>{{ shopList.find(x=>x.id === scope.row.shopId).name }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="子订单编号" align="center" prop="orderItemId" /> -->
<!-- <el-table-column label="订单日期" align="center" prop="orderDate" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.orderDate, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="图片" width="55">
<template slot-scope="scope">
<el-image style="width: 45px; height: 45px;" :src="scope.row.goodsImg"></el-image>
</template>
</el-table-column>
<el-table-column label="商品" align="left" prop="goodsTitle" />
<el-table-column label="规格" align="left" prop="skuName" >
<template slot-scope="scope">
{{getSkuValues(scope.row.skuName)}}
</template>
</el-table-column>
<el-table-column label="Sku编码" align="center" prop="skuNum" />
<!-- <el-table-column label="erp商品id" align="center" prop="goodsId" />-->
<el-table-column label="商品库SkuId" align="center" prop="skuId" />
<!-- <el-table-column label="商品Sku编码" align="center" prop="specNum" />-->
<el-table-column label="商品数量" align="center" prop="quantity" >
<template slot-scope="scope">
<el-tag size="small">{{scope.row.quantity}}</el-tag>
</template>
</el-table-column>
<!-- <el-table-column label="仓库库存" align="center" prop="inventory" />-->
<el-table-column label="状态" align="center" prop="status" >
<template slot-scope="scope">
<el-tag size="small" v-if="scope.row.status === 0">待备货</el-tag>
<el-tag size="small" v-if="scope.row.status === 1">备货中</el-tag>
<el-tag size="small" v-if="scope.row.status === 2">备货完成</el-tag>
<el-tag size="small" v-if="scope.row.status === 3">已发货</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" >
<template slot-scope="scope">
<el-button
v-if="!scope.row.specId||scope.row.specId === 0"
size="mini" plain
type="primary"
icon="el-icon-edit"
@click="handleUpdateLink(scope.row)"
>修改商品关联</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改仓库订单发货对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<div id="dialogContent">
<el-form ref="form" :model="form" :rules="rules" label-width="80px" inline>
<!-- <el-form-item label="单号" prop="stockOutNum" v-if="isGen">-->
<!-- <el-input v-model="form.stockOutNum" disabled placeholder="请输入单号" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="完成时间" prop="completeTime" v-if="isGen">-->
<!-- <el-date-picker clearable-->
<!-- v-model="form.completeTime"-->
<!-- type="datetime" disabled-->
<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
<!-- placeholder="请选择时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-divider content-position="center" v-if="isGen">备货商品</el-divider>-->
<el-table :data="skuList" :row-class-name="rowItemIndex" ref="skuItem">
<!-- <el-table-column type="selection" width="50" align="center" />-->
<el-table-column label="序号" align="center" prop="index" width="50"/>
<el-table-column label="图片" prop="goodsImg" width="55">
<template slot-scope="scope">
<el-image style="width: 45px; height: 45px" :src="scope.row.goodsImg"></el-image>
</template>
</el-table-column>
<el-table-column label="商品" prop="goodsTitle" ></el-table-column>
<el-table-column label="规格" prop="skuName" >
<template slot-scope="scope">
{{getSkuValues(scope.row.skuName)}}
</template>
</el-table-column>
<el-table-column label="Sku编码" prop="skuNum" width="150"></el-table-column>
<el-table-column label="数量" prop="quantity" width="60"></el-table-column>
<!-- <el-table-column label="仓库库存" prop="inventory"></el-table-column>-->
</el-table>
</el-form>
</div>
<div slot="footer" class="dialog-footer" v-if="isGen">
<el-button v-print="'#dialogContent'">打印</el-button>
<el-button type="primary" @click="submitForm">完成</el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
<!-- 修改skuid对话框 -->
<el-dialog title="修改SkuId" :visible.sync="skuIdUpdateOpen" width="500px" append-to-body>
<el-form ref="form2" :model="form2" :rules="rules2" label-width="120px" inline>
<!-- <el-form-item label="ERP商品ID" prop="erpGoodsId" >-->
<!-- <el-input v-model="form2.erpGoodsId" disabled placeholder="请输入ERP商品ID" />-->
<!-- </el-form-item>-->
<el-form-item label="ERP商品SkuId" prop="erpGoodsSpecId" >
<el-input type="number" v-model="form2.erpGoodsSpecId" placeholder="请输入ERP商品SkuId" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitSkuIdUpdateForm">修改</el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {listShipStockupWarehouse,shipStockupComplete} from "@/api/shipping/shipping";
import {orderItemSpecIdUpdate} from "@/api/order/order";
import { listShop } from "@/api/shop/shop";
import Clipboard from "clipboard";
export default {
name: "ShipStockupOrderItem",
// computed: {
// supplier() {
// return supplier
// }
// },
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
shippingList: [],
//
title: "",
//
open: false,
skuIdUpdateOpen: false,
isGen:true,
//
queryParams: {
pageNum: 1,
pageSize: 100,
shopId: null,
goodsId: null,
specId: null,
goodsNum: null,
goodsSpec: null,
specNum: null,
status: null,
},
//
form: {
ids:[],
completeTime:null
},
form1: {
orderItemIds:[]
},
form2: {
orderItemId:null
},
shopList: [],
skuList:[],
supplierList:[],
statusList: [
{
value: '0',
label: '待备货'
}, {
value: '2',
label: '备货完成'
}
],
//
rules: {
stockOutNum: [{ required: true, message: "单号不能为空", trigger: "blur" }],
completeTime: [{ required: true, message: "生成时间不能为空", trigger: "blur" }],
goodsId: [{ required: true, message: "erp系统商品id不能为空", trigger: "blur" }],
specId: [{ required: true, message: "erp系统商品规格id不能为空", trigger: "blur" }],
quantity: [{ required: true, message: "商品数量不能为空", trigger: "blur" }],
},
rules1: {
supplierId: [{ required: true, message: "请选择供应商", trigger: "blur" }],
},
rules2: {
erpGoodsSpecId: [{ required: true, message: "请选择填写ERP商品SkuId", trigger: "blur" }],
}
};
},
mounted() {
},
created() {
listShop({}).then(response => {
this.shopList = response.rows;
});
if(this.$route.query.status){
this.queryParams.status = this.$route.query.status
}else {
this.queryParams.status = '0'
}
this.getList();
},
methods: {
copyActiveCode(event,queryParams) {
console.log(queryParams)
const clipboard = new Clipboard(".tag-copy")
clipboard.on('success', e => {
this.$message({ type: 'success', message: '复制成功' })
//
clipboard.destroy()
})
clipboard.on('error', e => {
//
this.$message({ type: 'waning', message: '该浏览器不支持自动复制' })
//
clipboard.destroy()
})
},
rowItemIndex({ row, rowIndex }) {
row.index = rowIndex + 1;
},
getSkuValues(spec){
try {
// JSON
const parsedSpec = JSON.parse(spec) || [];
// 使 map value使 join()
return parsedSpec.map(item => item.attr_value || item.value).join(', ') || '';
} catch (error) {
return spec; // JSON
}
},
/** 查询仓库订单发货列表 */
getList() {
this.loading = true;
listShipStockupWarehouse(this.queryParams).then(response => {
this.shippingList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.skuList = []
this.open = false;
this.skuIdUpdateOpen = false;
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 提交按钮 */
submitForm() {
console.log("=============备货完成提交===",this.ids)
this.$refs["form"].validate(valid => {
if (valid) {
if(!this.skuList || this.skuList.length === 0){
this.$modal.msgError("请选择备货商品");
}
this.form.ids = this.ids;
shipStockupComplete(this.form).then(response => {
this.$modal.msgSuccess("备货完成");
this.open = false;
this.getList();
});
}
});
},
handleStatistics(row){
this.handleSelection(row,false)
},
/** 按钮操作 */
handleSelection(row,isGen) {
const ids = row.id || this.ids;
// console.log("==========",ids)
if(!ids && ids.length===0){
this.$modal.msgError("请选选择要备货的商品");
return
}
if(isGen===undefined) this.isGen = true
else this.isGen = isGen
if(this.isGen === false)this.title = "备货统计";
else this.title = "备货完成";
//
var date = new Date();
var year = date.getFullYear().toString(); //
var month = (date.getMonth() + 1).toString().padStart(2, '0'); //
var day = date.getDate().toString().padStart(2, '0'); //
var hours = date.getHours().toString().padStart(2, '0'); //
var minutes = date.getMinutes().toString().padStart(2, '0'); //
var seconds = date.getSeconds().toString().padStart(2, '0'); //
//
var randomNum = Math.floor((Math.random() * 9) + 1); // 19
//
var code = `${year}${month}${day}${hours}${minutes}${seconds}${randomNum}`;
// console.log("" + code);
this.form.stockOutNum = code
this.form.completeTime = new Date()
this.skuList=[]
ids.forEach(id=>{
const obj = this.shippingList.find(y=>y.id === id)
const has = this.skuList.find(y=>y.originalSkuId === obj.originalSkuId)
if(has){
//
has.quantity = has.quantity + obj.quantity
has.ids.push(id)
}else{
//
const ids1 =[]
ids1.push(id);
this.skuList.push({
ids:ids1,
specId:obj.specId,
originalSkuId:obj.originalSkuId,
goodsImg:obj.goodsImg,
goodsNum:obj.goodsNum,
goodsTitle:obj.goodsTitle,
skuName:obj.skuName,
skuNum:obj.skuNum,
quantity:obj.quantity,
inventory:obj.inventory
})
}
})
this.open = true;
// this.$modal.confirm('"' + ids + '"').then(function() {
// return delShipping(ids);
// }).then(() => {
// this.getList();
// this.$modal.msgSuccess("");
// }).catch(() => {});
},
/** 修改商品关联 */
handleUpdateLink(row){
this.skuIdUpdateOpen = true
this.form2.orderItemId = row.id
// this.$modal.msgError("");
},
submitSkuIdUpdateForm(){
this.$refs["form2"].validate(valid => {
if (valid) {
orderItemSpecIdUpdate(this.form2).then(response => {
this.$modal.msgSuccess("SkuId修改成功");
this.skuIdUpdateOpen = false;
this.getList();
});
}
});
}
}
};
</script>

View File

@ -1,615 +0,0 @@
<template>
<div class="app-container" >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单号" prop="orderNum">
<el-input
v-model="queryParams.orderNum"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="店铺" prop="shopId" >
<el-select v-model="queryParams.shopId" clearable filterable placeholder="搜索店铺" @change="handleQuery">
<el-option v-for="item in shopList" :key="item.id" :label="item.name" :value="item.id">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 500">视频号小店</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 200">京东POP</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 280">京东自营</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 100">淘宝天猫</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 300">拼多多</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 400">抖店</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 999">线下渠道</span>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="商品ID" prop="goodsId">-->
<!-- <el-input-->
<!-- v-model="queryParams.goodsId"-->
<!-- placeholder="请输入erp系统商品id"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="商品编码" prop="goodsNum">-->
<!-- <el-input-->
<!-- v-model="queryParams.goodsNum"-->
<!-- placeholder="请输入商品编码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="规格ID" prop="specId">-->
<!-- <el-input-->
<!-- v-model="queryParams.specId"-->
<!-- placeholder="请输入erp系统商品规格id"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="规格编码" prop="specNum">
<el-input
v-model="queryParams.specNum"
placeholder="请输入商品规格编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="备货状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" clearable @change="handleQuery">
<el-option
v-for="item in statusList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-document-copy"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleSelection"-->
<!-- >备货完成</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-printer"
size="mini"
:disabled="multiple"
@click="handleStatistics"
>打印备货单</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="shippingList" @selection-change="handleSelectionChange" >
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键" align="center" prop="id" v-if="queryParams.status==='0'"/> -->
<el-table-column label="订单编号" align="left" prop="orderNum" width="200px">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
>{{scope.row.orderNum}} </el-button>
<i class="el-icon-copy-document tag-copy" :data-clipboard-text="scope.row.orderNum" @click="copyActiveCode($event,scope.row.orderNum)" ></i>
</template>
</el-table-column>
<el-table-column label="店铺" align="left" prop="shopId" width="200">
<template slot-scope="scope">
<el-tag>{{ shopList.find(x=>x.id === scope.row.shopId)?shopList.find(x=>x.id === scope.row.shopId).name:'' }}</el-tag>
</template>
</el-table-column>
<!-- <el-table-column label="子订单编号" align="center" prop="orderItemId" /> -->
<!-- <el-table-column label="订单日期" align="center" prop="orderDate" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.orderDate, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="商品明细" align="left" >
<template slot="header">
<table>
<th>
<td width="50px">图片</td>
<td width="300px" align="left">标题</td>
<td width="250" align="left">规格</td>
<td width="150" align="left">Sku编码</td>
<td width="150" align="left">系统SkuId</td>
<td width="50" align="left">数量</td>
</th>
</table>
</template>
<template slot-scope="scope">
<el-table :data="scope.row.children" :show-header="false" style="width: 100%" >
<el-table-column label="图片" width="50px">
<template slot-scope="scope">
<el-image style="width: 40px; height: 40px;" :src="scope.row.goodsImg" :preview-src-list="[scope.row.goodsImg]"></el-image>
</template>
</el-table-column>
<el-table-column label="商品" align="left" width="300px" prop="goodsTitle" />
<el-table-column label="规格" align="left" prop="skuName" width="250">
<template slot-scope="scope">
{{ getSkuValues(scope.row.skuName)}}
</template>
</el-table-column>
<el-table-column label="Sku编码" align="left" prop="skuNum" width="150"/>
<el-table-column label="商品SkuId" align="center" prop="skuId" width="150">
<template slot-scope="scope">
<span style="margin-right: 15px">{{scope.row.skuId}}</span>
<el-button icon="el-icon-edit" size="mini" plain @click="handleUpdateLink(scope.row)"></el-button>
</template>
</el-table-column>
<el-table-column label="商品数量" align="center" prop="quantity" width="50px">
<template slot-scope="scope">
<el-tag size="small">{{scope.row.quantity}}</el-tag>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<!-- <el-table-column label="商品图片" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-image style="width: 70px; height: 70px;" :src="scope.row.goodsImg"></el-image>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="商品标题" align="center" prop="goodsTitle" />-->
<!-- <el-table-column label="规格" align="center" prop="goodsSpec" />-->
<!-- <el-table-column label="规格编码" align="center" prop="specNum" />-->
<!-- <el-table-column label="erp商品id" align="center" prop="goodsId" />-->
<!-- <el-table-column label="erp商品SkuId" align="center" prop="specId" />-->
<!-- <el-table-column label="商品Sku编码" align="center" prop="specNum" />-->
<!-- <el-table-column label="商品数量" align="center" prop="quantity" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag size="small">{{scope.row.quantity}}</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="仓库库存" align="center" prop="inventory" />-->
<el-table-column label="状态" align="center" prop="status" width="100">
<template slot-scope="scope">
<el-tag size="small" v-if="scope.row.status === 0">待备货</el-tag>
<el-tag size="small" v-if="scope.row.status === 1">备货中</el-tag>
<el-tag size="small" v-if="scope.row.status === 2">备货完成</el-tag>
<el-tag size="small" v-if="scope.row.status === 3">已发货</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="150">
<template slot-scope="scope">
<el-button
size="mini"
v-if="scope.row.status ===0 || scope.row.status === 1"
plain
type="success"
icon="el-icon-document-copy"
@click="stockupCompleteByOrder(scope.row)"
>确认备货完成</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body >
<div id="dialogContent">
<el-form ref="form" :model="form" :rules="rules" label-width="80px" inline>
<!-- <el-form-item label="单号" prop="stockOutNum" v-if="isGen">-->
<!-- <el-input v-model="form.stockOutNum" disabled placeholder="请输入单号" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="完成时间" prop="completeTime" v-if="isGen">-->
<!-- <el-date-picker clearable-->
<!-- v-model="form.completeTime"-->
<!-- type="datetime" disabled-->
<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
<!-- placeholder="请选择时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="打印时间" prop="completeTime" v-if="!isGen">-->
<!-- <el-date-picker clearable-->
<!-- v-model="form.completeTime"-->
<!-- type="datetime" disabled-->
<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
<!-- placeholder="请选择时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-divider content-position="center" v-if="isGen">备货商品</el-divider>-->
<el-table :data="skuList" :row-class-name="rowItemIndex" ref="skuItem">
<!-- <el-table-column type="selection" width="50" align="center" />-->
<el-table-column label="序号" align="center" prop="index" width="50"/>
<el-table-column label="图片" prop="goodsImg" width="55">
<template slot-scope="scope">
<el-image style="width: 45px; height: 45px" :src="scope.row.goodsImg"></el-image>
</template>
</el-table-column>
<el-table-column label="商品" prop="goodsTitle" ></el-table-column>
<el-table-column label="规格" prop="skuName" >
<template slot-scope="scope">
{{ getSkuValues(scope.row.skuName)}}
</template>
</el-table-column>
<el-table-column label="Sku编码" prop="skuNum" width="150"></el-table-column>
<el-table-column label="数量" prop="quantity" width="60"></el-table-column>
<!-- <el-table-column label="仓库库存" prop="inventory"></el-table-column>-->
</el-table>
</el-form>
</div>
<div slot="footer" class="dialog-footer" v-if="isGen">
<el-button type="primary" @click="submitForm">完成</el-button>
<el-button @click="cancel"> </el-button>
</div>
<div slot="footer" class="dialog-footer" v-if="!isGen">
<el-button v-print="'#dialogContent'">打印</el-button>
</div>
</el-dialog>
<!-- 修改skuid对话框 -->
<el-dialog title="修改SkuId" :visible.sync="skuIdUpdateOpen" width="500px" append-to-body>
<el-form ref="form2" :model="form2" :rules="rules2" label-width="120px" inline>
<!-- <el-form-item label="ERP商品ID" prop="erpGoodsId" >-->
<!-- <el-input v-model="form2.erpGoodsId" disabled placeholder="请输入ERP商品ID" />-->
<!-- </el-form-item>-->
<el-form-item label="ERP商品SkuId" prop="erpGoodsSpecId" >
<el-input type="number" v-model="form2.erpGoodsSpecId" placeholder="请输入ERP商品SkuId" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitSkuIdUpdateForm">修改</el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listShipStockupWarehouse,
shipStockupCompleteByOrder
} from "@/api/shipping/shipping";
import {orderItemSpecIdUpdate} from "@/api/order/order";
import { listShop } from "@/api/shop/shop";
import Clipboard from "clipboard";
export default {
name: "ShipStockupOrder",
// computed: {
// supplier() {
// return supplier
// }
// },
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
shippingList: [],
//
title: "",
//
open: false,
skuIdUpdateOpen: false,
isGen:true,
//
queryParams: {
pageNum: 1,
pageSize: 100,
shopId: null,
goodsId: null,
specId: null,
goodsNum: null,
goodsSpec: null,
specNum: null,
status: null,
},
//
form: {
ids:[],
completeTime:null
},
form1: {
orderItemIds:[]
},
form2: {
orderItemId:null
},
shopList: [],
skuList:[],
supplierList:[],
//
shippingListOrigin:[],
statusList: [
{
value: '0',
label: '待备货'
}, {
value: '2',
label: '备货完成'
}
],
//
rules: {
stockOutNum: [{ required: true, message: "单号不能为空", trigger: "blur" }],
completeTime: [{ required: true, message: "生成时间不能为空", trigger: "blur" }],
goodsId: [{ required: true, message: "erp系统商品id不能为空", trigger: "blur" }],
specId: [{ required: true, message: "erp系统商品规格id不能为空", trigger: "blur" }],
quantity: [{ required: true, message: "商品数量不能为空", trigger: "blur" }],
},
rules1: {
supplierId: [{ required: true, message: "请选择供应商", trigger: "blur" }],
},
rules2: {
erpGoodsSpecId: [{ required: true, message: "请选择填写ERP商品SkuId", trigger: "blur" }],
}
};
},
mounted() {
},
created() {
listShop({}).then(response => {
this.shopList = response.rows;
});
if(this.$route.query.status){
this.queryParams.status = this.$route.query.status
}else {
this.queryParams.status = '0'
}
this.getList();
},
methods: {
copyActiveCode(event,queryParams) {
console.log(queryParams)
const clipboard = new Clipboard(".tag-copy")
clipboard.on('success', e => {
this.$message({ type: 'success', message: '复制成功' })
//
clipboard.destroy()
})
clipboard.on('error', e => {
//
this.$message({ type: 'waning', message: '该浏览器不支持自动复制' })
//
clipboard.destroy()
})
},
rowItemIndex({ row, rowIndex }) {
row.index = rowIndex + 1;
},
getSkuValues(spec){
try {
// JSON
const parsedSpec = JSON.parse(spec) || [];
// 使 map value使 join()
return parsedSpec.map(item => item.attr_value || item.value).join(', ') || '';
} catch (error) {
return spec; // JSON
}
},
/** 查询仓库订单发货列表 */
getList() {
this.loading = true;
listShipStockupWarehouse(this.queryParams).then(response => {
this.shippingListOrigin = response.rows;
// this.shippingList = response.rows;
// this.total = response.total;
//
// [obj...]
let newList=[]
// Array.prototype.reduct groupBy
var categoryAndObjMapList = response.rows.reduce((result, currValue) => {
let currCategory = currValue.orderNum;
//
if (Object.keys(result).includes(currCategory)) {
result[currCategory].push(currValue);
} else {
//
result[currCategory] = [currValue];
}
console.log({currCategory, result});
return result;
}, {});
console.log(categoryAndObjMapList);
Object.keys(categoryAndObjMapList).forEach(x=>{
let newObj = {
orderNum:x,
status:categoryAndObjMapList[x][0].status,
shopId:categoryAndObjMapList[x][0].shopId,
hasChildren:true,
children:categoryAndObjMapList[x]
}
newList.push(newObj)
// newList.push(...categoryAndObjMapList[x])
// console.log("============")
// console.log(categoryAndObjMapList[x])
})
console.log("----------------",newList)
this.shippingList = newList
this.total = newList.length
this.loading = false;
});
},
//
cancel() {
this.skuList = []
this.open = false;
this.skuIdUpdateOpen = false;
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.orderNum)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 提交按钮 */
submitForm() {
console.log("=============备货完成提交===",this.ids)
this.$refs["form"].validate(valid => {
if (valid) {
if(!this.skuList || this.skuList.length === 0){
this.$modal.msgError("请选择备货商品");
}
this.form.orderNums = this.ids;
shipStockupCompleteByOrder(this.form).then(response => {
this.$modal.msgSuccess("备货完成");
this.open = false;
this.getList();
});
}
});
},
/** 单个备货 **/
stockupCompleteByOrder(row) {
this.form.orderNums = [];
this.form.orderNums.push(row.orderNum)
shipStockupCompleteByOrder(this.form).then(response => {
this.$modal.msgSuccess("备货完成");
this.open = false;
this.getList();
});
},
handleStatistics(row){
this.handleSelection(row,false)
},
/** 按钮操作 */
handleSelection(row,isGen) {
const ids = row.orderNum || this.ids;
// console.log("==========",ids)
if(!ids && ids.length===0){
this.$modal.msgError("请选择备货订单");
return
}
if(isGen===undefined) this.isGen = true
else this.isGen = isGen
if(this.isGen === false)this.title = "打印备货单";
else this.title = "备货完成";
//
var date = new Date();
var year = date.getFullYear().toString(); //
var month = (date.getMonth() + 1).toString().padStart(2, '0'); //
var day = date.getDate().toString().padStart(2, '0'); //
var hours = date.getHours().toString().padStart(2, '0'); //
var minutes = date.getMinutes().toString().padStart(2, '0'); //
var seconds = date.getSeconds().toString().padStart(2, '0'); //
//
var randomNum = Math.floor((Math.random() * 9) + 1); // 19
//
var code = `${year}${month}${day}${hours}${minutes}${seconds}${randomNum}`;
// console.log("" + code);
this.form.stockOutNum = code
this.form.completeTime = new Date()
this.skuList=[]
ids.forEach(orderNum=>{
// const obj = this.shippingList.find(y=>y.orderNum === orderNum)
const objs= this.shippingListOrigin.filter(y=>y.orderNum === orderNum)
objs.forEach(obj=>{
const has = this.skuList.find(y=>y.originalSkuId === obj.originalSkuId)
if(has){
//
has.quantity = has.quantity + obj.quantity
has.ids.push(orderNum)
}else{
//
const ids1 =[]
ids1.push(orderNum);
this.skuList.push({
ids:ids1,
specId:obj.specId,
originalSkuId:obj.originalSkuId,
goodsImg:obj.goodsImg,
goodsNum:obj.goodsNum,
goodsTitle:obj.goodsTitle,
goodsSpec:obj.goodsSpec,
skuName:obj.skuName,
skuNum:obj.skuNum,
quantity:obj.quantity,
inventory:obj.inventory
})
}
})
})
this.open = true;
// this.$modal.confirm('"' + ids + '"').then(function() {
// return delShipping(ids);
// }).then(() => {
// this.getList();
// this.$modal.msgSuccess("");
// }).catch(() => {});
},
/** 修改商品关联 */
handleUpdateLink(row){
this.skuIdUpdateOpen = true
this.form2.orderItemId = row.id
// this.$modal.msgError("");
},
submitSkuIdUpdateForm(){
this.$refs["form2"].validate(valid => {
if (valid) {
orderItemSpecIdUpdate(this.form2).then(response => {
this.$modal.msgSuccess("SkuId修改成功");
this.skuIdUpdateOpen = false;
this.getList();
});
}
});
}
}
};
</script>