diff --git a/mes-framework/mes-spring-boot-starter-banner/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-banner/.flattened-pom.xml deleted file mode 100644 index be6cab68..00000000 --- a/mes-framework/mes-spring-boot-starter-banner/.flattened-pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-banner - 2.0.0-jdk8-snapshot - ${project.artifactId} - Banner 用于在 console 控制台，打印开发文档、接口文档等 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - org.springframework.boot - spring-boot-starter - - - diff --git a/mes-framework/mes-spring-boot-starter-biz-data-permission/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-biz-data-permission/.flattened-pom.xml deleted file mode 100644 index ff8957e7..00000000 --- a/mes-framework/mes-spring-boot-starter-biz-data-permission/.flattened-pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-biz-data-permission - 2.0.0-jdk8-snapshot - ${project.artifactId} - 数据权限 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - com.chanko.yunxi - mes-spring-boot-starter-security - true - - - com.chanko.yunxi - mes-spring-boot-starter-mybatis - - - com.chanko.yunxi - mes-module-system-api - ${revision} - - - diff --git a/mes-framework/mes-spring-boot-starter-biz-dict/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-biz-dict/.flattened-pom.xml deleted file mode 100644 index ef3cb160..00000000 --- a/mes-framework/mes-spring-boot-starter-biz-dict/.flattened-pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-biz-dict - 2.0.0-jdk8-snapshot - ${project.artifactId} - 字典类型、数据 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - org.springframework.boot - spring-boot-starter - - - com.chanko.yunxi - mes-module-system-api - ${revision} - - - com.google.guava - guava - - - diff --git a/mes-framework/mes-spring-boot-starter-biz-error-code/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-biz-error-code/.flattened-pom.xml deleted file mode 100644 index 250be641..00000000 --- a/mes-framework/mes-spring-boot-starter-biz-error-code/.flattened-pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-biz-error-code - 2.0.0-jdk8-snapshot - ${project.artifactId} - 错误码 ErrorCode 的自动配置功能，提供如下功能： - 1. 远程读取：项目启动时，从 system-server 服务，读取数据库中的 ErrorCode 错误码，实现错误码的提示可配置； - 2. 自动更新：管理员在管理后台修数据库中的 ErrorCode 错误码时，项目自动从 system-server 服务加载最新的 ErrorCode 错误码； - 3. 自动写入：项目启动时，将项目本地的错误码写到 system-server 服务中，方便管理员在管理后台编辑； - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - org.springframework.boot - spring-boot-starter - - - com.chanko.yunxi - mes-module-system-api - ${revision} - - - jakarta.validation - jakarta.validation-api - provided - - - diff --git a/mes-framework/mes-spring-boot-starter-biz-ip/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-biz-ip/.flattened-pom.xml deleted file mode 100644 index a4b727b0..00000000 --- a/mes-framework/mes-spring-boot-starter-biz-ip/.flattened-pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-biz-ip - 2.0.0-jdk8-snapshot - ${project.artifactId} - IP 拓展，支持如下功能： - 1. IP 功能：查询 IP 对应的城市信息 - 基于 https://gitee.com/lionsoul/ip2region 实现 - 2. 城市功能：查询城市编码对应的城市信息 - 基于 https://github.com/modood/Administrative-divisions-of-China 实现 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - org.lionsoul - ip2region - - - org.projectlombok - lombok - - - org.slf4j - slf4j-api - provided - - - diff --git a/mes-framework/mes-spring-boot-starter-biz-operatelog/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-biz-operatelog/.flattened-pom.xml deleted file mode 100644 index 8b53a525..00000000 --- a/mes-framework/mes-spring-boot-starter-biz-operatelog/.flattened-pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-biz-operatelog - 2.0.0-jdk8-snapshot - ${project.artifactId} - 操作日志 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - org.springframework.boot - spring-boot-starter-aop - - - com.chanko.yunxi - mes-spring-boot-starter-web - provided - - - com.chanko.yunxi - mes-module-system-api - ${revision} - - - com.google.guava - guava - - - diff --git a/mes-framework/mes-spring-boot-starter-biz-sms/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-biz-sms/.flattened-pom.xml deleted file mode 100644 index b3e7756f..00000000 --- a/mes-framework/mes-spring-boot-starter-biz-sms/.flattened-pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-biz-sms - 2.0.0-jdk8-snapshot - ${project.artifactId} - 短信拓展，支持阿里云、腾讯云 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - org.springframework.boot - spring-boot-starter - - - io.opentracing - opentracing-util - - - com.google.guava - guava - true - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - - - jakarta.validation - jakarta.validation-api - - - com.aliyun - aliyun-java-sdk-core - - - com.aliyun - aliyun-java-sdk-dysmsapi - - - com.tencentcloudapi - tencentcloud-sdk-java-sms - - - diff --git a/mes-framework/mes-spring-boot-starter-biz-tenant/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-biz-tenant/.flattened-pom.xml deleted file mode 100644 index e4e76912..00000000 --- a/mes-framework/mes-spring-boot-starter-biz-tenant/.flattened-pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-biz-tenant - 2.0.0-jdk8-snapshot - ${project.artifactId} - 多租户 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - com.chanko.yunxi - mes-spring-boot-starter-security - - - com.chanko.yunxi - mes-spring-boot-starter-mybatis - - - com.chanko.yunxi - mes-spring-boot-starter-redis - - - com.chanko.yunxi - mes-spring-boot-starter-job - - - com.chanko.yunxi - mes-spring-boot-starter-mq - true - - - org.springframework.kafka - spring-kafka - true - - - org.springframework.amqp - spring-rabbit - true - - - org.apache.rocketmq - rocketmq-spring-boot-starter - true - - - com.google.guava - guava - - - diff --git a/mes-framework/mes-spring-boot-starter-captcha/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-captcha/.flattened-pom.xml deleted file mode 100644 index da369026..00000000 --- a/mes-framework/mes-spring-boot-starter-captcha/.flattened-pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-captcha - 2.0.0-jdk8-snapshot - ${project.artifactId} - 验证码拓展 - 1. 基于 aj-captcha 实现滑块验证码，文档：https://ajcaptcha.beliefteam.cn/captcha-doc/ - - - com.xingyuv - spring-boot-starter-captcha-plus - - - org.springframework.boot - spring-boot-starter - - - com.chanko.yunxi - mes-spring-boot-starter-redis - - - diff --git a/mes-framework/mes-spring-boot-starter-desensitize/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-desensitize/.flattened-pom.xml deleted file mode 100644 index bd70ced8..00000000 --- a/mes-framework/mes-spring-boot-starter-desensitize/.flattened-pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-desensitize - 2.0.0-jdk8-snapshot - 脱敏组件：支持 JSON 返回数据时，将邮箱、手机等字段进行脱敏 - - - com.chanko.yunxi - mes-common - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - diff --git a/mes-framework/mes-spring-boot-starter-excel/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-excel/.flattened-pom.xml deleted file mode 100644 index b291209c..00000000 --- a/mes-framework/mes-spring-boot-starter-excel/.flattened-pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-excel - 2.0.0-jdk8-snapshot - ${project.artifactId} - Excel 拓展 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - com.chanko.yunxi - mes-spring-boot-starter-biz-dict - true - - - org.springframework - spring-web - provided - - - jakarta.servlet - jakarta.servlet-api - provided - - - com.alibaba - easyexcel - - - diff --git a/mes-framework/mes-spring-boot-starter-file/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-file/.flattened-pom.xml deleted file mode 100644 index 8c5ed388..00000000 --- a/mes-framework/mes-spring-boot-starter-file/.flattened-pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-file - 2.0.0-jdk8-snapshot - ${project.artifactId} - 文件客户端，支持多种存储器 - 1. file：本地磁盘 - 2. ftp：FTP 服务器 - 2. sftp：SFTP 服务器 - 4. db：数据库 - 5. s3：支持 S3 协议的云存储服务，例如说 MinIO、阿里云、华为云、腾讯云、七牛云等等 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-validation - - - org.slf4j - slf4j-api - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - - - commons-net - commons-net - - - com.jcraft - jsch - - - org.apache.tika - tika-core - - - io.minio - minio - - - diff --git a/mes-framework/mes-spring-boot-starter-job/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-job/.flattened-pom.xml deleted file mode 100644 index 2fea5dc4..00000000 --- a/mes-framework/mes-spring-boot-starter-job/.flattened-pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-job - 2.0.0-jdk8-snapshot - ${project.artifactId} - 任务拓展 - 1. 定时任务，基于 Quartz 拓展 - 2. 异步任务，基于 Spring Async 拓展 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - org.springframework.boot - spring-boot-starter-quartz - - - jakarta.validation - jakarta.validation-api - - - diff --git a/mes-framework/mes-spring-boot-starter-monitor/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-monitor/.flattened-pom.xml deleted file mode 100644 index 0393663f..00000000 --- a/mes-framework/mes-spring-boot-starter-monitor/.flattened-pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-monitor - 2.0.0-jdk8-snapshot - ${project.artifactId} - 服务监控，提供链路追踪、日志服务、指标收集等等功能 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework - spring-web - provided - - - jakarta.servlet - jakarta.servlet-api - provided - - - io.opentracing - opentracing-util - - - org.apache.skywalking - apm-toolkit-trace - - - org.apache.skywalking - apm-toolkit-logback-1.x - - - org.apache.skywalking - apm-toolkit-opentracing - - - io.micrometer - micrometer-registry-prometheus - - - de.codecentric - spring-boot-admin-starter-client - - - diff --git a/mes-framework/mes-spring-boot-starter-mq/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-mq/.flattened-pom.xml deleted file mode 100644 index e25c6f90..00000000 --- a/mes-framework/mes-spring-boot-starter-mq/.flattened-pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-mq - 2.0.0-jdk8-snapshot - ${project.artifactId} - 消息队列，支持 Redis、RocketMQ、RabbitMQ、Kafka 四种 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-spring-boot-starter-redis - - - org.springframework.kafka - spring-kafka - true - - - org.springframework.amqp - spring-rabbit - true - - - org.apache.rocketmq - rocketmq-spring-boot-starter - true - - - diff --git a/mes-framework/mes-spring-boot-starter-mybatis/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-mybatis/.flattened-pom.xml deleted file mode 100644 index de3a0db9..00000000 --- a/mes-framework/mes-spring-boot-starter-mybatis/.flattened-pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-mybatis - 2.0.0-jdk8-snapshot - ${project.artifactId} - 数据库连接池、多数据源、事务、MyBatis 拓展 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - com.chanko.yunxi - mes-spring-boot-starter-web - provided - - - com.mysql - mysql-connector-j - - - com.oracle.database.jdbc - ojdbc8 - true - - - org.postgresql - postgresql - true - - - com.microsoft.sqlserver - mssql-jdbc - true - - - com.dameng - DmJdbcDriver18 - true - - - com.alibaba - druid-spring-boot-starter - - - com.baomidou - mybatis-plus-boot-starter - - - com.baomidou - dynamic-datasource-spring-boot-starter - - - com.github.yulichang - mybatis-plus-join-boot-starter - - - diff --git a/mes-framework/mes-spring-boot-starter-protection/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-protection/.flattened-pom.xml deleted file mode 100644 index dcb5c22e..00000000 --- a/mes-framework/mes-spring-boot-starter-protection/.flattened-pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-protection - 2.0.0-jdk8-snapshot - ${project.artifactId} - 服务保证，提供分布式锁、幂等、限流、熔断等等功能 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-spring-boot-starter-redis - - - com.baomidou - lock4j-redisson-spring-boot-starter - true - - - io.github.resilience4j - resilience4j-spring-boot2 - true - - - diff --git a/mes-framework/mes-spring-boot-starter-redis/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-redis/.flattened-pom.xml deleted file mode 100644 index 8b6558aa..00000000 --- a/mes-framework/mes-spring-boot-starter-redis/.flattened-pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-redis - 2.0.0-jdk8-snapshot - ${project.artifactId} - Redis 封装拓展 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - org.redisson - redisson-spring-boot-starter - - - org.springframework.boot - spring-boot-starter-cache - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - diff --git a/mes-framework/mes-spring-boot-starter-security/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-security/.flattened-pom.xml deleted file mode 100644 index 1bc5e639..00000000 --- a/mes-framework/mes-spring-boot-starter-security/.flattened-pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-security - 2.0.0-jdk8-snapshot - ${project.artifactId} - 用户的认证、权限的校验 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - org.springframework.boot - spring-boot-starter-aop - - - com.chanko.yunxi - mes-spring-boot-starter-web - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework.boot - spring-boot-starter-security - - - com.google.guava - guava - - - com.chanko.yunxi - mes-module-system-api - ${revision} - - - diff --git a/mes-framework/mes-spring-boot-starter-web/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-web/.flattened-pom.xml deleted file mode 100644 index 44d281f1..00000000 --- a/mes-framework/mes-spring-boot-starter-web/.flattened-pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-web - 2.0.0-jdk8-snapshot - ${project.artifactId} - Web 框架，全局异常、API 日志等 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-configuration-processor - true - - - com.github.xiaoymin - knife4j-openapi3-spring-boot-starter - - - org.springdoc - springdoc-openapi-ui - - - org.springframework.security - spring-security-core - provided - - - com.chanko.yunxi - mes-module-infra-api - ${revision} - - - org.jsoup - jsoup - - - org.springframework - spring-tx - - - diff --git a/mes-framework/mes-spring-boot-starter-websocket/.flattened-pom.xml b/mes-framework/mes-spring-boot-starter-websocket/.flattened-pom.xml deleted file mode 100644 index 57e12c18..00000000 --- a/mes-framework/mes-spring-boot-starter-websocket/.flattened-pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-spring-boot-starter-websocket - 2.0.0-jdk8-snapshot - ${project.artifactId} - WebSocket 框架，支持多节点的广播 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.chanko.yunxi - mes-common - - - com.chanko.yunxi - mes-spring-boot-starter-security - provided - - - org.springframework.boot - spring-boot-starter-websocket - - - com.chanko.yunxi - mes-spring-boot-starter-mq - - - org.springframework.kafka - spring-kafka - true - - - org.springframework.amqp - spring-rabbit - true - - - org.apache.rocketmq - rocketmq-spring-boot-starter - true - - - com.chanko.yunxi - mes-spring-boot-starter-biz-tenant - provided - - - diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java index d7c67ef1..18fb3138 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java @@ -245,6 +245,8 @@ public interface MaterialMapper extends BaseMapperX { .eq(true,PurchaseOrderNoDetailDO::getPurchaseOrderId, pageReqVO.getHeaderId()) .eq(true,MaterialDO::getVirtualPart, YesOrNoEnum.N.name()) .eq(MaterialDO::getStatus,1) + .eq(StorageInventoryDO::getDeleted, 0) + .eq(PurchaseOrderNoDetailDO::getDeleted, 0) .eq("d.dict_type","heli_material_type") .eq("d1.dict_type","heli_material_unit") ; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java index 899b1648..1870761c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java @@ -296,58 +296,58 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe // outMat.setStorageOkQty(detailDO.getPurchaseRemAmounts()); // outMat.setProjectNo(byId.getProjectPlanSubId().toString()); // outMat.setProjectSubName(byId.getName()); - ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectById(detailDO.getBoomDetailId()); - StorageLogDO logDO = new StorageLogDO(); - StorageLogDO outLogDO = new StorageLogDO(); - if (ObjectUtil.isNotEmpty(bomDetailDO)){ - String bomCode=""; - String blueprintNo=""; - String ProcedureName=""; - MaterialDO materialDO = new MaterialDO(); - materialDO.setUnit(bomDetailDO.getUnit()); - materialDO.setSpec(bomDetailDO.getSpec()); - materialDO.setName(bomDetailDO.getMaterialName()); - ProcessBomDO processBomDO = pocessBomMapper.selectById(bomDetailDO.getBomId()); - if (ObjectUtil.isNotEmpty(processBomDO)){ - if (ObjectUtil.isNotEmpty(processBomDO.getCode())){ - bomCode=processBomDO.getCode(); - } - } - if (ObjectUtil.isNotEmpty(bomDetailDO.getBlueprintNo())){ - blueprintNo=bomDetailDO.getBlueprintNo(); - } - MaterialPlanBoomDO boomDO = materialPlanBoomMapper.selectById(detailDO.getProjectMaterialPlanBoomId()); - if (ObjectUtil.isNotEmpty(boomDO)){ - ProcedureDO procedure = procedureService.getProcedure(boomDO.getProcedureId()); - if (ObjectUtil.isNotEmpty(procedure)){ - if (ObjectUtil.isNotEmpty(procedure.getName())){ - ProcedureName=procedure.getName(); - } - } - } - String code=bomCode+blueprintNo+ProcedureName; - materialDO.setCode(code); - materialDO.setCompositionId(bomDetailDO.getCompositionId()); - materialDO.setMaterialType("1"); - materialDO.setVirtualPart("Y"); - MaterialDO material = materialMapper.selectMaterial(code); - if (ObjectUtil.isEmpty(material)){ +// ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectById(detailDO.getBoomDetailId()); + +// if (ObjectUtil.isNotEmpty(bomDetailDO)){ +// String bomCode=""; +// String blueprintNo=""; +// String ProcedureName=""; +// MaterialDO materialDO = new MaterialDO(); +// materialDO.setUnit(bomDetailDO.getUnit()); +// materialDO.setSpec(bomDetailDO.getSpec()); +// materialDO.setName(bomDetailDO.getMaterialName()); +// ProcessBomDO processBomDO = pocessBomMapper.selectById(bomDetailDO.getBomId()); +// if (ObjectUtil.isNotEmpty(processBomDO)){ +// if (ObjectUtil.isNotEmpty(processBomDO.getCode())){ +// bomCode=processBomDO.getCode(); +// } +// } +// if (ObjectUtil.isNotEmpty(bomDetailDO.getBlueprintNo())){ +// blueprintNo=bomDetailDO.getBlueprintNo(); +// } +// MaterialPlanBoomDO boomDO = materialPlanBoomMapper.selectById(detailDO.getProjectMaterialPlanBoomId()); +// if (ObjectUtil.isNotEmpty(boomDO)){ +// ProcedureDO procedure = procedureService.getProcedure(boomDO.getProcedureId()); +// if (ObjectUtil.isNotEmpty(procedure)){ +// if (ObjectUtil.isNotEmpty(procedure.getName())){ +// ProcedureName=procedure.getName(); +// } +// } +// } +// String code=bomCode+blueprintNo+ProcedureName; +// materialDO.setCode(code); +// materialDO.setCompositionId(bomDetailDO.getCompositionId()); +// materialDO.setMaterialType("1"); +// materialDO.setVirtualPart("Y"); +// MaterialDO material = materialMapper.selectMaterial(code); +// if (ObjectUtil.isEmpty(material)){ // materialDOList.add(materialDO); - materialMapper.insert(materialDO); +// materialMapper.insert(materialDO); // storageMatDO.setMatId(materialDO.getId()); // outMat.setMatId(materialDO.getId()); - logDO.setMatId(materialDO.getId()); - outLogDO.setMatId(materialDO.getId()); - }else { +// logDO.setMatId(materialDO.getId()); +// outLogDO.setMatId(materialDO.getId()); +// }else { // storageMatDO.setMatId(material.getId()); // outMat.setMatId(material.getId()); - logDO.setMatId(material.getId()); - outLogDO.setMatId(material.getId()); - } +// logDO.setMatId(material.getId()); +// outLogDO.setMatId(material.getId()); +// } } // storageMatDOS.add(storageMatDO); // outList.add(outMat); - + StorageLogDO logDO = new StorageLogDO(); + StorageLogDO outLogDO = new StorageLogDO(); StorageInDetailDO storageInDetailDO = new StorageInDetailDO(); storageInDetailDO.setStorageNoId(storageInDO.getId()); storageInDetailDO.setProjectSubCode(byId.getProjectSubCode()); @@ -410,7 +410,7 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe outLogDO.setGoodsType(2); outLogList.add(outLogDO); } - } +// } storageLogMapper.insertBatch(logList); // storageLogMapper.insertBatch(outLogList); // storageMatMapper.insertBatch(storageMatDOS); diff --git a/mes-module-infra/.flattened-pom.xml b/mes-module-infra/.flattened-pom.xml deleted file mode 100644 index 75c0f8a7..00000000 --- a/mes-module-infra/.flattened-pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-module-infra - 2.0.0-jdk8-snapshot - pom - ${project.artifactId} - infra 模块，主要提供两块能力： - 1. 我们放基础设施的运维与管理，支撑上层的通用与核心业务。 例如说：定时任务的管理、服务器的信息等等 - 2. 研发工具，提升研发效率与质量。 例如说：代码生成器、接口文档等等 - - mes-module-infra-api - mes-module-infra-biz - - diff --git a/mes-module-infra/mes-module-infra-api/.flattened-pom.xml b/mes-module-infra/mes-module-infra-api/.flattened-pom.xml deleted file mode 100644 index faf762c1..00000000 --- a/mes-module-infra/mes-module-infra-api/.flattened-pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-module-infra - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-module-infra-api - 2.0.0-jdk8-snapshot - ${project.artifactId} - infra 模块 API，暴露给其它模块调用 - - - com.chanko.yunxi - mes-common - - - org.springframework.boot - spring-boot-starter-validation - true - - - diff --git a/mes-module-infra/mes-module-infra-biz/.flattened-pom.xml b/mes-module-infra/mes-module-infra-biz/.flattened-pom.xml deleted file mode 100644 index d8a646a0..00000000 --- a/mes-module-infra/mes-module-infra-biz/.flattened-pom.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-module-infra - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-module-infra-biz - 2.0.0-jdk8-snapshot - ${project.artifactId} - infra 模块，主要提供两块能力： - 1. 我们放基础设施的运维与管理，支撑上层的通用与核心业务。 例如说：定时任务的管理、服务器的信息等等 - 2. 研发工具，提升研发效率与质量。 例如说：代码生成器、接口文档等等 - - - com.chanko.yunxi - mes-module-system-api - ${revision} - - - com.chanko.yunxi - mes-module-infra-api - ${revision} - - - com.chanko.yunxi - mes-spring-boot-starter-biz-operatelog - - - com.chanko.yunxi - mes-spring-boot-starter-biz-tenant - - - com.chanko.yunxi - mes-spring-boot-starter-security - - - com.chanko.yunxi - mes-spring-boot-starter-websocket - - - com.chanko.yunxi - mes-spring-boot-starter-mybatis - - - com.baomidou - mybatis-plus-generator - - - com.chanko.yunxi - mes-spring-boot-starter-redis - - - com.chanko.yunxi - mes-spring-boot-starter-job - - - com.chanko.yunxi - mes-spring-boot-starter-mq - - - com.chanko.yunxi - mes-spring-boot-starter-excel - - - org.apache.velocity - velocity-engine-core - - - cn.smallbun.screw - screw-core - - - com.chanko.yunxi - mes-spring-boot-starter-monitor - - - de.codecentric - spring-boot-admin-starter-server - - - com.chanko.yunxi - mes-spring-boot-starter-file - - - diff --git a/mes-module-system/.flattened-pom.xml b/mes-module-system/.flattened-pom.xml deleted file mode 100644 index efd81d5c..00000000 --- a/mes-module-system/.flattened-pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-module-system - 2.0.0-jdk8-snapshot - pom - ${project.artifactId} - system 模块下，我们放通用业务，支撑上层的核心业务。 - 例如说：用户、部门、权限、数据字典等等 - - mes-module-system-api - mes-module-system-biz - - diff --git a/mes-module-system/mes-module-system-biz/.flattened-pom.xml b/mes-module-system/mes-module-system-biz/.flattened-pom.xml deleted file mode 100644 index bf096b0b..00000000 --- a/mes-module-system/mes-module-system-biz/.flattened-pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-module-system - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-module-system-biz - 2.0.0-jdk8-snapshot - ${project.artifactId} - system 模块下，我们放通用业务，支撑上层的核心业务。 - 例如说：用户、部门、权限、数据字典等等 - - - com.chanko.yunxi - mes-module-system-api - ${revision} - - - com.chanko.yunxi - mes-module-infra-api - ${revision} - - - org.json - json - 20210307 - - - com.chanko.yunxi - mes-spring-boot-starter-biz-operatelog - - - com.chanko.yunxi - mes-spring-boot-starter-biz-sms - - - com.chanko.yunxi - mes-spring-boot-starter-biz-dict - - - com.chanko.yunxi - mes-spring-boot-starter-biz-data-permission - - - com.chanko.yunxi - mes-spring-boot-starter-biz-tenant - - - com.chanko.yunxi - mes-spring-boot-starter-biz-ip - - - com.chanko.yunxi - mes-spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-validation - - - com.chanko.yunxi - mes-spring-boot-starter-mybatis - - - com.chanko.yunxi - mes-spring-boot-starter-redis - - - com.chanko.yunxi - mes-spring-boot-starter-job - - - com.chanko.yunxi - mes-spring-boot-starter-mq - - - com.chanko.yunxi - mes-spring-boot-starter-excel - - - com.chanko.yunxi - mes-spring-boot-starter-captcha - - - org.springframework.boot - spring-boot-starter-mail - - - com.xingyuv - spring-boot-starter-justauth - - - com.github.binarywang - wx-java-mp-spring-boot-starter - - - com.github.binarywang - wx-java-miniapp-spring-boot-starter - - - diff --git a/mes-server/.flattened-pom.xml b/mes-server/.flattened-pom.xml deleted file mode 100644 index c5385815..00000000 --- a/mes-server/.flattened-pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-server - 2.0.0-jdk8-snapshot - ${project.artifactId} - 后端 Server 的主项目，通过引入需要 mes-module-xxx 的依赖， - 从而实现提供 RESTful API 给 mes-ui-admin、mes-ui-user 等前端项目。 - 本质上来说，它就是个空壳（容器）！ - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.jupiter - junit-jupiter - 5.4.0 - test - - - com.chanko.yunxi - mes-module-system-biz - ${revision} - - - com.chanko.yunxi - mes-module-infra-biz - ${revision} - - - com.chanko.yunxi - mes-spring-boot-starter-biz-error-code - - - com.chanko.yunxi - mes-module-heli-biz - ${revision} - - - org.springframework.boot - spring-boot-configuration-processor - true - - - com.chanko.yunxi - mes-spring-boot-starter-banner - - - com.chanko.yunxi - mes-spring-boot-starter-protection - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - - - repackage - - - - - - - diff --git a/mes-server/src/main/resources/application-dev.yaml b/mes-server/src/main/resources/application-dev.yaml index be93b37c..26fa3487 100644 --- a/mes-server/src/main/resources/application-dev.yaml +++ b/mes-server/src/main/resources/application-dev.yaml @@ -1,5 +1,5 @@ server: - port: 33002 + port: 8080 --- #################### 数据库相关配置 #################### @@ -44,10 +44,10 @@ spring: datasource: master: name: mes-heli - url: jdbc:mysql://120.48.141.82:3306/mes-heli?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&socketTimeout=30000&connectTimeout=30000 + url: jdbc:mysql://218.75.46.166:3306/mes-heli?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&socketTimeout=30000&connectTimeout=30000 driver-class-name: com.mysql.jdbc.Driver username: root - password: qweasd,.123 + password: 'heli,12#$' # slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 # name: ruoyi-vue-pro # url: jdbc:mysql://localhost:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true @@ -57,9 +57,9 @@ spring: # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: localhost # 地址 + host: 218.95.153.170 # 地址 port: 6379 # 端口 - database: 3 # 数据库索引 + database: 15 # 数据库索引 password: 'qweasd,.123' # 密码，建议生产环境开启 --- #################### 定时任务相关配置 #################### @@ -223,3 +223,6 @@ wx: host: 127.0.0.1 port: 6379 password: +logging: + level: + root: debug diff --git a/mes-server/src/main/resources/application-local.yaml b/mes-server/src/main/resources/application-local.yaml index e4c5958d..3872c23a 100644 --- a/mes-server/src/main/resources/application-local.yaml +++ b/mes-server/src/main/resources/application-local.yaml @@ -1,5 +1,6 @@ server: # port: 33859 +# port: 33860 port:8080 --- #################### 数据库相关配置 #################### @@ -63,7 +64,7 @@ spring: # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 218.95.153.170 # 地址 + host: 222.75.128.58 # 地址 port: 6379 # 端口 database: 15 # 数据库索引 password: 'qweasd,.123' # 密码，建议生产环境开启 @@ -197,6 +198,7 @@ mes: ignoreUrls: - #登录时租户验证 - /admin-api/system/tenant/get-id-by-name + #登出时租户验证 - /admin-api/system/tenant/get-by-website - /admin-api/biz/app/latest diff --git a/mes-server/src/main/resources/application.yaml b/mes-server/src/main/resources/application.yaml index 3013bd87..af46665f 100644 --- a/mes-server/src/main/resources/application.yaml +++ b/mes-server/src/main/resources/application.yaml @@ -7,7 +7,6 @@ spring: profiles: active: local - main: allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/saleordercost/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/saleordercost/index.vue index 668875ea..df1f5b15 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/saleordercost/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/saleordercost/index.vue @@ -66,7 +66,7 @@ - +