From 4012c531160de139d896bfc9475b947606787a2a Mon Sep 17 00:00:00 2001 From: YuanFeng <770153798@qq.com> Date: Tue, 8 Oct 2024 23:46:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=20=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saleordersku/SaleOrderSkuDO.java | 4 +- .../saleorder/SaleOrderServiceImpl.java | 2 + ...售订单产品属性表-新增销售相关订单字段.sql | 40 +++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 sql/mysql/20241008/销售订单产品属性表-新增销售相关订单字段.sql diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleordersku/SaleOrderSkuDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleordersku/SaleOrderSkuDO.java index 480ac57..af06fa6 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleordersku/SaleOrderSkuDO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleordersku/SaleOrderSkuDO.java @@ -43,11 +43,11 @@ public class SaleOrderSkuDO extends BaseDO { /** * 销售订单id oms_saleorder */ - private String saleOrderId; + private Long saleOrderId; /** * 产品id oms_product_info */ - private String productId; + private Long productId; /** * 数量 */ diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java index d925e46..c9eb700 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java @@ -483,8 +483,10 @@ public class SaleOrderServiceImpl implements SaleOrderService { for (SaleOrderSkuDTO saleOrderSkuDTO : productSkuList) { SaleOrderSkuDO saleOrderSkuDO = new SaleOrderSkuDO(); BeanUtil.copyProperties(saleOrderSkuDTO,saleOrderSkuDO); + saleOrderSkuDO.setSaleOrderId(order.getId()); saleOrderSkuDO.setEntryId(entry.getId()); saleOrderSkuDO.setId(FuncUtil.getNextId()); + skuList.add(saleOrderSkuDO); } diff --git a/sql/mysql/20241008/销售订单产品属性表-新增销售相关订单字段.sql b/sql/mysql/20241008/销售订单产品属性表-新增销售相关订单字段.sql new file mode 100644 index 0000000..3d89e55 --- /dev/null +++ b/sql/mysql/20241008/销售订单产品属性表-新增销售相关订单字段.sql @@ -0,0 +1,40 @@ +-- 新增字段 +ALTER TABLE oms_saleorder_entry ADD COLUMN `delivery_date` DATETIME DEFAULT NULL COMMENT '交货日期'; + +ALTER TABLE oms_saleorder ADD COLUMN `order_code` VARCHAR(64) DEFAULT NULL COMMENT '订单号'; +ALTER TABLE oms_saleorder ADD COLUMN `contact_name` VARCHAR(128) DEFAULT NULL COMMENT '联系人名称'; +ALTER TABLE oms_saleorder ADD COLUMN `tel` VARCHAR(64) DEFAULT NULL COMMENT '固定电话'; +ALTER TABLE oms_saleorder ADD COLUMN `contract_code` VARCHAR(64) DEFAULT NULL COMMENT '合同编码'; +ALTER TABLE oms_saleorder ADD COLUMN `retailer_code` VARCHAR(64) DEFAULT NULL COMMENT '零售商单号'; +ALTER TABLE oms_saleorder ADD COLUMN `invoice_address` VARCHAR(512) DEFAULT NULL COMMENT '发票地址'; +ALTER TABLE oms_saleorder ADD COLUMN `brand_id` BIGINT(19) DEFAULT NULL COMMENT '品牌 id'; +ALTER TABLE oms_saleorder ADD COLUMN `is_batch` BIT(1) DEFAULT 0 COMMENT '是否分批交货 0否 1分批交货'; + + + DROP TABLE IF EXISTS oms_sale_order_sku; +CREATE TABLE oms_sale_order_sku( + id BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT 'id' , + entry_id VARCHAR(32) COMMENT '销售订单分表id oms_saleorder_entry' , + item_key VARCHAR(32) COMMENT '数据key' , + sale_order_id VARCHAR(32) COMMENT '销售订单id oms_saleorder' , + product_id VARCHAR(512) COMMENT '产品id oms_product_info' , + order_qty INT COMMENT '数量' , + draft_design_id BIGINT(19) COMMENT '设计稿id oms_draft_design_data' , + width DECIMAL(13,4) COMMENT '设计稿宽' , + height DECIMAL(13,4) COMMENT '设计稿高' , + preview_image longtext COMMENT '预览图' , + prop_info longtext COMMENT '动态属性 json动态属性' , + spec_info VARCHAR(3072) COMMENT '规格 json完整信息' , + spec_size_width DECIMAL(13,4) COMMENT '宽(mm)' , + spec_size_height DECIMAL(13,4) COMMENT '高(mm)' , + spec_size_thk DECIMAL(13,4) COMMENT '厚度(mm)' , + spec_material VARCHAR(512) COMMENT '材质' , + main_color VARCHAR(128) COMMENT '主色风格' , + creator VARCHAR(64) COMMENT '创建者' , + create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间' , + updater VARCHAR(64) COMMENT '更新者' , + update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间' , + deleted BIT(1) NOT NULL DEFAULT 0 COMMENT '是否删除' , + tenant_id BIGINT(19) NOT NULL COMMENT '租户编号' , + PRIMARY KEY (id) +) COMMENT = '销售订单产品属性表 ';