licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: licq:a47557adb5a23ad61527df8ddbbec6561e56da9b
Branches Tags
licq:main
...
compare: licq:0fe4f3aa7b706a8eaf3861a1d1c208667b9538b2
Branches Tags
licq:main

3 Commits
a47557adb5 ... 0fe4f3aa7b

Author SHA1 Message Date
z
0fe4f3aa7b 采购收货更改 2025-11-13 21:46:59 +08:00
z
8fda766aea 采购收货前端 2025-11-13 11:31:36 +08:00
z
6054051690 bom无审批人时直接审核 2025-11-13 10:17:59 +08:00
30 changed files with 663 additions and 1007 deletions
Show Stats Expand all files Collapse all files

120
.flattened-pom.xml
View File

@ -1,120 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<description>芋道项目基础脚手架</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<modules>
<module>mes-dependencies</module>
<module>mes-framework</module>
<module>mes-server</module>
<module>mes-module-system</module>
<module>mes-module-infra</module>
<module>mes-module-heli</module>
</modules>
<properties>
<lombok.version>1.18.30</lombok.version>
<java.version>1.8</java.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<maven.compiler.target>${java.version}</maven.compiler.target>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
<revision>2.0.0-jdk8-snapshot</revision>
<spring.boot.version>2.7.17</spring.boot.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-dependencies</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<repositories>
<repository>
<id>huaweicloud</id>
<name>huawei</name>
<url>https://mirrors.huaweicloud.com/repository/maven/</url>
</repository>
<repository>
<id>aliyunmaven</id>
<name>aliyun</name>
<url>https://maven.aliyun.com/repository/public</url>
</repository>
</repositories>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>${spring.boot.version}</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${flatten-maven-plugin.version}</version>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
<configuration>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
<updatePomFile>true</updatePomFile>
</configuration>
</plugin>
</plugins>
</build>
</project>

590
mes-dependencies/.flattened-pom.xml
View File

