Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MES报废功能

Browse Source
highway
chj 2 years ago
parent 08103e1abb
commit 24faa833ea
19 changed files with 2426 additions and 226 deletions
Show Stats Download Patch File Download Diff File

224
op-modules/op-mes/op-modules-mes.iml
Unescape Escape View File

@ -1,224 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2021.0.4.0" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2021.0.4.0" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:2.0.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.4.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.16" level="project" />
<orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
<orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.15.0" level="project" />
<orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel:0.15.0" level="project" />
<orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_common:0.15.0" level="project" />
<orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel_agent:0.15.0" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.11" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.7.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.1.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2021.0.4.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-sentinel:2021.0.4.0" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-transport-simple-http:1.8.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-transport-common:1.8.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-datasource-extension:1.8.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83_noneautotype" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-annotation-aspectj:1.8.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-core:1.8.5" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-circuitbreaker-sentinel:2021.0.4.0" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-reactor-adapter:1.8.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-spring-webflux-adapter:1.8.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-spring-webmvc-adapter:1.8.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-parameter-flow-control:1.8.5" level="project" />
<orderEntry type="library" name="Maven: com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-server-default:1.8.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-common-default:1.8.5" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.86.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.86.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.86.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.86.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.86.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.86.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.86.Final" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-client-default:1.8.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-sentinel-datasource:2021.0.4.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.7" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.7.7" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4" level="project" />
<orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.9.6" level="project" />
<orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.12.20" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mysql:mysql-connector-j:8.0.31" level="project" />
<orderEntry type="library" name="Maven: com.microsoft.sqlserver:mssql-jdbc:6.1.0.jre8" level="project" />
<orderEntry type="library" name="Maven: com.microsoft.azure:azure-keyvault:0.9.3" level="project" />
<orderEntry type="library" name="Maven: com.microsoft.azure:azure-core:0.9.3" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: javax.mail:mail:1.4.5" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-client:1.13" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.13" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.13" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.3-1" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.2" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.2" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.2" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-xc:1.9.2" level="project" />
<orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
<orderEntry type="library" name="Maven: com.microsoft.azure:adal4j:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.nimbusds:oauth2-oidc-sdk:4.5" level="project" />
<orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
<orderEntry type="library" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
<orderEntry type="library" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm:9.1" level="project" />
<orderEntry type="library" name="Maven: com.nimbusds:lang-tag:1.4" level="project" />
<orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.9.1" level="project" />
<orderEntry type="module" module-name="op-common-datasource" />
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.16" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.16" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.5.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.7.7" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.7.7" level="project" />
<orderEntry type="module" module-name="op-common-datascope" />
<orderEntry type="module" module-name="op-common-security" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.24" level="project" />
<orderEntry type="module" module-name="op-api-system" />
<orderEntry type="module" module-name="op-common-core" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.5" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-core:11.10" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:11.10" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-loadbalancer:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-loadbalancer:3.1.5" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.addons:reactor-extra:3.4.9" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.7.7" level="project" />
<orderEntry type="library" name="Maven: com.stoyanr:evictor:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.24" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.14.2" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.2" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.6" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.2" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.5.Final" level="project" />
<orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.25" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="module" module-name="op-common-redis" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.7.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.7.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.7.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.24" level="project" />
<orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.26" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.4" level="project" />
<orderEntry type="module" module-name="op-common-log" />
<orderEntry type="module" module-name="op-common-swagger" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.7.7" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.70" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.70" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.70" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.24" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.16" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-bootstrap:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.11.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.69" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.69" level="project" />
</component>
</module>

137
op-modules/op-mes/src/main/java/com/op/mes/controller/ProEmbryoScrapController.java
Unescape Escape View File

@ -0,0 +1,137 @@
package com.op.mes.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.op.mes.domain.ProEmbryoScrap;
import com.op.mes.domain.ProEmbryoScrapDetail;
import com.op.mes.domain.Product;
import com.op.mes.domain.SysPost;
import com.op.mes.service.IProEmbryoScrapDetailService;
import com.op.mes.service.IProEmbryoScrapService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.page.TableDataInfo;
/**
* 报废Controller
*
* @author Open Platform
* @date 2023-08-01
*/
@RestController
@RequestMapping("/scrap")
public class ProEmbryoScrapController extends BaseController {
@Autowired
private IProEmbryoScrapService proEmbryoScrapService;
/**
* 查询报废列表
*/
@RequiresPermissions("mes:scrap:list")
@GetMapping("/list")
public TableDataInfo list(ProEmbryoScrap proEmbryoScrap) {
startPage();
List<ProEmbryoScrap> list = proEmbryoScrapService.selectProEmbryoScrapList(proEmbryoScrap);
return getDataTable(list);
}
/**
* 导出报废列表
*/
@RequiresPermissions("mes:scrap:export")
@Log(title = "报废", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ProEmbryoScrap proEmbryoScrap) {
List<ProEmbryoScrap> list = proEmbryoScrapService.selectProEmbryoScrapList(proEmbryoScrap);
ExcelUtil<ProEmbryoScrap> util = new ExcelUtil<ProEmbryoScrap>(ProEmbryoScrap.class);
util.exportExcel(response, list, "报废列表数据");
}
/**
* 获取报废详细信息
*/
@RequiresPermissions("mes:scrap:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
return success(proEmbryoScrapService.selectProEmbryoScrapById(id));
}
/**
* 新增报废
*/
@RequiresPermissions("mes:scrap:add")
@Log(title = "报废", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ProEmbryoScrap proEmbryoScrap) {
return toAjax(proEmbryoScrapService.insertProEmbryoScrap(proEmbryoScrap));
}
/**
* 修改报废
*/
@RequiresPermissions("mes:scrap:edit")
@Log(title = "报废", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ProEmbryoScrap proEmbryoScrap) {
return toAjax(proEmbryoScrapService.updateProEmbryoScrap(proEmbryoScrap));
}
/**
* 删除报废
*/
@RequiresPermissions("mes:scrap:remove")
@Log(title = "报废", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(proEmbryoScrapService.deleteProEmbryoScrapByIds(ids));
}
//搜索物料接口
// @GetMapping("/selectAll")
// public AjaxResult selectProEmbryoScrap(){
// return AjaxResult.success(proEmbryoScrapService.selectProEmbryoScrap());
// }
/**
* 查询所有物料名称接口
* @return
*/
@GetMapping("/selectAllMaterial")
public AjaxResult listMaterial(){
return AjaxResult.success(proEmbryoScrapService.showAllMaterial());
}
/**
* 查询所有工位
* @return
*/
@GetMapping("/selectAllSysPost")
public AjaxResult listSysPost(){
return AjaxResult.success(proEmbryoScrapService.showSysPost());
}
/**
* 查询所有工单信息
* @return
*/
@GetMapping("/selectAllWorkOrder")
public AjaxResult listWorkOrder(){
return AjaxResult.success(proEmbryoScrapService.selectAllWorkOrder());
}
}

97
op-modules/op-mes/src/main/java/com/op/mes/controller/ProEmbryoScrapDetailController.java
Unescape Escape View File

