Merge branch 'dev_20260429' into dev_WMS20260401
# Conflicts: # mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java # mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java # mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java # mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java # mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batchDetail/BatchDetailApplicationService.java # mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/batchDetail/service/BatchDetailDomainService.java # mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/sysTableConfig/SysTableConfigApi.java
This commit is contained in:
王奎兴
@@ -0,0 +1,138 @@
|
||||
alter table NGWL_TEST_OMS.BUSINESS_DOCUMENT_ORDER
|
||||
add PUSH_STATUS TINYINT default 1;
|
||||
|
||||
comment
|
||||
on column NGWL_TEST_OMS.BUSINESS_DOCUMENT_ORDER.PUSH_STATUS is '推送状态：1-未推送 2-推送中 3-推送成功 4-推送失败';
|
||||
|
||||
|
||||
alter table NGWL_TEST_OMS.BUSINESS_DOCUMENT_ORDER
|
||||
add PUSH_TIME timestamp;
|
||||
|
||||
comment
|
||||
on column NGWL_TEST_OMS.BUSINESS_DOCUMENT_ORDER.PUSH_TIME is '推送时间';
|
||||
|
||||
|
||||
|
||||
alter table NGWL_TEST_OMS.BUSINESS_DOCUMENT_ORDER
|
||||
add PUSH_BY varchar(32);
|
||||
|
||||
comment
|
||||
on column NGWL_TEST_OMS.BUSINESS_DOCUMENT_ORDER.PUSH_BY is '推送人';
|
||||
|
||||
|
||||
alter table NGWL_TEST_OMS.BUSINESS_DOCUMENT_ORDER
|
||||
add PUSH_BY_NAME varchar(100);
|
||||
|
||||
comment
|
||||
on column NGWL_TEST_OMS.BUSINESS_DOCUMENT_ORDER.PUSH_BY_NAME is '推送人姓名';
|
||||
|
||||
|
||||
alter table NGWL_TEST_USER.USER_SHIPPER
|
||||
add PUSH_BY_NAME varchar(100);
|
||||
|
||||
comment
|
||||
on column NGWL_TEST_USER.USER_SHIPPER.PUSH_BY_NAME is '推送人姓名';
|
||||
|
||||
|
||||
alter table NGWL_TEST_OMS.BUSINESS_DOCUMENT_CARGO_MULTI
|
||||
add MATERIAL_BASE_INFO_ID BIGINT;
|
||||
|
||||
comment
|
||||
on column NGWL_TEST_OMS.BUSINESS_DOCUMENT_CARGO_MULTI.MATERIAL_BASE_INFO_ID is '物料id';
|
||||
|
||||
alter table NGWL_TEST_OMS.BUSINESS_DOCUMENT_CARGO_MULTI
|
||||
add PRODUCT_TYPE BIGINT;
|
||||
|
||||
comment
|
||||
on column NGWL_TEST_OMS.BUSINESS_DOCUMENT_CARGO_MULTI.PRODUCT_TYPE is '商品类型/货物类型（0料件，1半成品，2成品）';
|
||||
|
||||
|
||||
alter table NGWL_TEST_WMS.MATERIAL_BASE_INFO
|
||||
add PUSH_BY_NAME varchar(100);
|
||||
|
||||
comment
|
||||
on column NGWL_TEST_WMS.MATERIAL_BASE_INFO.PUSH_BY_NAME is '推送人名称';
|
||||
|
||||
|
||||
|
||||
|
||||
USE NGWL_TEST_OMS;
|
||||
|
||||
|
||||
CREATE TABLE GW_LOG (
|
||||
LOG_ID BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '日志ID',
|
||||
TYPE VARCHAR(50) COMMENT '类型',
|
||||
BUSINESS_ID BIGINT COMMENT '业务ID',
|
||||
REQUEST_BODY TEXT COMMENT '请求体',
|
||||
RESPONSE_BODY TEXT COMMENT '响应体',
|
||||
STATUS INT DEFAULT 1 COMMENT '状态：1-初始，2-成功，3-失败',
|
||||
ERROR_MSG VARCHAR(500) COMMENT '错误信息',
|
||||
SEND_TIME DATETIME COMMENT '发送时间',
|
||||
ORGANIZATION_ID BIGINT COMMENT '组织ID',
|
||||
TOP_ORGANIZATION_ID BIGINT COMMENT '顶级组织ID',
|
||||
ORGANIZATION_NAME VARCHAR(200) COMMENT '组织名称',
|
||||
CREATE_BY BIGINT COMMENT '创建人',
|
||||
CREATE_TIME DATETIME COMMENT '创建时间',
|
||||
DEL_FLAG INT DEFAULT 1 COMMENT '删除标记：1-正常，0-删除'
|
||||
);
|
||||
|
||||
alter table NGWL_TEST_OMS.GW_LOG
|
||||
add PUSH_BY_NAME varchar(100);
|
||||
|
||||
comment
|
||||
on column NGWL_TEST_OMS.GW_LOG.PUSH_BY_NAME is '推送人姓名';
|
||||
|
||||
|
||||
|
||||
|
||||
CREATE TABLE ERP_ENTERPRISE_UNIT (
|
||||
ID BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
|
||||
ERP_CODE VARCHAR(100) COMMENT 'ERP单位编码',
|
||||
ERP_NAME VARCHAR(200) COMMENT 'ERP单位名称',
|
||||
PUSH_STATUS INT DEFAULT 1 COMMENT '推送状态：1-未推送，2-推送中，3-推送成功，4-推送失败',
|
||||
PUSH_TIME DATETIME COMMENT '推送时间',
|
||||
PUSH_BY BIGINT COMMENT '推送人',
|
||||
ORGANIZATION_ID BIGINT COMMENT '所属组织ID',
|
||||
TOP_ORGANIZATION_ID BIGINT COMMENT '一级组织ID',
|
||||
ORGANIZATION_NAME VARCHAR(200) COMMENT '所属组织名称',
|
||||
CREATE_BY BIGINT COMMENT '创建人',
|
||||
CREATE_BY_NAME VARCHAR(64) COMMENT '创建人姓名',
|
||||
CREATE_TIME DATETIME COMMENT '创建时间',
|
||||
UPDATE_BY BIGINT COMMENT '更新人',
|
||||
UPDATE_TIME DATETIME COMMENT '更新时间',
|
||||
DEL_FLAG INT DEFAULT 1 COMMENT '删除标记：1-正常，0-删除'
|
||||
);
|
||||
|
||||
COMMENT ON TABLE ERP_ENTERPRISE_UNIT IS '企业单位表';
|
||||
|
||||
alter table NGWL_TEST_OMS.ERP_ENTERPRISE_UNIT
|
||||
add PUSH_BY_NAME VARCHAR(100);
|
||||
|
||||
comment
|
||||
on column NGWL_TEST_OMS.ERP_ENTERPRISE_UNIT.PUSH_BY_NAME is '推送人姓名';
|
||||
|
||||
|
||||
|
||||
CREATE TABLE ERP_COUNTRY (
|
||||
ID BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
|
||||
ERP_COUNTRY_CODE VARCHAR(100) COMMENT 'ERP国别编码',
|
||||
ERP_COUNTRY_NAME VARCHAR(200) COMMENT 'ERP国别名称',
|
||||
PUSH_STATUS INT DEFAULT 1 COMMENT '推送状态：1-未推送，2-推送中，3-推送成功，4-推送失败',
|
||||
PUSH_TIME DATETIME COMMENT '推送时间',
|
||||
PUSH_BY BIGINT COMMENT '推送人',
|
||||
ORGANIZATION_ID BIGINT COMMENT '所属组织ID',
|
||||
TOP_ORGANIZATION_ID BIGINT COMMENT '一级组织ID',
|
||||
ORGANIZATION_NAME VARCHAR(100) COMMENT '所属组织名称',
|
||||
CREATE_BY BIGINT COMMENT '创建人',
|
||||
CREATE_TIME DATETIME COMMENT '创建时间',
|
||||
UPDATE_BY BIGINT COMMENT '更新人',
|
||||
UPDATE_TIME DATETIME COMMENT '更新时间',
|
||||
DEL_FLAG INT DEFAULT 1 COMMENT '删除标记：1-正常，0-删除'
|
||||
);
|
||||
COMMENT ON TABLE ERP_COUNTRY IS '企业国别表';
|
||||
|
||||
alter table NGWL_TEST_OMS.ERP_COUNTRY
|
||||
add PUSH_BY_NAME varchar(100);
|
||||
|
||||
comment
|
||||
on column NGWL_TEST_OMS.ERP_COUNTRY.PUSH_BY_NAME is '托送人姓名';
|
||||
Reference in New Issue
Block a user