@ -1,590 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-dependencies</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<description>基础 bom 文件，管理整个项目的依赖版本</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<properties>
<mybatis-plus-join.version>1.4.7</mybatis-plus-join.version>
<podam.version>7.2.11.RELEASE</podam.version>
<velocity.version>2.3</velocity.version>
<spring.boot.version>2.7.18</spring.boot.version>
<tika-core.version>2.7.0</tika-core.version>
<lock4j.version>2.2.5</lock4j.version>
<okio.version>3.5.0</okio.version>
<guice.version>5.1.0</guice.version>
<lombok.version>1.18.30</lombok.version>
<xercesImpl.version>2.12.2</xercesImpl.version>
<jsoup.version>1.16.2</jsoup.version>
<fastjson.version>1.2.83</fastjson.version>
<commons-net.version>3.10.0</commons-net.version>
<hutool.version>5.8.22</hutool.version>
<resilience4j.version>1.7.1</resilience4j.version>
<transmittable-thread-local.version>2.14.2</transmittable-thread-local.version>
<flowable.version>6.8.0</flowable.version>
<redisson.version>3.18.0</redisson.version>
<okhttp3.version>4.11.0</okhttp3.version>
<mybatis-plus.version>3.5.4</mybatis-plus.version>
<druid.version>1.2.20</druid.version>
<commons-io.version>2.11.0</commons-io.version>
<easyexcel.verion>3.3.2</easyexcel.verion>
<springdoc.version>1.6.15</springdoc.version>
<minio.version>8.5.6</minio.version>
<mockito-inline.version>4.11.0</mockito-inline.version>
<jedis-mock.version>1.0.7</jedis-mock.version>
<tencentcloud-sdk-java.version>3.1.880</tencentcloud-sdk-java.version>
<dm8.jdbc.version>8.1.3.62</dm8.jdbc.version>
<rocketmq-spring.version>2.2.3</rocketmq-spring.version>
<ip2region.version>2.7.0</ip2region.version>
<jsch.version>0.1.55</jsch.version>
<weixin-java.version>4.5.7.B</weixin-java.version>
<aliyun-java-sdk-core.version>4.6.4</aliyun-java-sdk-core.version>
<captcha-plus.version>1.0.10</captcha-plus.version>
<dynamic-datasource.version>3.6.1</dynamic-datasource.version>
<servlet.versoin>2.5</servlet.versoin>
<ureport2.version>2.2.9</ureport2.version>
<knife4j.version>4.3.0</knife4j.version>
<spring-boot-admin.version>2.7.11</spring-boot-admin.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<jimureport.version>1.6.6</jimureport.version>
<aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
<justauth.version>1.0.8</justauth.version>
<screw.version>1.0.5</screw.version>
<guava.version>32.1.3-jre</guava.version>
<skywalking.version>8.12.0</skywalking.version>
<opentracing.version>0.33.0</opentracing.version>
<mybatis-plus-generator.version>3.5.4</mybatis-plus-generator.version>
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
<revision>2.0.0-jdk8-snapshot</revision>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-banner</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-operatelog</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-dict</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-sms</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-pay</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-tenant</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-data-permission</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-social</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-error-code</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-ip</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-captcha</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-desensitize</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-web</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-security</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-websocket</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
<version>${knife4j.version}</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<version>${springdoc.version}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-mybatis</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
<version>${mybatis-plus-generator.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>${dynamic-datasource.version}</version>
</dependency>
<dependency>
<groupId>com.github.yulichang</groupId>
<artifactId>mybatis-plus-join-boot-starter</artifactId>
<version>${mybatis-plus-join.version}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-redis</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>${redisson.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>${dm8.jdbc.version}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-job</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-mq</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-boot-starter</artifactId>
<version>${rocketmq-spring.version}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-protection</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>lock4j-redisson-spring-boot-starter</artifactId>
<version>${lock4j.version}</version>
<exclusions>
<exclusion>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-ratelimiter</artifactId>
<version>${resilience4j.version}</version>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-spring-boot2</artifactId>
<version>${resilience4j.version}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-monitor</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-trace</artifactId>
<version>${skywalking.version}</version>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-logback-1.x</artifactId>
<version>${skywalking.version}</version>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-opentracing</artifactId>
<version>${skywalking.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
<version>${opentracing.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
<version>${opentracing.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-noop</artifactId>
<version>${opentracing.version}</version>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-server</artifactId>
<version>${spring-boot-admin.version}</version>
<exclusions>
<exclusion>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server-cloud</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
<version>${spring-boot-admin.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito-inline.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
<exclusion>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.fppt</groupId>
<artifactId>jedis-mock</artifactId>
<version>${jedis-mock.version}</version>
</dependency>
<dependency>
<groupId>uk.co.jemos.podam</groupId>
<artifactId>podam</artifactId>
<version>${podam.version}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-flowable</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>org.flowable</groupId>
<artifactId>flowable-spring-boot-starter-process</artifactId>
<version>${flowable.version}</version>
</dependency>
<dependency>
<groupId>org.flowable</groupId>
<artifactId>flowable-spring-boot-starter-actuator</artifactId>
<version>${flowable.version}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-excel</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>${mapstruct.version}</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-jdk8</artifactId>
<version>${mapstruct.version}</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${mapstruct.version}</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>${easyexcel.verion}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>${tika-core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<dependency>
<groupId>cn.smallbun.screw</groupId>
<artifactId>screw-core</artifactId>
<version>${screw.version}</version>
<exclusions>
<exclusion>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
</exclusion>
<exclusion>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guice.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>transmittable-thread-local</artifactId>
<version>${transmittable-thread-local.version}</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>${commons-net.version}</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>${jsch.version}</version>
</dependency>
<dependency>
<groupId>com.xingyuv</groupId>
<artifactId>spring-boot-starter-captcha-plus</artifactId>
<version>${captcha-plus.version}</version>
</dependency>
<dependency>
<groupId>org.lionsoul</groupId>
<artifactId>ip2region</artifactId>
<version>${ip2region.version}</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>${jsoup.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>${okio.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp3.version}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-file</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</dependency>
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
<version>${minio.version}</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
<version>${aliyun-java-sdk-core.version}</version>
<exclusions>
<exclusion>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
</exclusion>
<exclusion>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
<version>${aliyun-java-sdk-dysmsapi.version}</version>
</dependency>
<dependency>
<groupId>com.tencentcloudapi</groupId>
<artifactId>tencentcloud-sdk-java-sms</artifactId>
<version>${tencentcloud-sdk-java.version}</version>
</dependency>
<dependency>
<groupId>com.xingyuv</groupId>
<artifactId>spring-boot-starter-justauth</artifactId>
<version>${justauth.version}</version>
<exclusions>
<exclusion>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-pay</artifactId>
<version>${weixin-java.version}</version>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>wx-java-mp-spring-boot-starter</artifactId>
<version>${weixin-java.version}</version>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
<version>${weixin-java.version}</version>
</dependency>
<dependency>
<groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-spring-boot-starter</artifactId>
<version>${jimureport.version}</version>
<exclusions>
<exclusion>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xercesImpl.version}</version>
</dependency>
<dependency>
<groupId>com.bstek.ureport</groupId>
<artifactId>ureport2-console</artifactId>
<version>${ureport2.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${flatten-maven-plugin.version}</version>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
<configuration>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
<updatePomFile>true</updatePomFile>
</configuration>
</plugin>
</plugins>
</build>
</project>

47
mes-framework/.flattened-pom.xml
View File

@ -1,47 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<packaging>pom</packaging>
<description>该包是技术组件，每个子包，代表一个组件。每个组件包括两部分：
1. core 包：是该组件的核心封装
2. config 包：是该组件基于 Spring 的配置
技术组件，也分成两类：
1. 框架组件：和我们熟悉的 MyBatis、Redis 等等的拓展
2. 业务组件：和业务相关的组件的封装，例如说数据字典、操作日志等等。
如果是业务组件，Maven 名字会包含 biz</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<modules>
<module>mes-common</module>
<module>mes-spring-boot-starter-banner</module>
<module>mes-spring-boot-starter-mybatis</module>
<module>mes-spring-boot-starter-redis</module>
<module>mes-spring-boot-starter-web</module>
<module>mes-spring-boot-starter-security</module>
<module>mes-spring-boot-starter-file</module>
<module>mes-spring-boot-starter-monitor</module>
<module>mes-spring-boot-starter-protection</module>
<module>mes-spring-boot-starter-job</module>
<module>mes-spring-boot-starter-mq</module>
<module>mes-spring-boot-starter-excel</module>
<module>mes-spring-boot-starter-biz-operatelog</module>
<module>mes-spring-boot-starter-biz-dict</module>
<module>mes-spring-boot-starter-biz-sms</module>
<module>mes-spring-boot-starter-biz-tenant</module>
<module>mes-spring-boot-starter-biz-data-permission</module>
<module>mes-spring-boot-starter-biz-error-code</module>
<module>mes-spring-boot-starter-biz-ip</module>
<module>mes-spring-boot-starter-captcha</module>
<module>mes-spring-boot-starter-websocket</module>
<module>mes-spring-boot-starter-desensitize</module>
</modules>
</project>

121
mes-framework/mes-common/.flattened-pom.xml
View File

@ -1,121 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>定义基础 pojo 类、枚举、工具类等等</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-trace</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-jdk8</artifactId>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>transmittable-thread-local</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

20
mes-module-heli/.flattened-pom.xml
View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-heli</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<description>合立业务模块</description>
<modules>
<module>mes-module-heli-api</module>
<module>mes-module-heli-biz</module>
</modules>
</project>

31
mes-module-heli/mes-module-heli-api/.flattened-pom.xml
View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-heli</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-heli-api</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>合立业务模块 API，暴露给其它模块调用</description>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

7
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/PurchaseOrderNoController.java
View File

@ -6,6 +6,7 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorder.vo.Purcha
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorder.vo.PurchaseOrderRespVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorder.vo.PurchaseOrderRespVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorder.vo.PurchaseOrderSaveReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorder.vo.PurchaseOrderSaveReqVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PartPurchaseOrderPageRespVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PartPurchaseOrderPageRespVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PurchaseOrderMakeSaveReqVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.PurchaseOrderNoPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.PurchaseOrderNoPageReqVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.PurchaseOrderNoRespVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.PurchaseOrderNoRespVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.PurchaseOrderNoSaveReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.PurchaseOrderNoSaveReqVO;
@ -178,5 +179,9 @@ public class PurchaseOrderNoController {
public CommonResult<Boolean> updateIsPrint(@RequestParam("id") Long id) { public CommonResult<Boolean> updateIsPrint(@RequestParam("id") Long id) {
return purchaseOrderNoService.updateIsPrint(id); return purchaseOrderNoService.updateIsPrint(id);
} }
@PutMapping("/updatePurchaseOrderSupplier")
@Operation(summary ="更新采购单供应商" )
public CommonResult<Boolean> updatePurchaseOrderSupplier( PurchaseOrderNoSaveReqVO updateReqVO) {
return success(purchaseOrderNoService.updatePurchaseOrderSupplier(updateReqVO));
}
} }

5
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoRespVO.java
View File

@ -114,4 +114,9 @@ public class PurchaseOrderNoRespVO {
private String submitUserName; private String submitUserName;
@Schema(description = "工序名称") @Schema(description = "工序名称")
private String procedureName; private String procedureName;
private Long modUserId;
private LocalDateTime modTime;
private String modRemark;
} }

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoSaveReqVO.java
View File

@ -77,4 +77,8 @@ public class PurchaseOrderNoSaveReqVO {
@Schema(description = "税率") @Schema(description = "税率")
private Integer taxRatio; private Integer taxRatio;
private Long modUserId;
private LocalDateTime modTime;
private String modRemark;
} }

16
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/PurchaseOrderNoDetailController.java
View File

@ -1,5 +1,6 @@
package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordernodetail; package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordernodetail;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PurchaseOrderMakeRespVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.PurchaseOrderNoPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.PurchaseOrderNoPageReqVO;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -192,4 +193,19 @@ public class PurchaseOrderNoDetailController {
public CommonResult<Boolean> updateFrom(@Valid @RequestBody PurchaseOrderNoDetailDO detailDO) { public CommonResult<Boolean> updateFrom(@Valid @RequestBody PurchaseOrderNoDetailDO detailDO) {
return purchaseOrderNoDetailService.updateFrom(detailDO); return purchaseOrderNoDetailService.updateFrom(detailDO);
} }
@GetMapping("/exportExcel")
@Operation(summary = "导出采购收货")
@OperateLog(type = EXPORT)
public void exportExcel(@Valid PurchaseOrderNoDetailPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
String[] split = pageReqVO.getIds().split(",");
List<Long> ids = new ArrayList<>();
for (String s : split) {
ids.add(Long.valueOf(s));
}
List<PurchaseOrderNoDetailDO> list = purchaseOrderNoDetailService.exportExcel(ids);
// 导出 Excel
ExcelUtils.write(response, "零件采购收货.xlsx", "数据", PurchaseOrderMakeRespVO.class,
BeanUtils.toBean(list, PurchaseOrderMakeRespVO.class));
}
} }

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/OutsourcingExcelVo.java
View File

@ -28,7 +28,7 @@ public class OutsourcingExcelVo {
@ExcelProperty("BOM编号") @ExcelProperty("BOM编号")
private String boomCode; private String boomCode;
@ExcelProperty("件号") @ExcelProperty("图号")
private String blueprintNo; private String blueprintNo;
@ExcelProperty("零件名称") @ExcelProperty("零件名称")
private String boomName; private String boomName;

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailPageReqVO.java
View File

@ -132,4 +132,6 @@ public class PurchaseOrderNoDetailPageReqVO extends PageParam {
private String procedureName; private String procedureName;
@Schema(description = "工序") @Schema(description = "工序")
private String subOrDetailName; private String subOrDetailName;
@Schema(description = "id集合")
private String ids;
} }

13
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseorderno/PurchaseOrderNoDO.java
View File

@ -92,10 +92,23 @@ public class PurchaseOrderNoDO extends BaseDO {
* 送审人 * 送审人
*/ */
private Long submitUserId; private Long submitUserId;
/**
* 供应商修改人
*/
private Long modUserId;
/**
* 供应商修改时间
*/
private LocalDateTime modTime;
/**
* 修改供应商原因
*/
private String modRemark;
/** /**
* 送审时间 * 送审时间
*/ */
private LocalDateTime submitTime; private LocalDateTime submitTime;
/** /**
* 审核人 * 审核人
*/ */

8
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordernodetail/PurchaseOrderNoDetailDO.java
View File

@ -229,4 +229,12 @@ public class PurchaseOrderNoDetailDO extends BaseDO {
private String acarrDates; private String acarrDates;
@TableField(exist = false) @TableField(exist = false)
private Integer goodsType; private Integer goodsType;
@TableField(exist = false)
private String duEmpName;
@TableField(exist = false)
private String effectiveReceivingStatus;
@TableField(exist = false)
private String time;
@TableField(exist = false)
private String requir;
} }

30
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java
View File

@ -24,6 +24,8 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrder
import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorder.PurchaseOrderDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorder.PurchaseOrderDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderboom.PurchaseOrderBoomDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderboom.PurchaseOrderBoomDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermake.PurchaseOrderMakeDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermakedetail.PurchaseOrderMakeDetailDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermaterial.PurchaseOrderMaterialDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermaterial.PurchaseOrderMaterialDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderno.PurchaseOrderNoDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderno.PurchaseOrderNoDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO;
@ -257,7 +259,7 @@ public interface PurchaseOrderNoDetailMapper extends BaseMapperX<PurchaseOrderNo
MPJLambdaWrapper<PurchaseOrderNoDetailDO> query = new MPJLambdaWrapper<>(); MPJLambdaWrapper<PurchaseOrderNoDetailDO> query = new MPJLambdaWrapper<>();
query.selectAll(PurchaseOrderNoDetailDO.class) query.selectAll(PurchaseOrderNoDetailDO.class)
.select("t.composition as compositionName","t.purchase_rem_amount as purchaseRemAmounts","mat.code as matCode","pro.name as procedureName","bom.blueprint_no as blueprintNo","psub.id as projectSubId") .select("t.composition as compositionName","t.purchase_rem_amount as purchaseRemAmounts","mat.code as matCode","pro.name as procedureName","bom.blueprint_no as blueprintNo","psub.id as projectSubId")
.select("ROUND(t.estimated_price / t.purchase_amount, 1) as unitPrice","bom.spec as matSpec") .select("ROUND(t.estimated_price / t.purchase_amount, 2) as unitPrice","bom.spec as matSpec")
.select("s.brief as supplierName") .select("s.brief as supplierName")
.leftJoin(PurchaseOrderNoDO.class, "pb", PurchaseOrderNoDO::getId, PurchaseOrderBoomDO::getPurchaseOrderId) .leftJoin(PurchaseOrderNoDO.class, "pb", PurchaseOrderNoDO::getId, PurchaseOrderBoomDO::getPurchaseOrderId)
.leftJoin(SupplierDO.class, "s", SupplierDO::getId, PurchaseOrderNoDO::getSupplierId) .leftJoin(SupplierDO.class, "s", SupplierDO::getId, PurchaseOrderNoDO::getSupplierId)
@ -295,4 +297,30 @@ public interface PurchaseOrderNoDetailMapper extends BaseMapperX<PurchaseOrderNo
.orderByDesc(PurchaseOrderNoDetailDO::getCreateTime); .orderByDesc(PurchaseOrderNoDetailDO::getCreateTime);
return selectPage(pageReqVO, query); return selectPage(pageReqVO, query);
} }
default List<PurchaseOrderNoDetailDO> exportExcel(List<Long> ids){
MPJLambdaWrapper<PurchaseOrderNoDetailDO> query = new MPJLambdaWrapper<>();
query.selectAll(PurchaseOrderNoDetailDO.class)
.select("c.nickname as duEmpName")
.select("t.brief as briefs")
.select("d.brief as supplierName")
.select("bom.blueprint_no as blueprintNo")
.select("CASE \n" +
" WHEN t.purchase_amount = 0 THEN 0 \n" +
" ELSE ROUND(t.estimated_price / t.purchase_amount, 2)\n" +
"END AS unitPrice")
.select("e.name as procedureName")
.select("COALESCE(t.receiving_status, 1) AS effectiveReceivingStatus")
.select("DATE_FORMAT(t.create_time, '%Y-%m-%d') AS time")
.select("DATE_FORMAT(t.require_time, '%Y-%m-%d') AS requir")
.leftJoin(PurchaseOrderNoDO.class,"a",PurchaseOrderNoDO::getId,PurchaseOrderNoDetailDO::getPurchaseOrderId)
.leftJoin(AdminUserDO.class,"c", AdminUserDO::getId,PurchaseOrderNoDetailDO::getDuEmpId)
.leftJoin(SupplierDO.class, "d", SupplierDO::getId,PurchaseOrderNoDO::getSupplierId)
.leftJoin(ProcedureDO.class, "e", ProcedureDO::getId, PurchaseOrderNoDetailDO::getProcedureId)
.leftJoin(ProcessBomDetailDO.class, "bom", ProcessBomDetailDO::getId, PurchaseOrderNoDetailDO::getBoomDetailId)
.leftJoin(ProjectOrderSubDO.class,"sub", ProjectOrderSubDO::getId, PurchaseOrderNoDetailDO::getProjectPlanSubId)
.disableSubLogicDel();
query.in(ids != null && ids.size() > 0, PurchaseOrderNoDetailDO::getId, ids);
return selectList(query);
}
} }

