订单计划

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/projectorder/ProjectOrderSubMapper.java

@@ -128,7 +128,7 @@ public interface ProjectOrderSubMapper extends BaseMapperX<ProjectOrderSubDO> {
                 .select("DateDiff(a.project_end_time,CURRENT_DATE) as restDays")
                 .select("b.plan_no as planCode")
                 .select("d.name as projectSubName", "d.code as projectSubCode")
-                .select("COALESCE(SUM(case when g.is_final=1 then h.amount else 0 end), 0) as reportAmount")
+                .select("COALESCE(SUM(case when g.is_final=1 and g.name!='成品包装' then h.amount else 0 end), 0) as reportAmount")
                 .select("b.status as planStatus")
                 .leftJoin(ProjectOrderDO.class, "a", ProjectOrderDO::getId, ProjectOrderSubDO::getProjectOrderId)
                 .leftJoin(PlanDO.class, "b", PlanDO::getProjectId, ProjectOrderDO::getId)

sql/v1.0.0/2.business/1.structure.sql

@@ -195,12 +195,12 @@ CREATE TABLE `base_system_parameters` (
 drop table if exists `base_process`;
 CREATE TABLE `base_process` (
                                 `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增字段，唯一',
-                                `code` varchar(64) COLLATE DEFAULT NULL COMMENT '工艺路线编号',
-                                `name` varchar(64) COLLATE NOT NULL COMMENT '工艺路线名称,唯一',
+                                `code` varchar(64) DEFAULT NULL COMMENT '工艺路线编号',
+                                `name` varchar(64) NOT NULL COMMENT '工艺路线名称,唯一',
                                 `status` tinyint(1) NOT NULL COMMENT '状态,1表示正常，2表示禁用',
-                                `creator` varchar(64) COLLATE DEFAULT '' COMMENT '创建者',
+                                `creator` varchar(64) DEFAULT '' COMMENT '创建者',
                                 `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-                                `updater` varchar(64) COLLATE DEFAULT '' COMMENT '更新者',
+                                `updater` varchar(64) DEFAULT '' COMMENT '更新者',
                                 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
                                 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
                                 `tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号',
@@ -218,7 +218,7 @@ CREATE TABLE `base_process_detail` (
                                        `material_id` bigint(20) DEFAULT NULL COMMENT '产品id（物料）',
                                        `creator` varchar(64) COLLATE DEFAULT '' COMMENT '创建者',
                                        `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-                                       `updater` varchar(64) COLLATE DEFAULT '' COMMENT '更新者',
+                                       `updater` varchar(64) DEFAULT '' COMMENT '更新者',
                                        `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
                                        `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
                                        `tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号',