@ -0,0 +1,97 @@
package com.op.mes.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.mes.domain.ProEmbryoScrapDetail;
import com.op.mes.service.IProEmbryoScrapDetailService;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.page.TableDataInfo;
/**
* 报废详情Controller
*
* @author Open Platform
* @date 2023-08-01
*/
@RestController
@RequestMapping("/detail")
public class ProEmbryoScrapDetailController extends BaseController {
@Autowired
private IProEmbryoScrapDetailService proEmbryoScrapDetailService;
/**
* 查询报废详情列表
*/
// @RequiresPermissions("system:detail:list")
@GetMapping("/list")
public TableDataInfo list(ProEmbryoScrapDetail proEmbryoScrapDetail) {
startPage();
List<ProEmbryoScrapDetail> list = proEmbryoScrapDetailService.selectProEmbryoScrapDetailList(proEmbryoScrapDetail);
return getDataTable(list);
}
/**
* 导出报废详情列表
*/
// @RequiresPermissions("system:detail:export")
@Log(title = "报废详情", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ProEmbryoScrapDetail proEmbryoScrapDetail) {
List<ProEmbryoScrapDetail> list = proEmbryoScrapDetailService.selectProEmbryoScrapDetailList(proEmbryoScrapDetail);
ExcelUtil<ProEmbryoScrapDetail> util = new ExcelUtil<ProEmbryoScrapDetail>(ProEmbryoScrapDetail.class);
util.exportExcel(response, list, "报废详情数据");
}
/**
* 获取报废详情详细信息
*/
// @RequiresPermissions("system:detail:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
return success(proEmbryoScrapDetailService.selectProEmbryoScrapDetailById(id));
}
/**
* 新增报废详情
*/
// @RequiresPermissions("system:detail:add")
@Log(title = "报废详情", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ProEmbryoScrapDetail proEmbryoScrapDetail) {
return toAjax(proEmbryoScrapDetailService.insertProEmbryoScrapDetail(proEmbryoScrapDetail));
}
/**
* 修改报废详情
*/
// @RequiresPermissions("system:detail:edit")
@Log(title = "报废详情", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ProEmbryoScrapDetail proEmbryoScrapDetail) {
return toAjax(proEmbryoScrapDetailService.updateProEmbryoScrapDetail(proEmbryoScrapDetail));
}
/**
* 删除报废详情
*/
// @RequiresPermissions("system:detail:remove")
@Log(title = "报废详情", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(proEmbryoScrapDetailService.deleteProEmbryoScrapDetailByIds(ids));
}
}

220
op-modules/op-mes/src/main/java/com/op/mes/domain/ProEmbryoScrap.java
Unescape Escape View File