7
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
View File

@ -20,6 +20,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.equipmanufacture.EquipMan
import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplan.MaterialPlanDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplan.MaterialPlanDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.plansub.PlanSubDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO;
@ -32,6 +33,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatch
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatchdetailowner.TaskDispatchDetailOwnerDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatchdetailowner.TaskDispatchDetailOwnerDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO;
import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplanboom.MaterialPlanBoomMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplanboom.MaterialPlanBoomMapper;
import com.chanko.yunxi.mes.module.heli.dal.mysql.plansub.PlanSubMapper;
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Delete;
@ -322,6 +324,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
.leftJoin(ProcessBomDetailDO.class, "d", ProcessBomDetailDO::getId, TaskDispatchDO::getBomDetailId) .leftJoin(ProcessBomDetailDO.class, "d", ProcessBomDetailDO::getId, TaskDispatchDO::getBomDetailId)
.leftJoin(ProcedureDO.class, "e", ProcedureDO::getId, TaskDispatchDetailDO::getProcedureId) .leftJoin(ProcedureDO.class, "e", ProcedureDO::getId, TaskDispatchDetailDO::getProcedureId)
.leftJoin(TaskReportDO.class, "f", TaskReportDO::getDispatchDetailId, TaskDispatchDetailDO::getId) .leftJoin(TaskReportDO.class, "f", TaskReportDO::getDispatchDetailId, TaskDispatchDetailDO::getId)
.leftJoin(PlanSubDO.class,"plan", PlanSubDO::getProjectSubId, TaskDispatchDO::getProjectSubId)
.groupBy(TaskDispatchDetailDO::getId) .groupBy(TaskDispatchDetailDO::getId)
.disableSubLogicDel();; .disableSubLogicDel();;
if (reqVO.getProcedureStatusList().size() == 1 && reqVO.getProcedureStatusList().get(0) == 2) { if (reqVO.getProcedureStatusList().size() == 1 && reqVO.getProcedureStatusList().get(0) == 2) {
@ -336,7 +339,9 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
if (reqVO.getSubOrDetailName() != null && !reqVO.getSubOrDetailName().trim().equals("")){ if (reqVO.getSubOrDetailName() != null && !reqVO.getSubOrDetailName().trim().equals("")){
query.and( e ->e.eq(ProjectOrderDO::getProjectName, reqVO.getSubOrDetailName()).or().eq( query.and( e ->e.eq(ProjectOrderDO::getProjectName, reqVO.getSubOrDetailName()).or().eq(
ProjectOrderSubDO::getName, reqVO.getSubOrDetailName() ProjectOrderSubDO::getName, reqVO.getSubOrDetailName()
).or().eq(ProcessBomDetailDO::getMaterialName, reqVO.getSubOrDetailName()).or().eq(ProcessBomDetailDO::getBomBlueprintNo, reqVO.getSubOrDetailName())); ).or().eq(ProcessBomDetailDO::getMaterialName, reqVO.getSubOrDetailName()).or().eq(ProcessBomDetailDO::getBomBlueprintNo, reqVO.getSubOrDetailName())
.or().eq(PlanSubDO::getProjectSubCode, reqVO.getSubOrDetailName()));
// query.eq(" (b.project_name like '%" + reqVO.getSubOrDetailName() + "%' or c.name like '%" + reqVO.getSubOrDetailName() + "%')"); // query.eq(" (b.project_name like '%" + reqVO.getSubOrDetailName() + "%' or c.name like '%" + reqVO.getSubOrDetailName() + "%')");
} }
query.and(wrapper -> { query.and(wrapper -> {

148
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java
View File

@ -765,24 +765,156 @@ public class ProcessBomServiceImpl implements ProcessBomService {
} }
} }
// 如提交版本+1 // 如提交版本+1
if(operateTypeEnum == OperateTypeEnum.SUBMIT){ if(operateTypeEnum == OperateTypeEnum.SUBMIT) {
updateObj.setVersion(updateObj.getVersion()+1); updateObj.setVersion(updateObj.getVersion() + 1);
// bomEditStatus = BomEditStatusEnum.HAS_EDIT.getStatus(); // bomEditStatus = BomEditStatusEnum.HAS_EDIT.getStatus();
updateObj.setBomEditStatus(bomEditStatus); updateObj.setBomEditStatus(bomEditStatus);
//确定为提交时查出审批人并插入到表中 //确定为提交时查出审批人并插入到表中
SerarchUser serarchUser = new SerarchUser(); SerarchUser serarchUser = new SerarchUser();
if(updateObj.getShenheUser() ==null){ if (updateObj.getShenheUser() == null) {
updateObj.setShenheUser(0L); updateObj.setShenheUser(0L);
} }
//第一次提交时获取审核人， //第一次提交时获取审核人，
List<ShenheDO> shenheDOS = shenheMapper.serchShenHeRuser("2",updateObj.getShenheUser(),0); List<ShenheDO> shenheDOS = shenheMapper.serchShenHeRuser("2", updateObj.getShenheUser(), 0);
if(shenheDOS.size()>0){ if (shenheDOS.size() > 0) {
updateObj.setBomStatus(6); updateObj.setBomStatus(6);
//审核后设置状态为默认 //审核后设置状态为默认
ShenheDO shenheDO = shenheDOS.get(0); ShenheDO shenheDO = shenheDOS.get(0);
updateObj.setShenheUser(shenheDO.getShenheUser()); if (ObjectUtil.isNotEmpty(shenheDO.getShenheUser())) {
}else{ updateObj.setShenheUser(shenheDO.getShenheUser());
} else {
updateObj.setBomStatus(7);
updateObj.setShenheTime(LocalDateTime.now());
updateObj.setShenheUser(null);
//bom审核通过,推送任务通知单
List<ProcessBomDetailDO> processBomDetailDOS = getProcessBomDetailListByBomId(updateObj.getId());
boolean hasBomType4 = processBomDetailDOS.stream()
.anyMatch(bomDetail -> bomDetail.getBomType() == 4);
if (hasBomType4) {
PlanDO getplanid = processBomMapper.getplanid(updateObj.getPlanId());
List<AttentiontodoDO> attentiontodook = attentiontodoMapper.selectByIdlist(13);// 改
String nickname = userApi.getUser(SecurityFrameworkUtils.getLoginUser().getId()).getNickname();
List<AttentiontodoDO> attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(13);
if (attentiontodook1.size() < 1) {
{
AttentiontodoDO attentiontodoDO = new AttentiontodoDO();
attentiontodoDO.setEvent("BOM变更审核通过后");
attentiontodoDO.setAttr5("1");
attentiontodoDO.setAttr4(nickname);
attentiontodoDO.setLevel("1");
attentiontodook.add(attentiontodoDO);
}
}
for (AttentiontodoDO attentiontodoRespVO : attentiontodook) {
{
bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO();
BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称
BdgzsomthingDO.setThings(updateObj.getProjectSubCode() + "审核已通过,请推送任务通知单");//事件名称
BdgzsomthingDO.setAttr2(getplanid.getPlanNo());//跳转携带参数
BdgzsomthingDO.setAttr3(getplanid.getPlanNo());//独特标识
if (attentiontodoRespVO.getAttr5().equals("1")) {//提醒状态
BdgzsomthingDO.setDborgz("待办");
} else if (attentiontodoRespVO.getAttr5().equals("2")) {
BdgzsomthingDO.setDborgz("关注");
}
if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())) {
PlanDO planDO = planMapper.selectOne(new LambdaQueryWrapper<PlanDO>().eq(PlanDO::getPlanNo, getplanid.getPlanNo()));
if (ObjectUtil.isNotEmpty(planDO)) {
AdminUserDO user = adminUserService.getUser(Long.valueOf(planDO.getCreator()));
if (ObjectUtil.isNotEmpty(user)) {
BdgzsomthingDO.setClick(user.getNickname());
}
}
} else {
BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());
}
if (attentiontodoRespVO.getLevel().equals("1")) {
BdgzsomthingDO.setLevel("紧急");
} else if (attentiontodoRespVO.getLevel().equals("2")) {
BdgzsomthingDO.setLevel("一般");
} else if (attentiontodoRespVO.getLevel().equals("3")) {
BdgzsomthingDO.setLevel("非紧急");
}
BdgzsomthingDO.setYesorno("0");//是否点击
BdgzsomthingDO.setAttr4("0");//是否已处理
bdgzsomthingMapper.insert(BdgzsomthingDO);
}
}
}
}
} else {
updateObj.setBomStatus(7);
updateObj.setShenheTime(LocalDateTime.now());
updateObj.setShenheUser(null);
//bom审核通过,推送任务通知单
List<ProcessBomDetailDO> processBomDetailDOS = getProcessBomDetailListByBomId(updateObj.getId());
boolean hasBomType4 = processBomDetailDOS.stream()
.anyMatch(bomDetail -> bomDetail.getBomType() == 4);
if (hasBomType4) {
PlanDO getplanid = processBomMapper.getplanid(updateObj.getPlanId());
List<AttentiontodoDO> attentiontodook = attentiontodoMapper.selectByIdlist(13);// 改
String nickname = userApi.getUser(SecurityFrameworkUtils.getLoginUser().getId()).getNickname();
List<AttentiontodoDO> attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(13);
if (attentiontodook1.size() < 1) {
{
AttentiontodoDO attentiontodoDO = new AttentiontodoDO();
attentiontodoDO.setEvent("BOM变更审核通过后");
attentiontodoDO.setAttr5("1");
attentiontodoDO.setAttr4(nickname);
attentiontodoDO.setLevel("1");
attentiontodook.add(attentiontodoDO);
}
}
for (AttentiontodoDO attentiontodoRespVO : attentiontodook) {
{
bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO();
BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称
BdgzsomthingDO.setThings(updateObj.getProjectSubCode() + "审核已通过,请推送任务通知单");//事件名称
BdgzsomthingDO.setAttr2(getplanid.getPlanNo());//跳转携带参数
BdgzsomthingDO.setAttr3(getplanid.getPlanNo());//独特标识
if (attentiontodoRespVO.getAttr5().equals("1")) {//提醒状态
BdgzsomthingDO.setDborgz("待办");
} else if (attentiontodoRespVO.getAttr5().equals("2")) {
BdgzsomthingDO.setDborgz("关注");
}
if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())) {
PlanDO planDO = planMapper.selectOne(new LambdaQueryWrapper<PlanDO>().eq(PlanDO::getPlanNo, getplanid.getPlanNo()));
if (ObjectUtil.isNotEmpty(planDO)) {
AdminUserDO user = adminUserService.getUser(Long.valueOf(planDO.getCreator()));
if (ObjectUtil.isNotEmpty(user)) {
BdgzsomthingDO.setClick(user.getNickname());
}
}
} else {
BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());
}
if (attentiontodoRespVO.getLevel().equals("1")) {
BdgzsomthingDO.setLevel("紧急");
} else if (attentiontodoRespVO.getLevel().equals("2")) {
BdgzsomthingDO.setLevel("一般");
} else if (attentiontodoRespVO.getLevel().equals("3")) {
BdgzsomthingDO.setLevel("非紧急");
}
BdgzsomthingDO.setYesorno("0");//是否点击
BdgzsomthingDO.setAttr4("0");//是否已处理
bdgzsomthingMapper.insert(BdgzsomthingDO);
}
}
}
} }
} }
if(operateTypeEnum == OperateTypeEnum.AUDIT){ if(operateTypeEnum == OperateTypeEnum.AUDIT){
@ -878,7 +1010,7 @@ public class ProcessBomServiceImpl implements ProcessBomService {
} }
}else{ }else if (!(operateTypeEnum == OperateTypeEnum.SUBMIT)){
updateObj.setBomStatus(ProcessBomStatusEnum.valueOf(updateReqVO.getActive()).getCode()); updateObj.setBomStatus(ProcessBomStatusEnum.valueOf(updateReqVO.getActive()).getCode());
} }
if (updateReqVO.getProjectSubCode() != null){ if (updateReqVO.getProjectSubCode() != null){

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoService.java
View File

@ -65,4 +65,6 @@ public interface PurchaseOrderNoService {
void updatePORSById(Long id); void updatePORSById(Long id);
CommonResult<Boolean> updateIsPrint(Long id); CommonResult<Boolean> updateIsPrint(Long id);
Boolean updatePurchaseOrderSupplier(PurchaseOrderNoSaveReqVO updateReqVO);
} }

18
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoServiceImpl.java
View File

@ -13,6 +13,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthing
import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplan.MaterialPlanDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplan.MaterialPlanDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorder.PurchaseOrderDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorder.PurchaseOrderDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermake.PurchaseOrderMakeDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermakedetail.PurchaseOrderMakeDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermakedetail.PurchaseOrderMakeDetailDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO;
@ -413,4 +414,21 @@ public class PurchaseOrderNoServiceImpl implements PurchaseOrderNoService {
return CommonResult.success(true); return CommonResult.success(true);
} }
@Override
public Boolean updatePurchaseOrderSupplier(PurchaseOrderNoSaveReqVO updateReqVO) {
PurchaseOrderNoDO purchaseOrderNoDO = purchaseOrderNoMapper.selectById(updateReqVO.getId());
if (ObjectUtil.isNotEmpty(purchaseOrderNoDO)){
purchaseOrderNoDO.setSupplierId(updateReqVO.getSupplierId());
purchaseOrderNoDO.setModTime(LocalDateTime.now());
purchaseOrderNoDO.setModUserId(getLoginUser().getId());
purchaseOrderNoDO.setModRemark(updateReqVO.getModRemark());
purchaseOrderNoMapper.updateById(purchaseOrderNoDO);
LambdaUpdateWrapper<PurchaseOrderMakeDetailDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.eq(PurchaseOrderMakeDetailDO::getPurchaseOrderNoId,purchaseOrderNoDO.getId());
lambdaUpdateWrapper.set(PurchaseOrderMakeDetailDO::getSupplierId,updateReqVO.getSupplierId());
purchaseOrderMakeDetailMapper.update(lambdaUpdateWrapper);
}
return true;
}
} }

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailService.java
View File

