From 38c38ec849febfd51b17d945ec291c2edff94857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?= <411641505@qq.com> Date: Tue, 22 Aug 2023 20:22:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/设计文档/数据库设计/mes-pro.sql | 5 ++++ doc/设计文档/数据库设计/mes-wm.sql | 29 +++++++++++++++++++ .../ktg/common/constant/UserConstants.java | 12 ++++++++ 3 files changed, 46 insertions(+) diff --git a/doc/设计文档/数据库设计/mes-pro.sql b/doc/设计文档/数据库设计/mes-pro.sql index 04d8d59..ebff491 100644 --- a/doc/设计文档/数据库设计/mes-pro.sql +++ b/doc/设计文档/数据库设计/mes-pro.sql @@ -155,6 +155,7 @@ create table pro_route_process ( default_suf_time int(11) default 0 comment '等待时间', color_code char(7) default '#00AEF3' comment '甘特图显示颜色', key_flag varchar(64) default 'N' comment '关键工序', + is_check char(1) default 'N' comment '是否检验', remark varchar(500) default '' comment '备注', attr1 varchar(64) default null comment '预留字段1', attr2 varchar(255) default null comment '预留字段2', @@ -239,6 +240,8 @@ create table pro_task ( workstation_id bigint(20) not null comment '工作站ID', workstation_code varchar(64) not null comment '工作站编号', workstation_name varchar(255) not null comment '工作站名称', + route_id bigint(20) not null comment '工艺ID', + route_code varchar(64) comment '工艺编号', process_id bigint(20) not null comment '工序ID', process_code varchar(64) comment '工序编码', process_name varchar(255) comment '工序名称', @@ -289,6 +292,8 @@ create table pro_feedback ( workorder_id bigint(20) not null comment '生产工单ID', workorder_code varchar(64) comment '生产工单编号', workorder_name varchar(255) comment '生产工单名称', + route_id bigint(20) not null comment '工艺流程ID', + route_code varchar(64) comment '工艺流程编号', process_id bigint(20) not null comment '工序ID', process_code varchar(64) comment '工序编码', process_name varchar(255) comment '工序名称', diff --git a/doc/设计文档/数据库设计/mes-wm.sql b/doc/设计文档/数据库设计/mes-wm.sql index 515e4dd..1c3ba13 100644 --- a/doc/设计文档/数据库设计/mes-wm.sql +++ b/doc/设计文档/数据库设计/mes-wm.sql @@ -1184,3 +1184,32 @@ create table wm_stock_taking_line ( update_time datetime comment '更新时间', primary key (line_id) ) engine=innodb auto_increment=200 comment = '库存盘点明细表'; + + +-- ---------------------------- +-- 26、库存盘点结果表 +-- ---------------------------- +drop table if exists wm_stock_taking_result; +create table wm_stock_taking_result ( + result_id bigint(20) not null auto_increment comment '结果ID', + taking_id bigint(20) comment '盘点单ID', + item_id bigint(20) not null comment '产品物料ID', + item_code varchar(64) comment '产品物料编码', + item_name varchar(255) comment '产品物料名称', + specification varchar(500) comment '规格型号', + unit_of_measure varchar(64) comment '单位', + unit_name varchar(64) comment '单位名称', + quantity int(11) not null default 1 comment '数量', + taking_quantity int(11) comment '盘点数量', + taking_status varchar(64) not null default 'LOSS' comment '盘点状态', + remark varchar(500) default '' comment '备注', + attr1 varchar(64) default null comment '预留字段1', + attr2 varchar(255) default null comment '预留字段2', + attr3 int(11) default 0 comment '预留字段3', + attr4 int(11) default 0 comment '预留字段4', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + primary key (result_id) +) engine=innodb auto_increment=200 comment = '库存盘点结果表'; \ No newline at end of file diff --git a/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java b/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java index 3f369f6..4ecc7f1 100644 --- a/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java +++ b/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java @@ -233,4 +233,16 @@ public class UserConstants public static final String MESSAGE_STATUS_READ = "READ";//已读 public static final String MESSAGE_STATUS_PROCEED = "PROCEED";//已处理 + /** + * 库存盘点方式 + */ + public static final String WM_STOCK_TAKING_TYPE_BLIND = "BLIND"; //盲盘 + public static final String WM_STOCK_TAKING_TYPE_OPEN = "OPEN"; //明盘 + + /** + * 库存盘点结果 + */ + public static final String WM_STOCK_TAKING_STATUS_LOSS = "LOSS";// 盘亏 + public static final String WM_STOCK_TAKING_STATUS_PROFIT = "PROFIT"; //盘盈 + public static final String WM_STOCK_TAKING_STATUS_NORMAL = "NORMAL"; //正常 }