From d5677328bb7b9408e25c2727d125e27c42e2e5fb Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Thu, 25 Apr 2024 16:13:13 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E3=80=91=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=AD=90=E9=A1=B9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/dal/dataobject/projectorder/ProjectOrderSubDO.java | 1 + .../biz/dal/mysql/projectorder/ProjectOrderSubMapper.java | 2 +- sql/v1.0.0/2.business/1.structure.sql | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/projectorder/ProjectOrderSubDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/projectorder/ProjectOrderSubDO.java index b8f8229e..cc6b2396 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/projectorder/ProjectOrderSubDO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/projectorder/ProjectOrderSubDO.java @@ -64,6 +64,7 @@ public class ProjectOrderSubDO extends BaseDO { /** * 单位 */ + @TableField(exist = false) private String unit; /** diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/projectorder/ProjectOrderSubMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/projectorder/ProjectOrderSubMapper.java index 56c9ba55..ed2c84d4 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/projectorder/ProjectOrderSubMapper.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/projectorder/ProjectOrderSubMapper.java @@ -39,7 +39,7 @@ public interface ProjectOrderSubMapper extends BaseMapperX { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(ProjectOrderSubDO.class) .select("a.code as projectOrderCode") - .select("b.code as projectSubCode", "b.name projectSubName", "b.spec") + .select("b.code as projectSubCode", "b.name projectSubName", "b.spec", "b.unit") .leftJoin(ProjectOrderDO.class, "a", ProjectOrderDO::getId, ProjectOrderSubDO::getProjectOrderId) .leftJoin(MaterialDO.class, "b", MaterialDO::getId, ProjectOrderSubDO::getMaterialId) .disableSubLogicDel() diff --git a/sql/v1.0.0/2.business/1.structure.sql b/sql/v1.0.0/2.business/1.structure.sql index 4bc4973a..4a150f8a 100644 --- a/sql/v1.0.0/2.business/1.structure.sql +++ b/sql/v1.0.0/2.business/1.structure.sql @@ -98,3 +98,5 @@ ALTER TABLE pro_task_dispatch ADD COLUMN `workshop_id` BIGINT ( 20 ) NOT NULL CO drop table if exists pro_process_bom; drop table if exists pro_process_bom_detail; + +alter table project_sale_order_sub drop column unit;