@ -75,4 +75,6 @@ public interface PurchaseOrderNoDetailService {
CommonResult<Boolean> updateFrom(PurchaseOrderNoDetailDO detailDO); CommonResult<Boolean> updateFrom(PurchaseOrderNoDetailDO detailDO);
PageResult<PurchaseOrderNoDetailDO> getReceiveGoodDetail(PurchaseOrderNoPageReqVO pageReqVO); PageResult<PurchaseOrderNoDetailDO> getReceiveGoodDetail(PurchaseOrderNoPageReqVO pageReqVO);
List<PurchaseOrderNoDetailDO> exportExcel(List<Long> ids);
} }

6
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java
View File

@ -279,6 +279,7 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe
byId.setReceivingStatus(2); byId.setReceivingStatus(2);
} }
byId.setPurchaseRemAmount(byId.getPurchaseRemAmount().subtract(detailDO.getPurchaseRemAmounts())); byId.setPurchaseRemAmount(byId.getPurchaseRemAmount().subtract(detailDO.getPurchaseRemAmounts()));
byId.setArriveTime(LocalDateTime.now());
purchaseOrderNoDetailMapper.updateById(byId); purchaseOrderNoDetailMapper.updateById(byId);
// StorageMatDO storageMatDO = new StorageMatDO(); // StorageMatDO storageMatDO = new StorageMatDO();
// StorageMatDO outMat = new StorageMatDO(); // StorageMatDO outMat = new StorageMatDO();
@ -594,4 +595,9 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe
return purchaseOrderNoDetailMapper.getReceiveGoodDetail(pageReqVO); return purchaseOrderNoDetailMapper.getReceiveGoodDetail(pageReqVO);
} }
@Override
public List<PurchaseOrderNoDetailDO> exportExcel(List<Long> ids) {
return purchaseOrderNoDetailMapper.exportExcel(ids);
}
} }