@ -0,0 +1,220 @@
package com.op.mes.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* 【请填写功能名称】对象 pro_embryo_scrap
*
* @author Open Platform
* @date 2023-08-01
*/
public class ProEmbryoScrap extends BaseEntity {
private static final long serialVersionUID = 1L;
/** ID */
private String id;
/** 报废单号 */
@Excel(name = "报废单号")
private String scrapCode;
/** 物料ID */
@Excel(name = "物料ID")
private String materialId;
/** 物料编码 */
@Excel(name = "物料编码")
private String materialCode;
/** 物料名称 */
@Excel(name = "物料名称")
private String materialName;
/** 工位ID */
@Excel(name = "工位ID")
private String workCellId;
/** 工位编码 */
@Excel(name = "工位编码")
private String workCellCode;
/** 工位名称 */
@Excel(name = "工位名称")
private String workCellName;
/** 报废数量 */
@Excel(name = "报废数量")
private Long scrapQuality;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 状态 */
@Excel(name = "状态")
private String status;
/** 预留字段1 */
@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
@Excel(name = "预留字段3")
private Long attr3;
/** 预留字段4 */
@Excel(name = "预留字段4")
private Long attr4;
/** 0删除1正常 */
@Excel(name = "0删除1正常")
private String active;
public void setId(String id) {
this.id = id;
}
public String getId() {
return id;
}
public void setScrapCode(String scrapCode) {
this.scrapCode = scrapCode;
}
public String getScrapCode() {
return scrapCode;
}
public void setMaterialId(String materialId) {
this.materialId = materialId;
}
public String getMaterialId() {
return materialId;
}
public void setMaterialCode(String materialCode) {
this.materialCode = materialCode;
}
public String getMaterialCode() {
return materialCode;
}
public void setMaterialName(String materialName) {
this.materialName = materialName;
}
public String getMaterialName() {
return materialName;
}
public void setWorkCellId(String workCellId) {
this.workCellId = workCellId;
}
public String getWorkCellId() {
return workCellId;
}
public void setWorkCellCode(String workCellCode) {
this.workCellCode = workCellCode;
}
public String getWorkCellCode() {
return workCellCode;
}
public void setWorkCellName(String workCellName) {
this.workCellName = workCellName;
}
public String getWorkCellName() {
return workCellName;
}
public void setScrapQuality(Long scrapQuality) {
this.scrapQuality = scrapQuality;
}
public Long getScrapQuality() {
return scrapQuality;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getUnit() {
return unit;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(Long attr3) {
this.attr3 = attr3;
}
public Long getAttr3() {
return attr3;
}
public void setAttr4(Long attr4) {
this.attr4 = attr4;
}
public Long getAttr4() {
return attr4;
}
public void setActive(String active) {
this.active = active;
}
public String getActive() {
return active;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("scrapCode", getScrapCode())
.append("materialId", getMaterialId())
.append("materialCode", getMaterialCode())
.append("materialName", getMaterialName())
.append("workCellId", getWorkCellId())
.append("workCellCode", getWorkCellCode())
.append("workCellName", getWorkCellName())
.append("scrapQuality", getScrapQuality())
.append("unit", getUnit())
.append("status", getStatus())
.append("remark", getRemark())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("active", getActive())
.toString();
}
}

207
op-modules/op-mes/src/main/java/com/op/mes/domain/ProEmbryoScrapDetail.java
Unescape Escape View File

@ -0,0 +1,207 @@
package com.op.mes.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* 【请填写功能名称】对象 pro_embryo_scrap_detail
*
* @author Open Platform
* @date 2023-08-01
*/
public class ProEmbryoScrapDetail extends BaseEntity {
private static final long serialVersionUID = 1L;
/** ID */
private String id;
/** 报废单号 */
@Excel(name = "报废单号")
private String scrapCode;
/** 工单ID */
@Excel(name = "工单ID")
private String workorderId;
/** 工单编号 */
@Excel(name = "工单编号")
private String workorderCode;
/** 物料ID */
@Excel(name = "物料ID")
private String materialId;
/** 物料编码 */
@Excel(name = "物料编码")
private String materialCode;
/** 物料名称 */
@Excel(name = "物料名称")
private String materialName;
/** 物料报废数量 */
@Excel(name = "物料报废数量")
private Long scrapQuality;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 状态 */
@Excel(name = "状态")
private String status;
/** 预留字段1 */
@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
@Excel(name = "预留字段3")
private Long attr3;
/** 预留字段4 */
@Excel(name = "预留字段4")
private Long attr4;
/** 0删除1正常 */
@Excel(name = "0删除1正常")
private String active;
public void setId(String id) {
this.id = id;
}
public String getId() {
return id;
}
public void setScrapCode(String scrapCode) {
this.scrapCode = scrapCode;
}
public String getScrapCode() {
return scrapCode;
}
public void setWorkorderId(String workorderId) {
this.workorderId = workorderId;
}
public String getWorkorderId() {
return workorderId;
}
public void setWorkorderCode(String workorderCode) {
this.workorderCode = workorderCode;
}
public String getWorkorderCode() {
return workorderCode;
}
public void setMaterialId(String materialId) {
this.materialId = materialId;
}
public String getMaterialId() {
return materialId;
}
public void setMaterialCode(String materialCode) {
this.materialCode = materialCode;
}
public String getMaterialCode() {
return materialCode;
}
public void setMaterialName(String materialName) {
this.materialName = materialName;
}
public String getMaterialName() {
return materialName;
}
public void setScrapQuality(Long scrapQuality) {
this.scrapQuality = scrapQuality;
}
public Long getScrapQuality() {
return scrapQuality;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getUnit() {
return unit;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(Long attr3) {
this.attr3 = attr3;
}
public Long getAttr3() {
return attr3;
}
public void setAttr4(Long attr4) {
this.attr4 = attr4;
}
public Long getAttr4() {
return attr4;
}
public void setActive(String active) {
this.active = active;
}
public String getActive() {
return active;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("scrapCode", getScrapCode())
.append("workorderId", getWorkorderId())
.append("workorderCode", getWorkorderCode())
.append("materialId", getMaterialId())
.append("materialCode", getMaterialCode())
.append("materialName", getMaterialName())
.append("scrapQuality", getScrapQuality())
.append("unit", getUnit())
.append("status", getStatus())
.append("remark", getRemark())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("active", getActive())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

474
op-modules/op-mes/src/main/java/com/op/mes/domain/ProOrderWorkorder.java
Unescape Escape View File

@ -0,0 +1,474 @@
package com.op.mes.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.TreeEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
import java.util.List;
/**
* 生产工单对象 pro_order_workorder
*
* @author Open Platform
* @date 2023-07-18
*/
public class ProOrderWorkorder extends TreeEntity {
private static final long serialVersionUID = 1L;
/** 工单ID */
private String workorderId;
/** 工单编码 */
@Excel(name = "工单编码")
private String workorderCode;
/** 工单名称 */
@Excel(name = "工单名称")
private String workorderName;
/** 订单id */
@Excel(name = "订单id")
private String orderId;
/** 订单编码 */
@Excel(name = "订单编码")
private String orderCode;
/** 产品ID */
@Excel(name = "产品ID")
private String productId;
/** 产品编号 */
@Excel(name = "产品编号")
private String productCode;
/** 产品名称 */
@Excel(name = "产品名称")
private String productName;
/** 规格型号 */
@Excel(name = "规格型号")
private String productSpc;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 已生产数量 */
@Excel(name = "已生产数量")
private Long quantityProduced;
/** 已拆分数量 */
@Excel(name = "已拆分数量")
private Long quantitySplit;
/** 工艺编码 */
@Excel(name = "工艺编码")
private String routeCode;
/** 产线编码 */
@Excel(name = "产线编码")
private String prodLineCode;
/** 工单生产日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "工单生产日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date productDate;
// 工单生产日期开始
private String productDateStart;
// 工单生产日期结束
private String productDateEnd;
/** 班次 */
@Excel(name = "班次")
private String shiftId;
/** 父工单 */
@Excel(name = "父工单")
private String parentOrder;
/** 所有父节点ID */
@Excel(name = "所有父节点ID")
private String ancestors;
/** 单据状态 */
@Excel(name = "单据状态")
private String status;
/** 预留字段1 */
@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
@Excel(name = "预留字段3")
private String attr3;
/** 预留字段4 */
@Excel(name = "预留字段4")
private String attr4;
/** 产品类型 */
@Excel(name = "产品类型")
private String prodType;
/** 是否为底层节点 1是 0不是 */
@Excel(name = "是否为底层节点")
private Integer isEnd;
/** 班次名称（数据库无该字段，需自行查询） */
private String shiftDesc;
// 料罐id（湿料计划模块使用）
private Integer bucketId;
// 料罐编码（湿料计划模块使用）
private String bucketCode;
// 物料id（湿料计划模块使用）
private Integer materialId;
// 物料编码（湿料计划模块使用）
private String materialCode;
// 物料名称（湿料计划模块使用）
private String materialName;
// 计划日期（湿料计划模块使用）
private Date planTime;
// 料罐名称（湿料计划模块使用）
private String bucketName;
public String getBucketName() {
return bucketName;
}
public void setBucketName(String bucketName) {
this.bucketName = bucketName;
}
public Integer getBucketId() {
return bucketId;
}
public void setBucketId(Integer bucketId) {
this.bucketId = bucketId;
}
public String getBucketCode() {
return bucketCode;
}
public void setBucketCode(String bucketCode) {
this.bucketCode = bucketCode;
}
public Integer getMaterialId() {
return materialId;
}
public void setMaterialId(Integer materialId) {
this.materialId = materialId;
}
public String getMaterialCode() {
return materialCode;
}
public void setMaterialCode(String materialCode) {
this.materialCode = materialCode;
}
public String getMaterialName() {
return materialName;
}
public void setMaterialName(String materialName) {
this.materialName = materialName;
}
public Date getPlanTime() {
return planTime;
}
public void setPlanTime(Date planTime) {
this.planTime = planTime;
}
public String getShiftDesc() {
return shiftDesc;
}
public void setShiftDesc(String shiftDesc) {
this.shiftDesc = shiftDesc;
}
public Integer getIsEnd() {
return isEnd;
}
public void setIsEnd(Integer isEnd) {
this.isEnd = isEnd;
}
/** 批次号 */
private List<StringBuilder> batchCodeList;
public List<StringBuilder> getBatchCodeList() {
return batchCodeList;
}
public void setBatchCodeList(List<StringBuilder> batchCodeList) {
this.batchCodeList = batchCodeList;
}
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String factoryCode;
public void setWorkorderId(String workorderId) {
this.workorderId = workorderId;
}
public String getWorkorderId() {
return workorderId;
}
public void setWorkorderCode(String workorderCode) {
this.workorderCode = workorderCode;
}
public String getWorkorderCode() {
return workorderCode;
}
public void setWorkorderName(String workorderName) {
this.workorderName = workorderName;
}
public String getWorkorderName() {
return workorderName;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public String getOrderId() {
return orderId;
}
public void setOrderCode(String orderCode) {
this.orderCode = orderCode;
}
public String getOrderCode() {
return orderCode;
}
public void setProductId(String productId) {
this.productId = productId;
}
public String getProductId() {
return productId;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public String getProductCode() {
return productCode;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getProductName() {
return productName;
}
public void setProductSpc(String productSpc) {
this.productSpc = productSpc;
}
public String getProductSpc() {
return productSpc;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getUnit() {
return unit;
}
public void setQuantityProduced(Long quantityProduced) {
this.quantityProduced = quantityProduced;
}
public Long getQuantityProduced() {
return quantityProduced;
}
public void setQuantitySplit(Long quantitySplit) {
this.quantitySplit = quantitySplit;
}
public Long getQuantitySplit() {
return quantitySplit;
}
public void setRouteCode(String routeCode) {
this.routeCode = routeCode;
}
public String getRouteCode() {
return routeCode;
}
public void setProdLineCode(String prodLineCode) {
this.prodLineCode = prodLineCode;
}
public String getProdLineCode() {
return prodLineCode;
}
public void setProductDate(Date productDate) {
this.productDate = productDate;
}
public Date getProductDate() {
return productDate;
}
public void setShiftId(String shiftId) {
this.shiftId = shiftId;
}
public String getShiftId() {
return shiftId;
}
public void setParentOrder(String parentOrder) {
this.parentOrder = parentOrder;
}
public String getParentOrder() {
return parentOrder;
}
public void setAncestors(String ancestors) {
this.ancestors = ancestors;
}
public String getAncestors() {
return ancestors;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
public String getAttr3() {
return attr3;
}
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
public String getAttr4() {
return attr4;
}
public void setProdType(String prodType) {
this.prodType = prodType;
}
public String getProdType() {
return prodType;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryCode() {
return factoryCode;
}
public String getProductDateStart() {
return productDateStart;
}
public void setProductDateStart(String productDateStart) {
this.productDateStart = productDateStart;
}
public String getProductDateEnd() {
return productDateEnd;
}
public void setProductDateEnd(String productDateEnd) {
this.productDateEnd = productDateEnd;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("workorderId", getWorkorderId())
.append("workorderCode", getWorkorderCode())
.append("workorderName", getWorkorderName())
.append("orderId", getOrderId())
.append("orderCode", getOrderCode())
.append("productId", getProductId())
.append("productCode", getProductCode())
.append("productName", getProductName())
.append("productSpc", getProductSpc())
.append("unit", getUnit())
.append("quantityProduced", getQuantityProduced())
.append("quantitySplit", getQuantitySplit())
.append("routeCode", getRouteCode())
.append("prodLineCode", getProdLineCode())
.append("productDate", getProductDate())
.append("shiftId", getShiftId())
.append("parentOrder", getParentOrder())
.append("ancestors", getAncestors())
.append("status", getStatus())
.append("remark", getRemark())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("prodType", getProdType())
.append("factoryCode", getFactoryCode())
.append("batchCodeList",getBatchCodeList())
.append("isEnd",getIsEnd())
.append("shiftDesc",getShiftDesc())
.append("bucketId",getBucketId())
.append("bucketCode",getBucketCode())
.append("materialId",getMaterialId())
.append("materialCode",getMaterialCode())
.append("materialName",getMaterialName())
.append("planTime",getPlanTime())
.append("bucketName",getBucketName())
.toString();
}
}

48
op-modules/op-mes/src/main/java/com/op/mes/domain/Product.java
Unescape Escape View File

@ -0,0 +1,48 @@
package com.op.mes.domain;
// 物料实体类
public class Product {
// 物料id
private String productId;
// 物料code
private String productCode;
// 物料名称Desc
private String productDesc;
@Override
public String toString() {
return "Product{" +
"productId=" + productId +
", productCode='" + productCode + '\'' +
", productDesc='" + productDesc + '\'' +
'}';
}
public String getProductId() {
return productId;
}
public void setProductId(String productId) {
this.productId = productId;
}
public String getProductCode() {
return productCode;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public String getProductDesc() {
return productDesc;
}
public void setProductDesc(String productDesc) {
this.productDesc = productDesc;
}
public Product() {
}
}

105
op-modules/op-mes/src/main/java/com/op/mes/domain/SysPost.java
Unescape Escape View File

@ -0,0 +1,105 @@
package com.op.mes.domain;
import com.op.common.core.annotation.Excel;
import com.op.common.core.annotation.Excel.ColumnType;
import com.op.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
/**
* 岗位表 sys_post
*
* @author OP
*/
public class SysPost extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 岗位序号 */
@Excel(name = "岗位序号", cellType = ColumnType.NUMERIC)
private Long postId;
/** 岗位编码 */
@Excel(name = "岗位编码")
private String postCode;
/** 岗位名称 */
@Excel(name = "岗位名称")
private String postName;
/** 岗位排序 */
@Excel(name = "岗位排序")
private Integer postSort;
/** 状态（0正常 1停用） */
@Excel(name = "状态", readConverterExp = "0=正常,1=停用")
private String status;
/** 用户是否存在此岗位标识 默认不存在 */
private boolean flag = false;
public Long getPostId() {
return postId;
}
public void setPostId(Long postId) {
this.postId = postId;
}
@NotBlank(message = "岗位编码不能为空")
@Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
public String getPostCode() {
return postCode;
}
public void setPostCode(String postCode) {
this.postCode = postCode;
}
@NotBlank(message = "岗位名称不能为空")
@Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
public String getPostName() {
return postName;
}
public void setPostName(String postName) {
this.postName = postName;
}
@NotNull(message = "显示顺序不能为空")
public Integer getPostSort() {
return postSort;
}
public void setPostSort(Integer postSort) {
this.postSort = postSort;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public boolean isFlag() {
return flag;
}
public void setFlag(boolean flag) {
this.flag = flag;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("postId", getPostId())
.append("postCode", getPostCode()).append("postName", getPostName()).append("postSort", getPostSort())
.append("status", getStatus()).append("createBy", getCreateBy()).append("createTime", getCreateTime())
.append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark())
.toString();
}
}

6
op-modules/op-mes/src/main/java/com/op/mes/domain/dto/ProEmbryoScrapDto.java
Unescape Escape View File

@ -0,0 +1,6 @@
package com.op.mes.domain.dto;
import com.op.mes.domain.ProEmbryoScrap;
public class ProEmbryoScrapDto extends ProEmbryoScrap {
}

6
op-modules/op-mes/src/main/java/com/op/mes/domain/vo/ProEmbryoScrapVo.java
Unescape Escape View File

@ -0,0 +1,6 @@
package com.op.mes.domain.vo;
import com.op.mes.domain.ProEmbryoScrap;
public class ProEmbryoScrapVo extends ProEmbryoScrap {
}

75
op-modules/op-mes/src/main/java/com/op/mes/mapper/ProEmbryoScrapDetailMapper.java
Unescape Escape View File

@ -0,0 +1,75 @@
package com.op.mes.mapper;
import java.util.List;
import com.op.mes.domain.ProEmbryoScrapDetail;
/**
* 【请填写功能名称】Mapper接口
*
* @author Open Platform
* @date 2023-08-01
*/
public interface ProEmbryoScrapDetailMapper {
/**
* 查询报废详情
*
* @param id 报废详情主键
* @return 报废详情
*/
public ProEmbryoScrapDetail selectProEmbryoScrapDetailById(String id);
/**
* 查询报废详情列表
*
* @param proEmbryoScrapDetail 报废详情
* @return 报废详情集合
*/
public List<ProEmbryoScrapDetail> selectProEmbryoScrapDetailList(ProEmbryoScrapDetail proEmbryoScrapDetail);
/**
* 新增报废详情
*
* @param proEmbryoScrapDetail 报废详情
* @return 结果
*/
public int insertProEmbryoScrapDetail(ProEmbryoScrapDetail proEmbryoScrapDetail);
/**
* 修改报废详情
*
* @param proEmbryoScrapDetail 报废详情
* @return 结果
*/
public int updateProEmbryoScrapDetail(ProEmbryoScrapDetail proEmbryoScrapDetail);
/**
* 删除报废详情
*
* @param id 报废详情主键
* @return 结果
*/
public int deleteProEmbryoScrapDetailById(String id);
/**
* 批量删除报废详情
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteProEmbryoScrapDetailByIds(String[] ids);
/**
* 根据工单号查询一个报废单详情对象
* @param code
* @return
*/
public ProEmbryoScrapDetail selectScrapDetailByCode(String code);
/**
* 根据codes删除详情表中内容
* @param codes
* @return
*/
public int deleteProEmbryoScrapDetails(String[] codes);
}

109
op-modules/op-mes/src/main/java/com/op/mes/mapper/ProEmbryoScrapMapper.java
Unescape Escape View File

@ -0,0 +1,109 @@
package com.op.mes.mapper;
import java.util.List;
import com.op.mes.domain.ProEmbryoScrap;
import com.op.mes.domain.ProOrderWorkorder;
import com.op.mes.domain.Product;
import com.op.mes.domain.SysPost;
/**
* 报废Mapper接口
*
* @author Open Platform
* @date 2023-08-01
*/
public interface ProEmbryoScrapMapper {
/**
* 查询报废
*
* @param id 报废主键
* @return 报废
*/
public ProEmbryoScrap selectProEmbryoScrapById(String id);
/**
* 查询报废列表
*
* @param proEmbryoScrap 报废
* @return 报废集合
*/
public List<ProEmbryoScrap> selectProEmbryoScrapList(ProEmbryoScrap proEmbryoScrap);
/**
* 新增报废
*
* @param proEmbryoScrap 报废
* @return 结果
*/
public int insertProEmbryoScrap(ProEmbryoScrap proEmbryoScrap);
/**
* 修改报废
*
* @param proEmbryoScrap 报废
* @return 结果
*/
public int updateProEmbryoScrap(ProEmbryoScrap proEmbryoScrap);
/**
* 删除报废
*
* @param id 报废主键
* @return 结果
*/
public int deleteProEmbryoScrapById(String id);
/**
* 批量删除报废
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteProEmbryoScrapByIds(String[] ids);
//查询所有工单
public List<ProOrderWorkorder> selectAllWorkorder();
//自定义查询所有（物料）
// public List<ProEmbryoScrap> selectProEmbryoScrap();
//查詢所有物料名称
public List<Product> showAllMaterial();
//查询工位详细信息
public List<SysPost> showSysPost();
/**
* 根据id查询物料信息
* @param id
* @return
*/
public Product selectProductById(String id);
/**
* 根据id查询岗位信息
* @param id
* @return
*/
public SysPost selectPostById(String id);
/**
* 根据产品的id查工单信息
* @param id
* @return
*/
public ProOrderWorkorder selectOrderWorkByProductId(String id);
/**
* 根据报废单的id查询岗位和物料信息
* @param id
* @return
*/
public ProEmbryoScrap selectPostAndMaterialSelectById(String id);
public List<ProEmbryoScrap> selectManyProEmbryScrap(String[] ids);
}

69
op-modules/op-mes/src/main/java/com/op/mes/service/IProEmbryoScrapDetailService.java
Unescape Escape View File

@ -0,0 +1,69 @@
package com.op.mes.service;
import java.util.List;
import com.op.mes.domain.ProEmbryoScrapDetail;
/**
* 报废详情Service接口
*
* @author Open Platform
* @date 2023-08-01
*/
public interface IProEmbryoScrapDetailService {
/**
* 查询报废详情
*
* @param id 报废详情主键
* @return 报废详情
*/
public ProEmbryoScrapDetail selectProEmbryoScrapDetailById(String id);
/**
* 查询报废详情列表
*
* @param proEmbryoScrapDetail 报废详情
* @return 报废详情集合
*/
public List<ProEmbryoScrapDetail> selectProEmbryoScrapDetailList(ProEmbryoScrapDetail proEmbryoScrapDetail);
/**
* 新增报废详情
*
* @param proEmbryoScrapDetail 报废详情
* @return 结果
*/
public int insertProEmbryoScrapDetail(ProEmbryoScrapDetail proEmbryoScrapDetail);
/**
* 修改报废详情
*
* @param proEmbryoScrapDetail 报废详情
* @return 结果
*/
public int updateProEmbryoScrapDetail(ProEmbryoScrapDetail proEmbryoScrapDetail);
/**
* 批量删除报废详情
*
* @param ids 需要删除的报废详情主键集合
* @return 结果
*/
public int deleteProEmbryoScrapDetailByIds(String[] ids);
/**
* 删除报废详情信息
*
* @param id 报废详情主键
* @return 结果
*/
public int deleteProEmbryoScrapDetailById(String id);
// /**
// * 根据一个报废单号查询一个报废单明细对象
// * @param code
// * @return
// */
// public ProEmbryoScrapDetail selectScrapDetailByCode(String code);
}

92
op-modules/op-mes/src/main/java/com/op/mes/service/IProEmbryoScrapService.java
Unescape Escape View File

@ -0,0 +1,92 @@
package com.op.mes.service;
import java.util.List;
import com.op.mes.domain.ProEmbryoScrap;
import com.op.mes.domain.ProOrderWorkorder;
import com.op.mes.domain.Product;
import com.op.mes.domain.SysPost;
/**
* 【请填写功能名称】Service接口
*
* @author Open Platform
* @date 2023-08-01
*/
public interface IProEmbryoScrapService {
/**
* 查询报废
*
* @param id 报废主键
* @return 报废
*/
public ProEmbryoScrap selectProEmbryoScrapById(String id);
/**
* 查询报废列表
*
* @param proEmbryoScrap 报废
* @return 报废集合
*/
public List<ProEmbryoScrap> selectProEmbryoScrapList(ProEmbryoScrap proEmbryoScrap);
/**
* 新增报废
*
* @param proEmbryoScrap 报废
* @return 结果
*/
public int insertProEmbryoScrap(ProEmbryoScrap proEmbryoScrap);
/**
* 修改报废
*
* @param proEmbryoScrap 报废
* @return 结果
*/
public int updateProEmbryoScrap(ProEmbryoScrap proEmbryoScrap);
/**
* 批量删除 报废
*
* @param ids 需要删除的报废主键集合
* @return 结果
*/
public int deleteProEmbryoScrapByIds(String[] ids);
/**
* 删除报废信息
*
* @param id 报废主键
* @return 结果
*/
public int deleteProEmbryoScrapById(String id);
/*
* 查询所有（物料）
* */
// public List<ProEmbryoScrap> selectProEmbryoScrap();
//查詢所有物料名称
public List<Product> showAllMaterial();
//查询所有工位信息
public List<SysPost> showSysPost();
//查询所有工单
public List<ProOrderWorkorder> selectAllWorkOrder();
/**
* 根据id查询物料
* @param id
* @return
*/
public Product selectProductById(String id);
/**
* 根据id查询工位信息
* @param id
* @return
*/
public SysPost selectPostById(String id);
}

117
op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProEmbryoScrapDetailServiceImpl.java
Unescape Escape View File

@ -0,0 +1,117 @@
package com.op.mes.service.impl;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.mes.domain.ProEmbryoScrap;
import com.op.mes.domain.ProOrderWorkorder;
import com.op.mes.mapper.ProEmbryoScrapMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.mes.mapper.ProEmbryoScrapDetailMapper;
import com.op.mes.domain.ProEmbryoScrapDetail;
import com.op.mes.service.IProEmbryoScrapDetailService;
/**
* 报废详情Service业务层处理
*
* @author Open Platform
* @date 2023-08-01
*/
@Service
public class ProEmbryoScrapDetailServiceImpl implements IProEmbryoScrapDetailService {
@Autowired
private ProEmbryoScrapDetailMapper proEmbryoScrapDetailMapper;
@Autowired ProEmbryoScrapMapper proEmbryoScrapMapper;
/**
* 查询报废详情
*
* @param id 报废详情主键
* @return 报废详情
*/
@Override
@DS("#header.poolName")
public ProEmbryoScrapDetail selectProEmbryoScrapDetailById(String id) {
return proEmbryoScrapDetailMapper.selectProEmbryoScrapDetailById(id);
}
/**
* 查询报废详情列表
*
* @param proEmbryoScrapDetail 报废详情
* @return 报废详情
*/
@Override
@DS("#header.poolName")
public List<ProEmbryoScrapDetail> selectProEmbryoScrapDetailList(ProEmbryoScrapDetail proEmbryoScrapDetail) {
return proEmbryoScrapDetailMapper.selectProEmbryoScrapDetailList(proEmbryoScrapDetail);
}
/**
* 新增报废详情
*
* @param proEmbryoScrapDetail 报废详情
* @return 结果
*/
@Override
@DS("#header.poolName")
public int insertProEmbryoScrapDetail(ProEmbryoScrapDetail proEmbryoScrapDetail) {
proEmbryoScrapDetail.setCreateTime(DateUtils.getNowDate());
return proEmbryoScrapDetailMapper.insertProEmbryoScrapDetail(proEmbryoScrapDetail);
}
/**
* 修改报废详情
*
* @param proEmbryoScrapDetail 报废详情
* @return 结果
*/
@Override
@DS("#header.poolName")
public int updateProEmbryoScrapDetail(ProEmbryoScrapDetail proEmbryoScrapDetail) {
proEmbryoScrapDetail.setUpdateTime(DateUtils.getNowDate());
return proEmbryoScrapDetailMapper.updateProEmbryoScrapDetail(proEmbryoScrapDetail);
}
/**
* 批量删除报废详情
*
* @param ids 需要删除的报废详情主键
* @return 结果
*/
@Override
@DS("#header.poolName")
public int deleteProEmbryoScrapDetailByIds(String[] ids) {
return proEmbryoScrapDetailMapper.deleteProEmbryoScrapDetailByIds(ids);
}
/**
* 删除报废详情信息
*
* @param id 报废详情主键
* @return 结果
*/
@Override
@DS("#header.poolName")
public int deleteProEmbryoScrapDetailById(String id) {
return proEmbryoScrapDetailMapper.deleteProEmbryoScrapDetailById(id);
}
// /**
// * 根据一个报废单号查询一个报废单明细对象
// * @param code
// * @return
// */
// @Override
// public ProEmbryoScrapDetail selectScrapDetailByCode(String code) {
// return proEmbryoScrapDetailMapper.selectScrapDetailByCode(code);
// }
}

223
op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProEmbryoScrapServiceImpl.java
Unescape Escape View File

@ -0,0 +1,223 @@
package com.op.mes.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.context.SecurityContextHolder;
import com.op.common.core.exception.ServiceException;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.mes.domain.*;
import com.op.mes.mapper.ProEmbryoScrapDetailMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.mes.mapper.ProEmbryoScrapMapper;
import com.op.mes.service.IProEmbryoScrapService;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import sun.plugin.javascript.navig.Array;
/**
* 报废Service业务层处理
*
* @author Open Platform
* @date 2023-08-01
*/
@Service
public class ProEmbryoScrapServiceImpl implements IProEmbryoScrapService {
@Autowired
private ProEmbryoScrapMapper proEmbryoScrapMapper;
@Autowired
private ProEmbryoScrapDetailMapper proEmbryoScrapDetailMapper;
/**
* 查询报废
*
* @param id 报废主键
* @return 报废
*/
@Override
@DS("#header.poolName")
public ProEmbryoScrap selectProEmbryoScrapById(String id) {
// ProEmbryoScrap proEmbryoScrap = proEmbryoScrapMapper.selectPostAndMaterialSelectById(id);
return proEmbryoScrapMapper.selectProEmbryoScrapById(id);
//proEmbryoScrap;
}
/**
* 查询报废列表
*
* @param proEmbryoScrap 报废
* @return 报废
*/
@Override
@DS("#header.poolName")
public List<ProEmbryoScrap> selectProEmbryoScrapList(ProEmbryoScrap proEmbryoScrap) {
return proEmbryoScrapMapper.selectProEmbryoScrapList(proEmbryoScrap);
}
/**
* 新增报废
*
* @param proEmbryoScrap 报废
* @return 结果
*/
@Override
@DS("#header.poolName")
@Transactional(rollbackFor = Exception.class)
public int insertProEmbryoScrap(ProEmbryoScrap proEmbryoScrap) {
proEmbryoScrap.setId(IdUtils.fastSimpleUUID());
proEmbryoScrap.setCreateBy(SecurityContextHolder.getUserName());
proEmbryoScrap.setUpdateBy(SecurityContextHolder.getUserName());
proEmbryoScrap.setUpdateTime(DateUtils.getNowDate());
proEmbryoScrap.setCreateTime(DateUtils.getNowDate());
//报废表添加数据-添加物料信息
Product product = proEmbryoScrapMapper.selectProductById(proEmbryoScrap.getMaterialId());
proEmbryoScrap.setMaterialName(product.getProductDesc());
proEmbryoScrap.setMaterialCode(product.getProductCode());
/**
* 报废表添加数据-添加工单信息
*/
SysPost sysPost = proEmbryoScrapMapper.selectPostById(proEmbryoScrap.getWorkCellId());
proEmbryoScrap.setWorkCellCode(sysPost.getPostCode());
proEmbryoScrap.setWorkCellName(sysPost.getPostName());
proEmbryoScrapMapper.insertProEmbryoScrap(proEmbryoScrap);
//todo 向详情表添加一条数据
ProEmbryoScrapDetail proEmbryoScrapDetail = new ProEmbryoScrapDetail();
proEmbryoScrapDetail.setId(IdUtils.fastSimpleUUID());
proEmbryoScrapDetail.setScrapCode(proEmbryoScrap.getScrapCode());
proEmbryoScrapDetail.setMaterialId(proEmbryoScrap.getMaterialId());
proEmbryoScrapDetail.setMaterialCode(proEmbryoScrap.getMaterialCode());
proEmbryoScrapDetail.setMaterialName(proEmbryoScrap.getMaterialName());
// todo 根据产品的id查工单的信息
ProOrderWorkorder proOrderWorkorder = proEmbryoScrapMapper.selectOrderWorkByProductId(proEmbryoScrap.getMaterialId());
if (ObjectUtils.isEmpty(proOrderWorkorder)) {
throw new ServiceException("该物料下没有对应的工单！");
}
proEmbryoScrapDetail.setWorkorderId(proOrderWorkorder.getWorkorderId());
proEmbryoScrapDetail.setWorkorderCode(proOrderWorkorder.getWorkorderCode());
proEmbryoScrapDetail.setScrapQuality(proEmbryoScrap.getScrapQuality());
proEmbryoScrapDetail.setUnit(proEmbryoScrap.getUnit());
proEmbryoScrapDetail.setStatus(proEmbryoScrap.getStatus());
proEmbryoScrapDetail.setCreateTime(proEmbryoScrap.getCreateTime());
proEmbryoScrapDetail.setUpdateTime(proEmbryoScrap.getUpdateTime());
proEmbryoScrapDetail.setCreateBy(proEmbryoScrap.getCreateBy());
proEmbryoScrapDetail.setUpdateBy(proEmbryoScrap.getUpdateBy());
// todo 向详情表中添加
return proEmbryoScrapDetailMapper.insertProEmbryoScrapDetail(proEmbryoScrapDetail);
}
/**
* 修改报废
*
* @param proEmbryoScrap 报废
* @return 结果
*/
@Override
@DS("#header.poolName")
public int updateProEmbryoScrap(ProEmbryoScrap proEmbryoScrap) {
ProEmbryoScrapDetail proEmbryoScrapDetail = proEmbryoScrapDetailMapper.selectScrapDetailByCode(proEmbryoScrap.getScrapCode());
if (!ObjectUtils.isEmpty(proEmbryoScrapDetail)) {
proEmbryoScrapDetail.setScrapCode(proEmbryoScrap.getScrapCode());
proEmbryoScrapDetail.setMaterialId(proEmbryoScrap.getMaterialId());
proEmbryoScrapDetail.setMaterialCode(proEmbryoScrap.getMaterialCode());
proEmbryoScrapDetail.setMaterialName(proEmbryoScrap.getMaterialName());
proEmbryoScrapDetail.setScrapQuality(proEmbryoScrap.getScrapQuality());
proEmbryoScrapDetail.setStatus(proEmbryoScrap.getStatus());
proEmbryoScrapDetail.setUnit(proEmbryoScrap.getUnit());
proEmbryoScrap.setUpdateTime(DateUtils.getNowDate());
proEmbryoScrapDetail.setUpdateTime(DateUtils.getNowDate());
}
proEmbryoScrapMapper.updateProEmbryoScrap(proEmbryoScrap);
return proEmbryoScrapDetailMapper.updateProEmbryoScrapDetail(proEmbryoScrapDetail);
}
/**
* 批量删除报废
*
* @param ids 需要删除的报废主键
* @return 结果
*/
@Override
@DS("#header.poolName")
public int deleteProEmbryoScrapByIds(String[] ids) {
ArrayList<String> strings = new ArrayList<>();
List<ProEmbryoScrap> proEmbryoScraps = proEmbryoScrapMapper.selectManyProEmbryScrap(ids);
for (ProEmbryoScrap proEmbryoScrap : proEmbryoScraps) {
strings.add(proEmbryoScrap.getScrapCode());
}
String[] codes= strings.toArray(new String[0]);
proEmbryoScrapDetailMapper.deleteProEmbryoScrapDetails(codes);
return proEmbryoScrapMapper.deleteProEmbryoScrapByIds(ids);
}
/**
* 删除报废信息
*
* @param id 报废主键
* @return 结果
*/
@Override
@DS("#header.poolName")
public int deleteProEmbryoScrapById(String id) {
return proEmbryoScrapMapper.deleteProEmbryoScrapById(id);
}
// @Override
// public List<ProEmbryoScrap> selectProEmbryoScrap() {
// return proEmbryoScrapMapper.selectProEmbryoScrap();
// }
//查询所有物料名称
@Override
@DS("#header.poolName")
public List<Product> showAllMaterial() {
return proEmbryoScrapMapper.showAllMaterial();
}
//查询工位信息
@Override
@DS("#header.poolName")
public List<SysPost> showSysPost() {
return proEmbryoScrapMapper.showSysPost();
}
/**
* 查询工单信息
* @return
*/
@Override
@DS("#header.poolName")
public List<ProOrderWorkorder> selectAllWorkOrder() {
return proEmbryoScrapMapper.selectAllWorkorder();
}
/**
* 根据Id查询物料信息
* @param id
* @return
*/
@Override
@DS("#header.poolName")
public Product selectProductById(String id) {
return proEmbryoScrapMapper.selectProductById(id);
}
/**
* 根据id查询工位信息
* @param id
* @return
*/
@Override
@DS("#header.poolName")
public SysPost selectPostById(String id) {
return proEmbryoScrapMapper.selectPostById(id);
}
}

4
op-modules/op-mes/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,12 +14,12 @@ spring:
nacos:
discovery:
namespace: lanju-op
group: zxl
group: chj
# 服务注册地址
server-addr: 140.249.53.142:8848
config:
namespace: lanju-op
group: zxl
group: chj
#命名空间
#group: local
# 配置中心地址

158
op-modules/op-mes/src/main/resources/mapper/mes/ProEmbryoScrapDetailMapper.xml
Unescape Escape View File

@ -0,0 +1,158 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.mes.mapper.ProEmbryoScrapDetailMapper">
<resultMap type="ProEmbryoScrapDetail" id="ProEmbryoScrapDetailResult">
<result property="id" column="id" />
<result property="scrapCode" column="scrap_code" />
<result property="workorderId" column="workorder_id" />
<result property="workorderCode" column="workorder_code" />
<result property="materialId" column="material__id" />
<result property="materialCode" column="material_code" />
<result property="materialName" column="material_name" />
<result property="scrapQuality" column="scrap_quality" />
<result property="unit" column="unit" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="attr4" column="attr4" />
<result property="active" column="active" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectProEmbryoScrapDetailVo">
select id, scrap_code, workorder_id, workorder_code, material__id, material_code, material_name, scrap_quality, unit, status, remark, attr1, attr2, attr3, attr4, active, create_by, create_time, update_by, update_time from pro_embryo_scrap_detail
</sql>
<select id="selectProEmbryoScrapDetailList" parameterType="ProEmbryoScrapDetail" resultMap="ProEmbryoScrapDetailResult">
<include refid="selectProEmbryoScrapDetailVo"/>
<where>
<if test="scrapCode != null and scrapCode != ''"> and scrap_code = #{scrapCode}</if>
<if test="workorderId != null and workorderId != ''"> and workorder_id = #{workorderId}</if>
<if test="workorderCode != null and workorderCode != ''"> and workorder_code = #{workorderCode}</if>
<if test="materialId != null and materialId != ''"> and material__id = #{materialId}</if>
<if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
<if test="scrapQuality != null "> and scrap_quality = #{scrapQuality}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null "> and attr3 = #{attr3}</if>
<if test="attr4 != null "> and attr4 = #{attr4}</if>
<if test="active != null and active != ''"> and active = #{active}</if>
</where>
</select>
<select id="selectProEmbryoScrapDetailById" parameterType="String" resultMap="ProEmbryoScrapDetailResult">
<include refid="selectProEmbryoScrapDetailVo"/>
where id = #{id}
</select>
<!-- 根据报废单号查询一个报废单详情对象-->
<select id="selectScrapDetailByCode" resultMap="ProEmbryoScrapDetailResult">
SELECT
id,scrap_code,workorder_id,workorder_code,material__id,material_code,
material_name,scrap_quality,unit,status,remark,attr1,attr2,attr3,attr4,
active,create_by,create_time,update_by,update_time
FROM pro_embryo_scrap_detail
WHERE scrap_code= #{code}
</select>
<insert id="insertProEmbryoScrapDetail" parameterType="ProEmbryoScrapDetail">
insert into pro_embryo_scrap_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="scrapCode != null">scrap_code,</if>
<if test="workorderId != null and workorderId != ''">workorder_id,</if>
<if test="workorderCode != null">workorder_code,</if>
<if test="materialId != null">material__id,</if>
<if test="materialCode != null">material_code,</if>
<if test="materialName != null">material_name,</if>
<if test="scrapQuality != null">scrap_quality,</if>
<if test="unit != null">unit,</if>
<if test="status != null">status,</if>
<if test="remark != null">remark,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
<if test="attr4 != null">attr4,</if>
<if test="active != null">active,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="scrapCode != null">#{scrapCode},</if>
<if test="workorderId != null and workorderId != ''">#{workorderId},</if>
<if test="workorderCode != null">#{workorderCode},</if>
<if test="materialId != null">#{materialId},</if>
<if test="materialCode != null">#{materialCode},</if>
<if test="materialName != null">#{materialName},</if>
<if test="scrapQuality != null">#{scrapQuality},</if>
<if test="unit != null">#{unit},</if>
<if test="status != null">#{status},</if>
<if test="remark != null">#{remark},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="attr4 != null">#{attr4},</if>
<if test="active != null">#{active},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateProEmbryoScrapDetail" parameterType="ProEmbryoScrapDetail">
update pro_embryo_scrap_detail
<trim prefix="SET" suffixOverrides=",">
<if test="scrapCode != null">scrap_code = #{scrapCode},</if>
<if test="workorderId != null and workorderId != ''">workorder_id = #{workorderId},</if>
<if test="workorderCode != null">workorder_code = #{workorderCode},</if>
<if test="materialId != null">material__id = #{materialId},</if>
<if test="materialCode != null">material_code = #{materialCode},</if>
<if test="materialName != null">material_name = #{materialName},</if>
<if test="scrapQuality != null">scrap_quality = #{scrapQuality},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="attr4 != null">attr4 = #{attr4},</if>
<if test="active != null">active = #{active},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteProEmbryoScrapDetailById" parameterType="String">
delete from pro_embryo_scrap_detail where id = #{id}
</delete>
<delete id="deleteProEmbryoScrapDetailByIds" parameterType="String">
delete from pro_embryo_scrap_detail where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<delete id="deleteProEmbryoScrapDetails">
delete from pro_embryo_scrap_detail where scrap_code in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

281
op-modules/op-mes/src/main/resources/mapper/mes/ProEmbryoScrapMapper.xml
Unescape Escape View File

@ -0,0 +1,281 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.mes.mapper.ProEmbryoScrapMapper">
<resultMap type="com.op.mes.domain.ProOrderWorkorder" id="ProOrderWorkorderResult">
<result property="workorderId" column="workorder_id" />
<result property="workorderCode" column="workorder_code" />
<result property="workorderName" column="workorder_name" />
<result property="orderId" column="order_id" />
<result property="orderCode" column="order_code" />
<result property="productId" column="product_id" />
<result property="productCode" column="product_code" />
<result property="productName" column="product_name" />
<result property="productSpc" column="product_spc" />
<result property="unit" column="unit" />
<result property="quantityProduced" column="quantity_produced" />
<result property="quantitySplit" column="quantity_split" />
<result property="routeCode" column="route_code" />
<result property="prodLineCode" column="prod_line_code" />
<result property="productDate" column="product_date" />
<result property="shiftId" column="shift_id" />
<result property="parentOrder" column="parent_order" />
<result property="ancestors" column="ancestors" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="attr4" column="attr4" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="prodType" column="prod_type" />
<result property="factoryCode" column="factory_code" />
<result property="isEnd" column="is_end" />
<result property="materialId" column="material_id"/>
</resultMap>
<!-- 查询工位信息的Map-->
<resultMap id="showSysPost" type="com.op.mes.domain.SysPost">
<result property="postId" column="post_id"/>
<result property="postCode" column="post_code"/>
<result property="postName" column="post_name"/>
</resultMap>
<resultMap type="com.op.mes.domain.ProEmbryoScrap" id="ProEmbryoScrapResult">
<result property="id" column="id" />
<result property="scrapCode" column="scrap_code" />
<result property="materialId" column="material__id" />
<result property="materialCode" column="material_code" />
<result property="materialName" column="material_name" />
<result property="workCellId" column="work_cell_id" />
<result property="workCellCode" column="work_cell_code" />
<result property="workCellName" column="work_cell_name" />
<result property="scrapQuality" column="scrap_quality" />
<result property="unit" column="unit" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="attr4" column="attr4" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="active" column="active" />
</resultMap>
<resultMap id="showAllProduct" type="com.op.mes.domain.Product">
<result property="productId" column="product_id"/>
<result property="productCode" column="product_code"/>
<result property="productDesc" column="product_desc_zh"/>
</resultMap>
<sql id="selectProEmbryoScrapVo">
select id, scrap_code, material__id, material_code, material_name,
work_cell_id, work_cell_code, work_cell_name, scrap_quality,
unit, status, remark, attr1, attr2, attr3, attr4, create_by,
create_time, update_by, update_time, active from pro_embryo_scrap
</sql>
<select id="selectProEmbryoScrapList" parameterType="ProEmbryoScrap" resultMap="ProEmbryoScrapResult">
<include refid="selectProEmbryoScrapVo"/>
<where>
<if test="scrapCode != null and scrapCode != ''"> and scrap_code = #{scrapCode}</if>
<if test="materialId != null and materialId != ''"> and material__id = #{materialId}</if>
<if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
<if test="workCellId != null and workCellId != ''"> and work_cell_id = #{workCellId}</if>
<if test="workCellCode != null and workCellCode != ''"> and work_cell_code = #{workCellCode}</if>
<if test="workCellName != null and workCellName != ''"> and work_cell_name like concat('%', #{workCellName}, '%')</if>
<if test="scrapQuality != null "> and scrap_quality = #{scrapQuality}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null "> and attr3 = #{attr3}</if>
<if test="attr4 != null "> and attr4 = #{attr4}</if>
<if test="active != null and active != ''"> and active = #{active}</if>
</where>
</select>
<select id="selectProEmbryoScrapById" parameterType="String" resultMap="ProEmbryoScrapResult">
<include refid="selectProEmbryoScrapVo"/>
where id = #{id}
</select>
<select id="selectAllWorkorder" resultMap="ProOrderWorkorderResult">
select workorder_id, workorder_code, workorder_name, order_id, order_code,
product_id, product_code, product_name, product_spc, unit,
quantity_produced, quantity_split, route_code, prod_line_code,
product_date, shift_id, parent_order, ancestors, status, remark, attr1,
attr2, attr3, attr4, create_by, create_time, update_by, update_time,
prod_type, factory_code , is_end from pro_order_workorder
</select>
<!--&lt;!&ndash; 查询所有（物料）&ndash;&gt;-->
<!-- <select id="selectProEmbryoScrap" resultMap="ProEmbryoScrapResult">-->
<!-- select id, scrap_code, material__id, material_code, material_name,-->
<!-- work_cell_id, work_cell_code, work_cell_name, scrap_quality,-->
<!-- unit, status, remark, attr1, attr2, attr3, attr4, create_by,-->
<!-- create_time, update_by, update_time, active from pro_embryo_scrap-->
<!-- </select>-->
<select id="showAllMaterial" resultMap="showAllProduct">
select
product_id,
product_code,
product_desc_zh
from
base_product GROUP BY product_id,
product_code,
product_desc_zh
</select>
<!-- 查询所有的工位信息-->
<select id="showSysPost" resultMap="showSysPost">
SELECT
sys_post.post_id,
sys_post.post_code,
sys_post.post_name
FROM
sys_post
</select>
<select id="selectProductById" resultMap="showAllProduct">
select
product_code,
product_desc_zh
from
base_product where product_id=#{id}
</select>
<!-- 根据id查询岗位信息-->
<select id="selectPostById" resultMap="showSysPost">
SELECT
sys_post.post_code,
sys_post.post_name
FROM
sys_post where sys_post.post_id=#{id}
</select>
<!-- 根据产品的信息查工单的id-->
<select id="selectOrderWorkByProductId" resultMap="ProOrderWorkorderResult">
select workorder_id, workorder_code
from pro_order_workorder where material_id=#{id}
</select>
<!-- 根据报废单的id查询岗位和物料信息-->
<select id="selectPostAndMaterialSelectById" resultMap="ProEmbryoScrapResult">
SELECT
scrap_code,
material__id,
material_code,
material_name,
work_cell_id,work_cell_code,
work_cell_name,scrap_quality,
unit,status,remark,attr1,attr2,attr3,
attr4,create_by,create_time,update_by,update_time,
active
FROM
pro_embryo_scrap
WHERE id=#{id}
</select>
<select id="selectManyProEmbryScrap" resultMap="ProEmbryoScrapResult">
select scrap_code from pro_embryo_scrap where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</select>
<insert id="insertProEmbryoScrap" parameterType="com.op.mes.domain.ProEmbryoScrap">
insert into pro_embryo_scrap
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="scrapCode != null">scrap_code,</if>
<if test="materialId != null">material__id,</if>
<if test="materialCode != null">material_code,</if>
<if test="materialName != null">material_name,</if>
<if test="workCellId != null">work_cell_id,</if>
<if test="workCellCode != null">work_cell_code,</if>
<if test="workCellName != null">work_cell_name,</if>
<if test="scrapQuality != null">scrap_quality,</if>
<if test="unit != null">unit,</if>
<if test="status != null">status,</if>
<if test="remark != null">remark,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
<if test="attr4 != null">attr4,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="active != null">active,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="scrapCode != null">#{scrapCode},</if>
<if test="materialId != null">#{materialId},</if>
<if test="materialCode != null">#{materialCode},</if>
<if test="materialName != null">#{materialName},</if>
<if test="workCellId != null">#{workCellId},</if>
<if test="workCellCode != null">#{workCellCode},</if>
<if test="workCellName != null">#{workCellName},</if>
<if test="scrapQuality != null">#{scrapQuality},</if>
<if test="unit != null">#{unit},</if>
<if test="status != null">#{status},</if>
<if test="remark != null">#{remark},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="attr4 != null">#{attr4},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="active != null">#{active},</if>
</trim>
</insert>
<update id="updateProEmbryoScrap" parameterType="com.op.mes.domain.ProEmbryoScrap">
update pro_embryo_scrap
<trim prefix="SET" suffixOverrides=",">
<if test="scrapCode != null">scrap_code = #{scrapCode},</if>
<if test="materialId != null">material__id = #{materialId},</if>
<if test="materialCode != null">material_code = #{materialCode},</if>
<if test="materialName != null">material_name = #{materialName},</if>
<if test="workCellId != null">work_cell_id = #{workCellId},</if>
<if test="workCellCode != null">work_cell_code = #{workCellCode},</if>
<if test="workCellName != null">work_cell_name = #{workCellName},</if>
<if test="scrapQuality != null">scrap_quality = #{scrapQuality},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="attr4 != null">attr4 = #{attr4},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="active != null">active = #{active},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteProEmbryoScrapById" parameterType="String">
delete from pro_embryo_scrap where id = #{id}
</delete>
<delete id="deleteProEmbryoScrapByIds" parameterType="String">
delete from pro_embryo_scrap where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
Write Preview
Loading…
Cancel
Save