4
mes-ui/mes-ui-admin-vue3/src/api/heli/partpurchaseorder/index.ts
View File

@ -82,3 +82,7 @@ export const exportOut = async (params) => {
export const updateDuEmp = async (data) => { export const updateDuEmp = async (data) => {
return await request.post({ url: `/heli/purchase-order-make/updateDuEmp`, data }) return await request.post({ url: `/heli/purchase-order-make/updateDuEmp`, data })
} }
// 更新采购单主驳回
export const updatePurchaseOrderSupplier = async (params) => {
return await request.put({ url: `/heli/purchase-order-no/updatePurchaseOrderSupplier`, params })
}

4
mes-ui/mes-ui-admin-vue3/src/api/heli/purchaseordernodetail/index.ts
View File

@ -94,3 +94,7 @@ export const updateFrom= async (data) => {
export const getReceiveGoodDetail = async (params) => { export const getReceiveGoodDetail = async (params) => {
return await request.get({ url: `/heli/purchase-order-no-detail/getReceiveGoodDetail`, params }) return await request.get({ url: `/heli/purchase-order-no-detail/getReceiveGoodDetail`, params })
} }
// 导出外协费用 Excel
export const exportExcel = async (params) => {
return await request.download({ url: `/heli/purchase-order-no-detail/exportExcel`, params })
}

130
mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcingexpenses/index.vue
View File

@ -79,34 +79,34 @@
<el-form-item> <el-form-item>
<el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<!-- <el-button--> <el-button
<!-- type="success"--> type="success"
<!-- plain--> plain
<!-- @click="handleExport"--> @click="handleExport"
<!-- :loading="exportLoading"--> :loading="exportLoading"
<!-- v-hasPermi="['heli:pg-master:export']"--> v-hasPermi="['heli:pg-master:export']"
<!-- >--> >
<!-- <Icon icon="ep:download" class="mr-5px" /> 导出--> <Icon icon="ep:download" class="mr-5px" /> 导出EXCEL
<!-- </el-button>--> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</ContentWrap> </ContentWrap>
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table" border> <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" show-summary :summary-method="getSummaries" class="hl-table" border>
<el-table-column label="序号" type="index" width="80" align="center" /> <el-table-column label="序号" type="index" width="80" align="center" />
<el-table-column label="订单日期" align="center" prop="ordDate" :formatter="dateFormatter2" min-width="120" /> <el-table-column label="订单日期" align="center" prop="ordDate" :formatter="dateFormatter2" min-width="100" />
<el-table-column label="供应商简称" align="center" prop="supplierName" min-width="180" /> <el-table-column label="供应商简称" align="center" prop="supplierName" min-width="120" />
<el-table-column label="BOM编号" align="center" prop="boomCode" min-width="180" /> <el-table-column label="BOM编号" align="center" prop="boomCode" min-width="200" />
<el-table-column label="图号" align="center" prop="blueprintNo" width="120"/> <el-table-column label="图号" align="center" prop="blueprintNo" width="120"/>
<el-table-column label="零件名称" align="center" prop="boomName" width="120"/> <el-table-column label="零件名称" align="center" prop="boomName" width="200"/>
<el-table-column label="材料" align="center" prop="composition" width="120"/> <el-table-column label="材料" align="center" prop="composition" width="120"/>
<el-table-column label="规格" align="center" prop="boomSpec" width="120"/> <el-table-column label="规格" align="center" prop="boomSpec" width="180"/>
<el-table-column label="数量" align="center" prop="purchaseAmount" width="80"/> <el-table-column label="数量" align="center" prop="purchaseAmount" width="100"/>
<el-table-column label="单价" align="center" prop="unitPrice" width="80"/> <el-table-column label="单价" align="center" prop="unitPrice" width="120"/>
<el-table-column label="小计" align="center" prop="estimatedPrice" width="80"/> <el-table-column label="小计" align="center" prop="estimatedPrice" width="120"/>
<el-table-column label="工序" align="center" prop="procedureName" width="100"/> <el-table-column label="工序" align="center" prop="procedureName" width="100"/>
<el-table-column label="到货日期" align="center" prop="acarrDate" width="120" :formatter="dateFormatter2"/> <el-table-column label="到货日期" align="center" prop="acarrDate" width="120" :formatter="dateFormatter2"/>
<el-table-column label="采购员" align="center" prop="userName" width="120"/> <el-table-column label="采购员" align="center" prop="userName" width="120"/>
@ -133,6 +133,7 @@ import {useCommonStateWithOut} from "@/store/modules/common";
import {useUserStore} from "@/store/modules/user"; import {useUserStore} from "@/store/modules/user";
import dayjs from "dayjs"; import dayjs from "dayjs";
import * as PurchaseOrderNoDetailApi from '@/api/heli/purchaseordernodetail' import * as PurchaseOrderNoDetailApi from '@/api/heli/purchaseordernodetail'
import {ElTable} from "element-plus";
defineOptions({ name: 'outsourcingExpenses' }) defineOptions({ name: 'outsourcingExpenses' })
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -170,7 +171,72 @@ const getList = async () => {
loading.value = false loading.value = false
} }
} }
const getSummaries = (param: SummaryMethodProps) => {
const summaryField = ["purchaseAmount","estimatedPrice"];
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
if (!summaryField.includes(column.property)) {
sums[index] = '';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return floatAdd(prev, curr);
} else {
return prev;
}
}, 0);
const thousandsField = [];
if (thousandsField.includes(column.property)) {
sums[index] = thousandsFormat(sums[index]);
}
} else {
sums[index] = '';
}
});
// const sumValue = computed(() => {
// return list.value.reduce((sum, item) => sum + item.quantityLent, 0);
// });
// const sums = ['合计','','','','','','','',sumValue];
return sums;
}
const floatAdd = (a, b) => {
var c, d, e;
if (undefined === a || null === a || "" === a || isNaN(a)) { a = 0; }
if (undefined === b || null === b || "" === b || isNaN(b)) { b = 0; }
try {
c = a.toString().split(".")[1].length;
} catch (f) {
c = 0;
}
try {
d = b.toString().split(".")[1].length;
} catch (f) {
d = 0;
}
e = Math.pow(10, Math.max(c, d));
return (floatMul(a, e) + floatMul(b, e)) / e;
};
const floatMul = (a, b) => {
var c = 0,
d = a.toString(),
e = b.toString();
try {
c += d.split(".")[1].length;
} catch (f) {}
try {
c += e.split(".")[1].length;
} catch (f) {}
return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
}
/** 搜索按钮操作 */ /** 搜索按钮操作 */
const handleQuery = () => { const handleQuery = () => {
queryParams.pageNo = 1 queryParams.pageNo = 1
@ -191,19 +257,19 @@ const setDefaultDate = () => {
] ]
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
// const handleExport = async () => { const handleExport = async () => {
// try { try {
// // 导出的二次确认 // 导出的二次确认
// await message.exportConfirm() await message.exportConfirm()
// // 发起导出 // 发起导出
// exportLoading.value = true exportLoading.value = true
// const data = await PurchaseOrderNoDetailApi.exportOutsourcing(queryParams) const data = await PurchaseOrderNoDetailApi.exportOutsourcing(queryParams)
// download.excel(data, '外协费用查询.xlsx') download.excel(data, '外协费用查询.xlsx')
// } catch { } catch {
// } finally { } finally {
// exportLoading.value = false exportLoading.value = false
// } }
// } }
/** 初始化 **/ /** 初始化 **/
onMounted(() => { onMounted(() => {

2
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/printDialog.vue
View File

@ -85,7 +85,7 @@ const open = async ( vals) => {
await Promise.all( await Promise.all(
printCodeName.value.map(async (item) => { printCodeName.value.map(async (item) => {
const qrCodeData = await QRCode.toDataURL(item.name,{ const qrCodeData = await QRCode.toDataURL(item.code,{
errorCorrectionLevel: 'H' errorCorrectionLevel: 'H'
}) })
const qrCodeElement = document.getElementById('qrCodeContainer') const qrCodeElement = document.getElementById('qrCodeContainer')

2
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/printFinalDialog.vue
View File

@ -200,7 +200,7 @@ const open = async ( vals) => {
await Promise.all( await Promise.all(
printCodeName.value.map(async (item) => { printCodeName.value.map(async (item) => {
const qrCodeData = await QRCode.toDataURL(item.name,{ const qrCodeData = await QRCode.toDataURL(item.code,{
errorCorrectionLevel: 'H' errorCorrectionLevel: 'H'
}) })
const qrCodeElement = document.getElementById('qrCodeContainer1') const qrCodeElement = document.getElementById('qrCodeContainer1')

8
mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue
View File

@ -301,7 +301,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.beginTime`" class="mb-0px!"> <el-form-item :prop="`${$index}.beginTime`" class="mb-0px!">
<!-- <el-input-number min="0" max="100" class="!w-240px" :disabled="detailDisabled || row.id" v-model="row.progress" placeholder="请输入进度百分比" @change="verify1($index)"/>--> <!-- <el-input-number min="0" max="100" class="!w-240px" :disabled="detailDisabled || row.id" v-model="row.progress" placeholder="请输入进度百分比" @change="verify1($index)"/>-->
<el-date-picker class="!w-230px" :disabled-date="(date) => disabledDate1(date, row)" @change="(e) => beginTimeChange(e,row)" :disabled=" (row.isOver == 1 || formData.isOverProcess == 1) && row.flag!=0" :formatter="dateFormatter" v-model="row.beginTime" type="datetime" placeholder="选择开始日期"/> <el-date-picker class="!w-230px" :disabled-date="(date) => disabledDate1(date, row)" @change="(e) => beginTimeChange(e,row)" :disabled="row.flag!=0" :formatter="dateFormatter" v-model="row.beginTime" type="datetime" placeholder="选择开始日期"/>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
@ -310,7 +310,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.endTime`" class="mb-0px!"> <el-form-item :prop="`${$index}.endTime`" class="mb-0px!">
<!-- <el-input-number min="0" max="100" class="!w-240px" :disabled="detailDisabled || row.id" v-model="row.progress" placeholder="请输入进度百分比" @change="verify1($index)"/>--> <!-- <el-input-number min="0" max="100" class="!w-240px" :disabled="detailDisabled || row.id" v-model="row.progress" placeholder="请输入进度百分比" @change="verify1($index)"/>-->
<el-date-picker class="!w-230px" :disabled-date="(date) => disabledDate(date, row)" @change="(e) => endTimeChange(e,row)" :disabled=" (row.isOver == 1 || formData.isOverProcess == 1) && row.flag!=0" :formatter="dateFormatter" v-model="row.endTime" type="datetime" placeholder="选择结束日期"/> <el-date-picker class="!w-230px" :disabled-date="(date) => disabledDate(date, row)" @change="(e) => endTimeChange(e,row)" :disabled="row.flag!=0" :formatter="dateFormatter" v-model="row.endTime" type="datetime" placeholder="选择结束日期"/>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
@ -318,7 +318,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
<template #header>已做时间(小时)</template> <template #header>已做时间(小时)</template>
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.workTime`" class="mb-0px!"> <el-form-item :prop="`${$index}.workTime`" class="mb-0px!">
<el-input-number :max="row.maxTime" :precision="2" class="!w-240px" :disabled=" (row.isOver == 1 || formData.isOverProcess == 1) && row.flag!=0" v-model="row.workTime" placeholder="请输入已做时间"/> <el-input-number :max="row.maxTime" :precision="2" class="!w-240px" :disabled=" row.flag!=0" v-model="row.workTime" placeholder="请输入已做时间"/>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
@ -763,7 +763,6 @@ const updateFlag = async(row:any) =>{
var maxTime = null; var maxTime = null;
if(formData.value.processDesignProgressList.length == 1){ if(formData.value.processDesignProgressList.length == 1){
formData.value.processDesignProgressList[0].hasNext = false; formData.value.processDesignProgressList[0].hasNext = false;
console.log(ststus.value)
if(formData.value.processDesignProgressList[0].endTime != null && formData.value.processDesignProgressList[0].endTime != ''){ if(formData.value.processDesignProgressList[0].endTime != null && formData.value.processDesignProgressList[0].endTime != ''){
if (ststus.value){ if (ststus.value){
formData.value.processDesignProgressList[0].flag=0 formData.value.processDesignProgressList[0].flag=0
@ -779,7 +778,6 @@ const updateFlag = async(row:any) =>{
} }
} else{ } else{
console.log(ststus.value)
var maxIndex = 0; var maxIndex = 0;
for (let index = 0; index < formData.value.processDesignProgressList.length; index++) { for (let index = 0; index < formData.value.processDesignProgressList.length; index++) {

112
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/Form.vue Normal file
View File

@ -0,0 +1,112 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" @close="cancel">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="供应商" prop="supplierId">
<el-select
v-model="formData.supplierId"
size="large"
clearable
filterable
style="width: 165px"
>
<el-option
v-for="item in supplierList"
:key="item.id"
:label="item.brief"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="修改原因" prop="modRemark">
<el-input type="textarea" :rows="5" v-model="formData.modRemark" placeholder="请输入修改原因" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import * as PartPurchaseOrderApi from "@/api/heli/partpurchaseorder";
import {ref} from "vue";
import * as supplierApi from "@/api/heli/supplier";
import {updatePurchaseOrderSupplier} from "@/api/heli/partpurchaseorder";
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formData = ref({
id: undefined,
modRemark: undefined,
supplierId:undefined
})
const formRules = reactive({
supplierId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
modRemark: [{ required: true, message: '修改原因不能为空', trigger: 'blur' }],
})
const formRef = ref() // 表单 Ref
const queryParams1 = reactive({
pageNo: 1,
pageSize: 999,
status:1
})
/** 打开弹窗 */
const open = async (row) => {
dialogVisible.value = true
resetForm()
formData.value.id=row.id
formData.value.supplierId=row.supplierId
formData.value.modRemark=row.modRemark
await supplier()
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const cancel = async () => {
dialogVisible.value = false
emit('success')
}
const submitForm = async () => {
// 校验表单
await formRef.value.validate()
// 提交请求
formLoading.value = true
try {
dialogVisible.value = false
await PartPurchaseOrderApi.updatePurchaseOrderSupplier(formData.value)
// 发送操作成功的事件
message.success("修改成功");
emit('success')
} finally {
formLoading.value = false
}
}
const supplierList = ref([])
const supplier = async() =>{
var data = await supplierApi.getSupplierPage(queryParams1);
supplierList.value =data.list
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
modRemark:undefined,
supplierId: undefined,
}
formRef.value?.resetFields()
}
</script>

14
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/index.vue
View File

@ -125,6 +125,9 @@ v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" cl
<el-button link type="primary" @click="openForm('detail', scope.row.id)"> <el-button link type="primary" @click="openForm('detail', scope.row.id)">
查看详情 查看详情
</el-button> </el-button>
<el-button link type="primary" v-if="scope.row.receivingStatus1==1" @click="openUpdateForm(scope.row)">
修改供应商
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -135,6 +138,8 @@ v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" cl
</ContentWrap> </ContentWrap>
</el-card> </el-card>
<Form ref="formRef" @success="getList" />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -142,10 +147,11 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import download from '@/utils/download' import download from '@/utils/download'
import * as PurchaseOrderApi from '@/api/heli/purchaseorder' import * as PurchaseOrderApi from '@/api/heli/purchaseorder'
import * as PurchaseOrderNoApi from '@/api/heli/purchaseorderno' import * as PurchaseOrderNoApi from '@/api/heli/purchaseorderno'
import { ElTable } from 'element-plus' import {ElButton, ElTable} from 'element-plus'
import {useUserStore} from "@/store/modules/user"; import {useUserStore} from "@/store/modules/user";
import routeParamsCache from '@/utils/routeParamsCache' import routeParamsCache from '@/utils/routeParamsCache'
import {dateFormatter1} from "@/utils/formatTime"; import {dateFormatter1} from "@/utils/formatTime";
import Form from "./Form.vue";
defineOptions({ name: 'PurchaseOrder' }) defineOptions({ name: 'PurchaseOrder' })
const userStore = useUserStore() const userStore = useUserStore()
const username = userStore.getUser.nickname const username = userStore.getUser.nickname
@ -204,7 +210,11 @@ const getList = async () => {
loading.value = false loading.value = false
} }
} }
/** 添加/修改操作 */
const formRef = ref()
const openUpdateForm = (row) => {
formRef.value.open( row)
}
/** 搜索按钮操作 */ /** 搜索按钮操作 */
const handleQuery = () => { const handleQuery = () => {
queryParams.pageNo = 1 queryParams.pageNo = 1

195
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/partReceived.vue
View File

@ -64,7 +64,7 @@ v-model="queryParams.supplierName" placeholder="供应商" clearable @keyup.ente
<el-form-item label="收货状态" prop="receivingStatus"> <el-form-item label="收货状态" prop="receivingStatus">
<el-select v-model="queryParams.receivingStatus" placeholder="下拉选择" clearable class="!w-240px"> <el-select v-model="queryParams.receivingStatus" placeholder="下拉选择" clearable class="!w-240px">
<el-option <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PURCHASE_RECEIVING_STATUS)" :key="dict.value" v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PURCHASE_RECEIVING_STATUS).filter(item=>item.value!=2)" :key="dict.value"
:label="dict.label" :value="dict.value" /> :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -86,28 +86,38 @@ v-model="queryParams.supplierName" placeholder="供应商" clearable @keyup.ente
<template #header> <template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">订单明细</span> <div class="hl-card-info-icona"></div><span class="hl-card-info-text">订单明细</span>
<el-button style="margin-left: 20px" @click="receiveGoods" type="success" size="large">收货</el-button> <el-button style="margin-left: 20px" @click="receiveGoods" type="success" size="large">收货</el-button>
<el-button
style="margin-left: 20px"
type="success"
plain
@click="handleExportDetail"
:loading="exportLoading"
>
<Icon icon="ep:download" class="mr-5px" /> 导出EXCEL
</el-button>
</template> </template>
<el-row> <el-row>
<el-col> <el-col>
<el-card class="hl-incard"> <el-card class="hl-incard">
<el-form ref="subFormRef" :model="list" v-loading="formLoading" label-width="0" > <el-form ref="subFormRef" :model="list" v-loading="formLoading" label-width="0" >
<el-table <el-table
v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table" ref="multipleTableRef" @selection-change="handleSelectionChange"> v-loading="loading" :data="list" :show-overflow-tooltip="true" class="hl-table" ref="multipleTableRef" show-summary :summary-method="getSummaries" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="80" />
<el-table-column label="收货状态" align="center" prop="receivingStatus" min-width="120"> <!-- <el-table-column label="收货状态" align="center" prop="receivingStatus" min-width="120">-->
<template #default="scope"> <!-- <template #default="scope">-->
<dict-tag :type="DICT_TYPE.HELI_PURCHASE_RECEIVING_STATUS" :value="scope.row.receivingStatus" /> <!-- <dict-tag :type="DICT_TYPE.HELI_PURCHASE_RECEIVING_STATUS" :value="scope.row.receivingStatus" />-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="projectSubCode" min-width="150" label="子项目编码" align="center"/> <el-table-column prop="projectSubCode" min-width="240" label="子项目编码" align="center"/>
<el-table-column prop="blueprintNo" min-width="100" label="图号" align="center"/> <el-table-column prop="blueprintNo" min-width="80" label="图号" align="center"/>
<el-table-column prop="boomName" min-width="120" label="零件名称" align="center"/> <el-table-column prop="boomName" min-width="180" label="零件名称" align="center"/>
<el-table-column prop="supplierName" min-width="120" label="供应商" align="center"/> <el-table-column prop="boomSpec" min-width="110" label="规格/型号" align="center"/>
<el-table-column prop="procedureName" min-width="120" label="工序" align="center"/> <el-table-column prop="supplierName" min-width="100" label="供应商" align="center"/>
<el-table-column prop="procedureName" min-width="100" label="工序" align="center"/>
<el-table-column prop="compositionName" min-width="100" label="材质" align="center"/> <el-table-column prop="compositionName" min-width="100" label="材质" align="center"/>
<el-table-column prop="purchaseAmount" min-width="100" label="采购数量" align="center" /> <el-table-column prop="purchaseAmount" min-width="100" label="采购数量" align="center" />
<el-table-column prop="purchaseRemAmount" min-width="100" label="剩余数量" align="center"/> <!-- <el-table-column prop="purchaseRemAmount" min-width="100" label="剩余数量" align="center"/>-->
<el-table-column prop="purchaseAmount" min-width="180" align="center"> <el-table-column prop="purchaseRemAmounts" min-width="170" align="center">
<template #header><span class="hl-table_header">*</span>入库数量</template> <template #header><span class="hl-table_header">*</span>入库数量</template>
<template #default="scope"> <template #default="scope">
<el-form-item :prop="`${scope.$index}.purchaseRemAmounts`" class="mb-0px!"> <el-form-item :prop="`${scope.$index}.purchaseRemAmounts`" class="mb-0px!">
@ -115,28 +125,41 @@ v-model="queryParams.supplierName" placeholder="供应商" clearable @keyup.ente
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="estimatedPrice" min-width="180" label="预估总价(元)" align="center"> <el-table-column prop="estimatedPrice" min-width="170" label="单价" align="center">
<template #header>单价</template>
<template #default="scope">
<el-form-item :prop="`${scope.$index}.unitPrice`" class="mb-0px!">
<el-input-number
style="width: 100%" v-model="scope.row.unitPrice" placeholder="单价" :min="0" :precision="2"
@change="changeUnitPrice(scope.row)"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="estimatedPrice" min-width="170" label="预估总价(元)" align="center">
<template #header><span class="hl-table_header">*</span>预估总价(元)</template> <template #header><span class="hl-table_header">*</span>预估总价(元)</template>
<template #default="scope"> <template #default="scope">
<el-form-item :prop="`${scope.$index}.estimatedPrice`" class="mb-0px!"> <el-form-item :prop="`${scope.$index}.estimatedPrice`" class="mb-0px!">
<el-input-number <el-input-number
style="width: 100%" v-model="scope.row.estimatedPrice" placeholder="预估总价" :min="0" :precision="2" style="width: 100%" v-model="scope.row.estimatedPrice" placeholder="预估总价" :min="0" :precision="2"
@input="(val)=>handleInput(val,scope.row)" @input="(val)=>handleInput(val,scope.row)"
@keyup.enter="(e)=>handleEnter(e,scope.row)" @keyup.enter="(e)=>handleEnter(e,scope.row)"
@change="changeEstimatedPrice(scope.row)"
:id="'estimatedPrice'+scope.row.id" :id="'estimatedPrice'+scope.row.id"
/> />
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createTime" min-width="150" label="订单生成日期" align="center" :formatter="dateFormatter1"/> <el-table-column prop="createTime" min-width="150" label="订单生成日期" align="center" :formatter="dateFormatter1"/>
<el-table-column prop="requireTime" min-width="150" label="需要完成日期" align="center" :formatter="dateFormatter1"/> <!-- <el-table-column prop="requireTime" min-width="150" label="需要完成日期" align="center" :formatter="dateFormatter1"/>-->
<!-- <el-table-column prop="arriveTime" min-width="150" label="收货日期" align="center" :formatter="dateFormatter1" />--> <el-table-column prop="arriveTime" min-width="150" label="收货日期" align="center" :formatter="dateFormatter1" />
<el-table-column prop="description" min-width="150" label="技术要求" align="center"/> <el-table-column prop="description" min-width="150" label="技术要求" align="center"/>
<el-table-column prop="theWeight" min-width="100" label="理论重量" align="center"/> <!-- <el-table-column prop="theWeight" min-width="100" label="理论重量" align="center"/>-->
<el-table-column label="操作" align="center" fixed="right" min-width="200"> <el-table-column label="操作" align="center" fixed="right" min-width="200">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" v-if="scope.row.receivingStatus!=3" @click="receiveGood(scope.row)"> <el-button link type="danger" v-if="scope.row.receivingStatus!=3" @click="receiveGood(scope.row)">
收货 未收货
</el-button> </el-button>
<el-button link type="primary" @click="updateFrom(scope.row)" v-if="scope.row.receivingStatus==3"> <el-button link type="primary" @click="updateFrom(scope.row)" v-if="scope.row.receivingStatus==3">
总价修改 总价修改
@ -160,10 +183,12 @@ v-model="queryParams.supplierName" placeholder="供应商" clearable @keyup.ente
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import * as PurchaseOrderApi from '@/api/heli/purchaseorder' import * as PurchaseOrderApi from '@/api/heli/purchaseorder'
import * as UserApi from '@/api/system/user' import * as UserApi from '@/api/system/user'
import { ElTable } from 'element-plus' import {ElButton, ElTable} from 'element-plus'
import {useUserStore} from "@/store/modules/user"; import {useUserStore} from "@/store/modules/user";
import {dateFormatter1} from "@/utils/formatTime"; import {dateFormatter1} from "@/utils/formatTime";
import * as PurchaseOrderNoDetailApi from "@/api/heli/purchaseordernodetail"; import * as PurchaseOrderNoDetailApi from "@/api/heli/purchaseordernodetail";
import download from "@/utils/download";
import {exportExcel} from "@/api/heli/purchaseordernodetail";
defineOptions({ name: 'PurchaseordernopartReceived' }) defineOptions({ name: 'PurchaseordernopartReceived' })
const userStore = useUserStore() const userStore = useUserStore()
const username = userStore.getUser.nickname const username = userStore.getUser.nickname
@ -210,6 +235,13 @@ const queryParams = reactive({
}) })
const queryFormRef = ref() // 搜索的表单 const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中 const exportLoading = ref(false) // 导出的加载中
const changeUnitPrice =(row:any)=>{
row.estimatedPrice=parseFloat((row.unitPrice* row.purchaseAmount).toFixed(2))
}
const changeEstimatedPrice =(row:any)=>{
row.unitPrice=parseFloat((row.estimatedPrice/row.purchaseAmount).toFixed(2))
}
const handleInput = (val: number, row: PurchaseOrderNoDetailApi.PurchaseOrderNoDetailVO) => { const handleInput = (val: number, row: PurchaseOrderNoDetailApi.PurchaseOrderNoDetailVO) => {
console.log(val, 'val'); console.log(val, 'val');
//输入判断当前行是否选中如无将当前行选中 //输入判断当前行是否选中如无将当前行选中
@ -239,6 +271,75 @@ const handleEnter = (e: KeyboardEvent, row: PurchaseOrderNoDetailApi.PurchaseOrd
console.log(input, 'input'); console.log(input, 'input');
}
const getSummaries = (param: SummaryMethodProps) => {
const summaryField = ["purchaseRemAmounts"];
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
if (!summaryField.includes(column.property)) {
sums[index] = '';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return floatAdd(prev, curr);
} else {
return prev;
}
}, 0);
const thousandsField = [];
if (thousandsField.includes(column.property)) {
sums[index] = thousandsFormat(sums[index]);
}
} else {
sums[index] = '';
}
});
// const sumValue = computed(() => {
// return list.value.reduce((sum, item) => sum + item.quantityLent, 0);
// });
// const sums = ['合计','','','','','','','',sumValue];
return sums;
}
const floatAdd = (a, b) => {
var c, d, e;
if (undefined === a || null === a || "" === a || isNaN(a)) { a = 0; }
if (undefined === b || null === b || "" === b || isNaN(b)) { b = 0; }
try {
c = a.toString().split(".")[1].length;
} catch (f) {
c = 0;
}
try {
d = b.toString().split(".")[1].length;
} catch (f) {
d = 0;
}
e = Math.pow(10, Math.max(c, d));
return (floatMul(a, e) + floatMul(b, e)) / e;
};
const floatMul = (a, b) => {
var c = 0,
d = a.toString(),
e = b.toString();
try {
c += d.split(".")[1].length;
} catch (f) {}
try {
c += e.split(".")[1].length;
} catch (f) {}
return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
}
const tableRowClassName = ({ row }) => {
return row.isSelected ? 'selected-row' : '';
} }
/** 查询列表 */ /** 查询列表 */
const getList = async () => { const getList = async () => {
@ -246,7 +347,9 @@ const getList = async () => {
try { try {
queryParams.ids = undefined queryParams.ids = undefined
const data = await PurchaseOrderNoDetailApi.getReceiveGoodDetail(queryParams) const data = await PurchaseOrderNoDetailApi.getReceiveGoodDetail(queryParams)
list.value.forEach(item=>{
item.isSelected=false
})
list.value = data.list list.value = data.list
total.value = data.total total.value = data.total
} finally { } finally {
@ -268,7 +371,30 @@ const handleQuery = () => {
getList() getList()
} }
/** 导出按钮操作 */
const handleExportDetail = async () => {
try {
const list = multipleSelection.value|| []; // 安全获取数据
// 1. 检查空数据
if (!list || list.length==null||list.length==0) {
message.error("采购订单信息未选择，请确认");
return;
}
// 导出的二次确认
await message.exportConfirm()
const ids = list.map(item => item.id).join(',');
queryParams.ids=ids
// 发起导出
exportLoading.value = true
const data = await PurchaseOrderNoDetailApi.exportExcel(queryParams);
download.excel(data, '零件采购收货.xlsx')
} catch {
} finally {
exportLoading.value = false
queryParams.ids=undefined
}
}
/** 重置按钮操作 */ /** 重置按钮操作 */
const resetQuery = () => { const resetQuery = () => {
@ -279,13 +405,26 @@ const multipleTableRef: any = ref<InstanceType<typeof ElTable>>()
const multipleSelection: any = ref([]) const multipleSelection: any = ref([])
const handleSelectionChange = (val: PurchaseOrderApi.PurchaseOrderVO[]) => { const handleSelectionChange = (val: PurchaseOrderApi.PurchaseOrderVO[]) => {
// 第一步：重置所有行的 isSelected 为 false
list.value.forEach(row => {
row.isSelected = false;
});
// 第二步：将当前选中行的 isSelected 设为 true
val.forEach(selectedRow => {
// 找到对应行并更新状态（通过唯一标识符匹配更准确）
const targetRow = list.value.find(row => row.id === selectedRow.id);
if (targetRow) {
targetRow.isSelected = true;
}
});
multipleSelection.value = val multipleSelection.value = val
} }
const receiveGood = async (row) => { const receiveGood = async (row) => {
multipleTableRef.value.clearSelection() multipleTableRef.value.clearSelection()
multipleTableRef.value.toggleRowSelection(row) multipleTableRef.value.toggleRowSelection(row)
multipleSelection.value.indexOf(row) == -1 && multipleSelection.value.push(row) ; multipleSelection.value.indexOf(row) == -1 && multipleSelection.value.push(row) ;
receiveGoods(); receiveGoods();
} }
@ -339,3 +478,9 @@ onMounted(async () => {
getList() getList()
}) })
</script> </script>
<style>
.selected-row {
background-color: #ffe6cc !important;
}
</style>