Merge remote-tracking branch 'origin/master'
commit
cf0d987365
@ -0,0 +1,91 @@
|
||||
main [17:25:52:968]: ******************** Wed Dec 13 17:25:52 CST 2023 ***************************
|
||||
main [17:25:52:968]: SAP Java Connector (JCo) runtime information
|
||||
main [17:25:52:968]: Java Runtime:
|
||||
main [17:25:52:968]: Operating System : Windows 11 10.0 for amd64
|
||||
main [17:25:52:968]: Java VM : 1.8.0_321 Oracle Corporation
|
||||
main [17:25:52:968]: Java Codepage : UTF8
|
||||
main [17:25:52:968]: Versions:
|
||||
main [17:25:52:968]: JCo API : 3.0.8 (2011-11-28)
|
||||
main [17:25:52:968]: JCo middleware name : JavaRfc
|
||||
main [17:25:52:969]: JCo middleware : 2.2.7
|
||||
main [17:25:52:969]: JCo middleware native : 721.619
|
||||
main [17:25:52:969]: JCo library : D:\KHDF\op-modules\op-sap\sapjco3.dll
|
||||
main [17:25:52:969]:
|
||||
main [17:25:52:969]: ******************** Configuration ***************************
|
||||
jco.trace_level = 1
|
||||
jco.trace_path = .
|
||||
|
||||
|
||||
main [17:25:52:969]: *********************************************************************
|
||||
main [17:25:52:969]: Exception while setting system property to JCo property: jco.cpic_maxconv=202 com.sap.conn.jco.JCoRuntimeException: (131) JCO_ERROR_ILLEGAL_ARGUMENT: Value of property jco.cpic_maxconv causes null
|
||||
at com.sap.conn.jco.rt.JCoRuntime.setPropertyValue(JCoRuntime.java:888)
|
||||
at com.sap.conn.jco.rt.DefaultJCoRuntime.setPropertyValue(DefaultJCoRuntime.java:577)
|
||||
at com.sap.conn.jco.rt.JCoRuntime.setSystemProperty(JCoRuntime.java:149)
|
||||
at com.sap.conn.jco.rt.DefaultJCoRuntime.readSystemProperties(DefaultJCoRuntime.java:100)
|
||||
at com.sap.conn.jco.rt.JCoRuntimeFactory.<clinit>(JCoRuntimeFactory.java:24)
|
||||
at java.lang.Class.forName0(Native Method)
|
||||
at java.lang.Class.forName(Class.java:264)
|
||||
at com.sap.conn.jco.JCo.createJCo(JCo.java:52)
|
||||
at com.sap.conn.jco.JCo.<clinit>(JCo.java:26)
|
||||
at com.sap.conn.jco.JCoDestinationManager.getDestination(JCoDestinationManager.java:77)
|
||||
at com.op.sap.util.SAPConnUtils.connect(SAPConnUtils.java:24)
|
||||
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
|
||||
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
|
||||
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
|
||||
at java.lang.reflect.Method.invoke(Method.java:498)
|
||||
at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:154)
|
||||
at org.springframework.beans.factory.support.ConstructorResolver.instantiate(ConstructorResolver.java:653)
|
||||
at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:486)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1352)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1195)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:582)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:542)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335)
|
||||
at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208)
|
||||
at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276)
|
||||
at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1391)
|
||||
at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1311)
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657)
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640)
|
||||
at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119)
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1431)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:619)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:542)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335)
|
||||
at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208)
|
||||
at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276)
|
||||
at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1391)
|
||||
at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1311)
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657)
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640)
|
||||
at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119)
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1431)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:619)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:542)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335)
|
||||
at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208)
|
||||
at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:955)
|
||||
at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:918)
|
||||
at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:583)
|
||||
at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:147)
|
||||
at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:731)
|
||||
at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:408)
|
||||
at org.springframework.boot.SpringApplication.run(SpringApplication.java:307)
|
||||
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1303)
|
||||
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1292)
|
||||
at com.op.sap.SapApplication.main(SapApplication.java:20)
|
||||
Caused by: java.lang.NullPointerException
|
||||
at com.sap.conn.rfc.engine.Trc.criticalTrace(Trc.java:472)
|
||||
at com.sap.conn.rfc.driver.CpicDriver.setCpicMaxConv(CpicDriver.java:1061)
|
||||
at com.sap.conn.rfc.engine.DefaultRfcRuntime.setCpicMaxConv(DefaultRfcRuntime.java:113)
|
||||
at com.sap.conn.jco.rt.JCoRuntime.setPropertyValue(JCoRuntime.java:873)
|
||||
... 63 more
|
||||
|
||||
@ -1,118 +1,74 @@
|
||||
|
||||
**** Error file opened at 20231205 092106 China Standard Time Rel 3.0.8 (2011-11-28) [721.619]
|
||||
Error: >Tue Dec 05 09:21:06,526< RfcException: [null]
|
||||
message: Connect to SAP gateway failed
|
||||
Connection parameters: TYPE=A DEST=ABAP_AS_WITH_POOL ASHOST=192.168.230.50 SYSNR=00 PCS=1
|
||||
|
||||
LOCATION CPIC (TCP/IP) on local host with Unicode
|
||||
ERROR partner '192.168.230.50:3300' not reached
|
||||
TIME Tue Dec 05 09:21:06 2023
|
||||
RELEASE 721
|
||||
COMPONENT NI (network interface)
|
||||
VERSION 40
|
||||
RC -10
|
||||
MODULE nixxi.cpp
|
||||
LINE 3283
|
||||
DETAIL NiPConnect2: 192.168.230.50:3300
|
||||
SYSTEM CALL connect
|
||||
ERRNO 10060
|
||||
ERRNO TEXT WSAETIMEDOUT: Connection timed out
|
||||
COUNTER 2
|
||||
|
||||
Return code: RFC_FAILURE(1)
|
||||
error group: 102
|
||||
key: RFC_ERROR_COMMUNICATION
|
||||
|
||||
Error: >Tue Dec 05 09:23:26,607< RfcException: [null]
|
||||
message: Connect to SAP gateway failed
|
||||
Connection parameters: TYPE=A DEST=ABAP_AS_WITH_POOL ASHOST=192.168.230.50 SYSNR=00 PCS=1
|
||||
|
||||
LOCATION CPIC (TCP/IP) on local host with Unicode
|
||||
ERROR partner '192.168.230.50:3300' not reached
|
||||
TIME Tue Dec 05 09:23:26 2023
|
||||
RELEASE 721
|
||||
COMPONENT NI (network interface)
|
||||
VERSION 40
|
||||
RC -10
|
||||
MODULE nixxi.cpp
|
||||
LINE 3283
|
||||
DETAIL NiPConnect2: 192.168.230.50:3300
|
||||
SYSTEM CALL connect
|
||||
ERRNO 10060
|
||||
ERRNO TEXT WSAETIMEDOUT: Connection timed out
|
||||
COUNTER 2
|
||||
|
||||
Return code: RFC_FAILURE(1)
|
||||
error group: 102
|
||||
key: RFC_ERROR_COMMUNICATION
|
||||
|
||||
|
||||
**** Error file opened at 20231205 100000 China Standard Time Rel 3.0.8 (2011-11-28) [721.619]
|
||||
Error: >Tue Dec 05 10:00:00,058< >RfcGetException rc (7) message: 数值范围对象 ZMESPROID 不存在
|
||||
<RfcGetException
|
||||
|
||||
Error: >Tue Dec 05 10:01:14,955< >RfcGetException rc (7) message: 数值范围对象 ZMESPROID 不存在
|
||||
<RfcGetException
|
||||
|
||||
|
||||
**** Error file opened at 20231208 164650 China Standard Time Rel 3.0.8 (2011-11-28) [721.619]
|
||||
Error: >Fri Dec 08 16:46:50,007< >RfcGetException rc (7) message: ##.#####,####
|
||||
<RfcGetException
|
||||
|
||||
Error: >Fri Dec 08 16:49:21,354< >RfcGetException rc (7) message: ##.#####,####
|
||||
<RfcGetException
|
||||
|
||||
|
||||
**** Error file opened at 20231208 165102 China Standard Time Rel 3.0.8 (2011-11-28) [721.619]
|
||||
Error: >Fri Dec 08 16:51:02,041< >RfcGetException rc (7) message: ##.#####,####
|
||||
<RfcGetException
|
||||
|
||||
|
||||
**** Error file opened at 20231211 151721 China Standard Time Rel 3.0.8 (2011-11-28) [721.619]
|
||||
Error: >Mon Dec 11 15:17:21,694< >RfcGetException rc (7) message: ##.#####,####
|
||||
<RfcGetException
|
||||
|
||||
|
||||
**** Error file opened at 20231211 160016 China Standard Time Rel 3.0.8 (2011-11-28) [721.619]
|
||||
Error: [1] >Mon Dec 11 16:00:16,825< RfcException: [DEV|erpdev]
|
||||
message: connection closed without message (CM_NO_DATA_RECEIVED)
|
||||
Return code: RFC_CLOSED(6)
|
||||
error group: 102
|
||||
key: RFC_ERROR_COMMUNICATION
|
||||
Exception raised by DEV|erpdev
|
||||
|
||||
|
||||
**** Error file opened at 20231211 172940 China Standard Time Rel 3.0.8 (2011-11-28) [721.619]
|
||||
Error: >Mon Dec 11 17:29:40,539< >RfcGetException rc (7) message: Syntax error in program SAPLZMES .
|
||||
<RfcGetException
|
||||
|
||||
Error: >Mon Dec 11 17:30:08,292< >RfcGetException rc (7) message: Syntax error in program SAPLZMES .
|
||||
<RfcGetException
|
||||
|
||||
Error: >Mon Dec 11 17:30:54,764< >RfcGetException rc (7) message: Syntax error in program SAPLZMES .
|
||||
<RfcGetException
|
||||
|
||||
|
||||
**** Error file opened at 20231211 173328 China Standard Time Rel 3.0.8 (2011-11-28) [721.619]
|
||||
Error: >Mon Dec 11 17:33:28,521< >RfcGetException rc (7) message: Syntax error in program SAPLZMES .
|
||||
<RfcGetException
|
||||
|
||||
Error: >Mon Dec 11 17:35:37,983< >RfcGetException rc (7) message: Syntax error in program SAPLZMES .
|
||||
<RfcGetException
|
||||
|
||||
|
||||
**** Error file opened at 20231211 173748 China Standard Time Rel 3.0.8 (2011-11-28) [721.619]
|
||||
Error: >Mon Dec 11 17:37:48,395< >RfcGetException rc (7) message: Syntax error in program SAPLZMES .
|
||||
<RfcGetException
|
||||
|
||||
|
||||
**** Error file opened at 20231211 182025 China Standard Time Rel 3.0.8 (2011-11-28) [721.619]
|
||||
Error: >Mon Dec 11 18:20:25,371< >RfcGetException rc (7) message: Syntax error in program SAPLZMES .
|
||||
<RfcGetException
|
||||
|
||||
Error: >Mon Dec 11 18:20:41,130< >RfcGetException rc (7) message: Syntax error in program SAPLZMES .
|
||||
<RfcGetException
|
||||
|
||||
Error: >Mon Dec 11 18:21:52,709< >RfcGetException rc (7) message: Syntax error in program SAPLZMES .
|
||||
<RfcGetException
|
||||
**** Error file opened at 20231213 172552 China Standard Time Rel 3.0.8 (2011-11-28) [721.619]
|
||||
Info: >Wed Dec 13 17:25:52,970< [JCoAPI] Exception while setting system property to JCo property: jco.cpic_maxconv=202 com.sap.conn.jco.JCoRuntimeException: (131) JCO_ERROR_ILLEGAL_ARGUMENT: Value of property jco.cpic_maxconv causes null
|
||||
at com.sap.conn.jco.rt.JCoRuntime.setPropertyValue(JCoRuntime.java:888)
|
||||
at com.sap.conn.jco.rt.DefaultJCoRuntime.setPropertyValue(DefaultJCoRuntime.java:577)
|
||||
at com.sap.conn.jco.rt.JCoRuntime.setSystemProperty(JCoRuntime.java:149)
|
||||
at com.sap.conn.jco.rt.DefaultJCoRuntime.readSystemProperties(DefaultJCoRuntime.java:100)
|
||||
at com.sap.conn.jco.rt.JCoRuntimeFactory.<clinit>(JCoRuntimeFactory.java:24)
|
||||
at java.lang.Class.forName0(Native Method)
|
||||
at java.lang.Class.forName(Class.java:264)
|
||||
at com.sap.conn.jco.JCo.createJCo(JCo.java:52)
|
||||
at com.sap.conn.jco.JCo.<clinit>(JCo.java:26)
|
||||
at com.sap.conn.jco.JCoDestinationManager.getDestination(JCoDestinationManager.java:77)
|
||||
at com.op.sap.util.SAPConnUtils.connect(SAPConnUtils.java:24)
|
||||
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
|
||||
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
|
||||
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
|
||||
at java.lang.reflect.Method.invoke(Method.java:498)
|
||||
at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:154)
|
||||
at org.springframework.beans.factory.support.ConstructorResolver.instantiate(ConstructorResolver.java:653)
|
||||
at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:486)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1352)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1195)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:582)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:542)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335)
|
||||
at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208)
|
||||
at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276)
|
||||
at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1391)
|
||||
at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1311)
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657)
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640)
|
||||
at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119)
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1431)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:619)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:542)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335)
|
||||
at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208)
|
||||
at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276)
|
||||
at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1391)
|
||||
at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1311)
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657)
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640)
|
||||
at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119)
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1431)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:619)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:542)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335)
|
||||
at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208)
|
||||
at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:955)
|
||||
at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:918)
|
||||
at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:583)
|
||||
at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:147)
|
||||
at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:731)
|
||||
at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:408)
|
||||
at org.springframework.boot.SpringApplication.run(SpringApplication.java:307)
|
||||
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1303)
|
||||
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1292)
|
||||
at com.op.sap.SapApplication.main(SapApplication.java:20)
|
||||
Caused by: java.lang.NullPointerException
|
||||
at com.sap.conn.rfc.engine.Trc.criticalTrace(Trc.java:472)
|
||||
at com.sap.conn.rfc.driver.CpicDriver.setCpicMaxConv(CpicDriver.java:1061)
|
||||
at com.sap.conn.rfc.engine.DefaultRfcRuntime.setCpicMaxConv(DefaultRfcRuntime.java:113)
|
||||
at com.sap.conn.jco.rt.JCoRuntime.setPropertyValue(JCoRuntime.java:873)
|
||||
... 63 more
|
||||
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
package com.op.system.api;
|
||||
|
||||
import com.op.common.core.constant.ServiceNameConstants;
|
||||
import com.op.common.core.domain.R;
|
||||
import com.op.system.api.domain.quality.QcCheckTaskIncomeDTO;
|
||||
import com.op.system.api.domain.quality.QcCheckTaskWarehousingDTO;
|
||||
import com.op.system.api.factory.RemoteDeviceFallbackFactory;
|
||||
import com.op.system.api.factory.RemoteQualityFallbackFactory;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
|
||||
/**
|
||||
* 用户服务
|
||||
*
|
||||
* @author OP
|
||||
*/
|
||||
@FeignClient(contextId = "remoteQualityService", value = ServiceNameConstants.QMS_SERVICE, fallbackFactory = RemoteQualityFallbackFactory.class)
|
||||
|
||||
|
||||
|
||||
public interface RemoteQualityService {
|
||||
|
||||
@PostMapping("/qcProduce/createProduceXJTask")
|
||||
public R createProduceXJTask();
|
||||
|
||||
@PostMapping("/qcIncome/createIncomeTask")
|
||||
public R createIncomeTask(@RequestBody QcCheckTaskIncomeDTO qcCheckTaskIncome);
|
||||
|
||||
@PostMapping("/qcWarehousing/createProductTask")
|
||||
public R createProductTask(@RequestBody QcCheckTaskWarehousingDTO qcCheckTaskIncome);
|
||||
}
|
||||
@ -0,0 +1,478 @@
|
||||
package com.op.system.api.domain.quality;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.op.common.core.annotation.Excel;
|
||||
import com.op.common.core.web.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 来料检验对象 qc_check_task_income
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-10-19
|
||||
*/
|
||||
public class QcCheckTaskIncomeDTO extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** id */
|
||||
private String recordId;
|
||||
|
||||
/** 检验任务编号 */
|
||||
@Excel(name = "检验任务编号")
|
||||
private String checkNo;
|
||||
|
||||
private String workorderCode;
|
||||
|
||||
/** 来料批次号 */
|
||||
@Excel(name = "批次号")
|
||||
private String incomeBatchNo;
|
||||
|
||||
/** 订单号 */
|
||||
@Excel(name = "订单号")
|
||||
private String orderNo;
|
||||
|
||||
/** 物料号 */
|
||||
@Excel(name = "物料号")
|
||||
private String materialCode;
|
||||
|
||||
/** 物料名称 */
|
||||
@Excel(name = "物料名称")
|
||||
private String materialName;
|
||||
|
||||
/** 收货数量 */
|
||||
@Excel(name = "收货数量")
|
||||
private BigDecimal quality;
|
||||
|
||||
@Excel(name = "不合格数量")
|
||||
private BigDecimal noOkQuality;
|
||||
|
||||
/** 单位 */
|
||||
@Excel(name = "单位")
|
||||
private String unit;
|
||||
|
||||
/** 供应商编码 */
|
||||
@Excel(name = "供应商编码")
|
||||
private String supplierCode;
|
||||
|
||||
/** 供应商名称 */
|
||||
@Excel(name = "供应商名称")
|
||||
private String supplierName;
|
||||
|
||||
/** 来料时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "来料时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date incomeTime;
|
||||
|
||||
/** 检测地点 */
|
||||
@Excel(name = "检测地点")
|
||||
private String checkLoc;
|
||||
|
||||
/** 检测状态 */
|
||||
@Excel(name = "检测状态")
|
||||
private String checkStatus;
|
||||
|
||||
/** 检测人工号 */
|
||||
@Excel(name = "检测人工号")
|
||||
private String checkManCode;
|
||||
|
||||
/** 检测人姓名 */
|
||||
@Excel(name = "检测人姓名")
|
||||
private String checkManName;
|
||||
|
||||
/** 检验时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date checkTime;
|
||||
|
||||
/** 检验结果Y合格 */
|
||||
@Excel(name = "检验结果Y合格")
|
||||
private String checkResult;
|
||||
|
||||
/** 是否启用1启用0停用 */
|
||||
@Excel(name = "是否启用1启用0停用")
|
||||
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 factoryCode;
|
||||
|
||||
/** 删除标识1删除0正常 */
|
||||
private String delFlag;
|
||||
|
||||
private String incomeTimeStart;
|
||||
private String incomeTimeEnd;
|
||||
private String checkTimeStart;
|
||||
private String checkTimeEnd;
|
||||
private String typeCode;
|
||||
private String checkType;
|
||||
private String qualityStatus;
|
||||
private String batchCode;
|
||||
private String batchId;
|
||||
private List<QcCheckTaskDetailDTO> qcCheckTaskDetails;
|
||||
|
||||
private BigDecimal sampleQuality;
|
||||
private BigDecimal aNoOkquality;
|
||||
private BigDecimal bNoOkquality;
|
||||
private BigDecimal cNoOkquality;
|
||||
private String orderType;
|
||||
|
||||
public String getOrderType() {
|
||||
return orderType;
|
||||
}
|
||||
|
||||
public void setOrderType(String orderType) {
|
||||
this.orderType = orderType;
|
||||
}
|
||||
|
||||
public BigDecimal getSampleQuality() {
|
||||
return sampleQuality;
|
||||
}
|
||||
|
||||
public void setSampleQuality(BigDecimal sampleQuality) {
|
||||
this.sampleQuality = sampleQuality;
|
||||
}
|
||||
|
||||
public BigDecimal getaNoOkquality() {
|
||||
return aNoOkquality;
|
||||
}
|
||||
|
||||
public void setaNoOkquality(BigDecimal aNoOkquality) {
|
||||
this.aNoOkquality = aNoOkquality;
|
||||
}
|
||||
|
||||
public void setbNoOkquality(BigDecimal bNoOkquality) {
|
||||
this.bNoOkquality = bNoOkquality;
|
||||
}
|
||||
|
||||
public void setcNoOkquality(BigDecimal cNoOkquality) {
|
||||
this.cNoOkquality = cNoOkquality;
|
||||
}
|
||||
|
||||
public BigDecimal getbNoOkquality() {
|
||||
return bNoOkquality;
|
||||
}
|
||||
|
||||
public BigDecimal getcNoOkquality() {
|
||||
return cNoOkquality;
|
||||
}
|
||||
|
||||
public List<QcCheckTaskDetailDTO> getQcCheckTaskDetails() {
|
||||
return qcCheckTaskDetails;
|
||||
}
|
||||
|
||||
public void setQcCheckTaskDetails(List<QcCheckTaskDetailDTO> qcCheckTaskDetails) {
|
||||
this.qcCheckTaskDetails = qcCheckTaskDetails;
|
||||
}
|
||||
|
||||
public String getBatchCode() {
|
||||
return batchCode;
|
||||
}
|
||||
|
||||
public void setBatchCode(String batchCode) {
|
||||
this.batchCode = batchCode;
|
||||
}
|
||||
|
||||
public String getBatchId() {
|
||||
return batchId;
|
||||
}
|
||||
|
||||
public void setBatchId(String batchId) {
|
||||
this.batchId = batchId;
|
||||
}
|
||||
|
||||
public String getWorkorderCode() {
|
||||
return workorderCode;
|
||||
}
|
||||
|
||||
public void setWorkorderCode(String workorderCode) {
|
||||
this.workorderCode = workorderCode;
|
||||
}
|
||||
|
||||
public String getQualityStatus() {
|
||||
return qualityStatus;
|
||||
}
|
||||
|
||||
public void setQualityStatus(String qualityStatus) {
|
||||
this.qualityStatus = qualityStatus;
|
||||
}
|
||||
|
||||
public BigDecimal getNoOkQuality() {
|
||||
return noOkQuality;
|
||||
}
|
||||
|
||||
public void setNoOkQuality(BigDecimal noOkQuality) {
|
||||
this.noOkQuality = noOkQuality;
|
||||
}
|
||||
|
||||
public String getCheckType() {
|
||||
return checkType;
|
||||
}
|
||||
|
||||
public void setCheckType(String checkType) {
|
||||
this.checkType = checkType;
|
||||
}
|
||||
|
||||
public String getTypeCode() {
|
||||
return typeCode;
|
||||
}
|
||||
|
||||
public void setTypeCode(String typeCode) {
|
||||
this.typeCode = typeCode;
|
||||
}
|
||||
|
||||
public String getIncomeTimeStart() {
|
||||
return incomeTimeStart;
|
||||
}
|
||||
|
||||
public void setIncomeTimeStart(String incomeTimeStart) {
|
||||
this.incomeTimeStart = incomeTimeStart;
|
||||
}
|
||||
|
||||
public String getIncomeTimeEnd() {
|
||||
return incomeTimeEnd;
|
||||
}
|
||||
|
||||
public void setIncomeTimeEnd(String incomeTimeEnd) {
|
||||
this.incomeTimeEnd = incomeTimeEnd;
|
||||
}
|
||||
|
||||
public String getCheckTimeStart() {
|
||||
return checkTimeStart;
|
||||
}
|
||||
|
||||
public void setCheckTimeStart(String checkTimeStart) {
|
||||
this.checkTimeStart = checkTimeStart;
|
||||
}
|
||||
|
||||
public String getCheckTimeEnd() {
|
||||
return checkTimeEnd;
|
||||
}
|
||||
|
||||
public void setCheckTimeEnd(String checkTimeEnd) {
|
||||
this.checkTimeEnd = checkTimeEnd;
|
||||
}
|
||||
|
||||
public void setRecordId(String recordId) {
|
||||
this.recordId = recordId;
|
||||
}
|
||||
|
||||
public String getRecordId() {
|
||||
return recordId;
|
||||
}
|
||||
public void setCheckNo(String checkNo) {
|
||||
this.checkNo = checkNo;
|
||||
}
|
||||
|
||||
public String getCheckNo() {
|
||||
return checkNo;
|
||||
}
|
||||
public void setIncomeBatchNo(String incomeBatchNo) {
|
||||
this.incomeBatchNo = incomeBatchNo;
|
||||
}
|
||||
|
||||
public String getIncomeBatchNo() {
|
||||
return incomeBatchNo;
|
||||
}
|
||||
public void setOrderNo(String orderNo) {
|
||||
this.orderNo = orderNo;
|
||||
}
|
||||
|
||||
public String getOrderNo() {
|
||||
return orderNo;
|
||||
}
|
||||
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 setQuality(BigDecimal quality) {
|
||||
this.quality = quality;
|
||||
}
|
||||
|
||||
public BigDecimal getQuality() {
|
||||
return quality;
|
||||
}
|
||||
public void setUnit(String unit) {
|
||||
this.unit = unit;
|
||||
}
|
||||
|
||||
public String getUnit() {
|
||||
return unit;
|
||||
}
|
||||
public void setSupplierCode(String supplierCode) {
|
||||
this.supplierCode = supplierCode;
|
||||
}
|
||||
|
||||
public String getSupplierCode() {
|
||||
return supplierCode;
|
||||
}
|
||||
public void setSupplierName(String supplierName) {
|
||||
this.supplierName = supplierName;
|
||||
}
|
||||
|
||||
public String getSupplierName() {
|
||||
return supplierName;
|
||||
}
|
||||
public void setIncomeTime(Date incomeTime) {
|
||||
this.incomeTime = incomeTime;
|
||||
}
|
||||
|
||||
public Date getIncomeTime() {
|
||||
return incomeTime;
|
||||
}
|
||||
public void setCheckLoc(String checkLoc) {
|
||||
this.checkLoc = checkLoc;
|
||||
}
|
||||
|
||||
public String getCheckLoc() {
|
||||
return checkLoc;
|
||||
}
|
||||
public void setCheckStatus(String checkStatus) {
|
||||
this.checkStatus = checkStatus;
|
||||
}
|
||||
|
||||
public String getCheckStatus() {
|
||||
return checkStatus;
|
||||
}
|
||||
public void setCheckManCode(String checkManCode) {
|
||||
this.checkManCode = checkManCode;
|
||||
}
|
||||
|
||||
public String getCheckManCode() {
|
||||
return checkManCode;
|
||||
}
|
||||
public void setCheckManName(String checkManName) {
|
||||
this.checkManName = checkManName;
|
||||
}
|
||||
|
||||
public String getCheckManName() {
|
||||
return checkManName;
|
||||
}
|
||||
public void setCheckTime(Date checkTime) {
|
||||
this.checkTime = checkTime;
|
||||
}
|
||||
|
||||
public Date getCheckTime() {
|
||||
return checkTime;
|
||||
}
|
||||
public void setCheckResult(String checkResult) {
|
||||
this.checkResult = checkResult;
|
||||
}
|
||||
|
||||
public String getCheckResult() {
|
||||
return checkResult;
|
||||
}
|
||||
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 setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
public void setDelFlag(String delFlag) {
|
||||
this.delFlag = delFlag;
|
||||
}
|
||||
|
||||
public String getDelFlag() {
|
||||
return delFlag;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("recordId", getRecordId())
|
||||
.append("checkNo", getCheckNo())
|
||||
.append("incomeBatchNo", getIncomeBatchNo())
|
||||
.append("orderNo", getOrderNo())
|
||||
.append("materialCode", getMaterialCode())
|
||||
.append("materialName", getMaterialName())
|
||||
.append("quality", getQuality())
|
||||
.append("unit", getUnit())
|
||||
.append("supplierCode", getSupplierCode())
|
||||
.append("supplierName", getSupplierName())
|
||||
.append("incomeTime", getIncomeTime())
|
||||
.append("checkLoc", getCheckLoc())
|
||||
.append("checkStatus", getCheckStatus())
|
||||
.append("checkManCode", getCheckManCode())
|
||||
.append("checkManName", getCheckManName())
|
||||
.append("checkTime", getCheckTime())
|
||||
.append("checkResult", getCheckResult())
|
||||
.append("status", getStatus())
|
||||
.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("factoryCode", getFactoryCode())
|
||||
.append("delFlag", getDelFlag())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
package com.op.system.api.factory;
|
||||
|
||||
|
||||
import com.op.common.core.domain.R;
|
||||
import com.op.system.api.RemoteDeviceService;
|
||||
import com.op.system.api.RemoteQualityService;
|
||||
import com.op.system.api.domain.quality.QcCheckTaskIncomeDTO;
|
||||
import com.op.system.api.domain.quality.QcCheckTaskWarehousingDTO;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 用户服务降级处理
|
||||
*
|
||||
* @author OP
|
||||
*/
|
||||
@Component
|
||||
public class RemoteQualityFallbackFactory implements FallbackFactory<RemoteQualityService> {
|
||||
private static final Logger log = LoggerFactory.getLogger(RemoteQualityFallbackFactory.class);
|
||||
|
||||
@Override
|
||||
public RemoteQualityService create(Throwable throwable) {
|
||||
log.error("Quality服务调用失败:{}", throwable.getMessage());
|
||||
return new RemoteQualityService() {
|
||||
@Override
|
||||
public R createProduceXJTask() {
|
||||
return R.fail("巡检计划创建失败:" + throwable.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
public R createIncomeTask(QcCheckTaskIncomeDTO qcCheckTaskIncome) {
|
||||
return R.fail("来料检验创建失败:" + throwable.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
public R createProductTask(QcCheckTaskWarehousingDTO qcCheckTaskWarehousingDTO) {
|
||||
return R.fail("入库检验任务创建失败:" + throwable.getMessage());
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
package com.op.mes.controller;
|
||||
|
||||
import com.op.mes.domain.MesBoard;
|
||||
import com.op.mes.service.MesInterfaceService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* mes看板接口
|
||||
*
|
||||
* @author zxl
|
||||
* @date 2023-11-15
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/mesInterface")
|
||||
public class MesInterfaceController {
|
||||
|
||||
@Autowired
|
||||
private MesInterfaceService mesInterfaceService;
|
||||
|
||||
//工艺看板
|
||||
@PostMapping("/getTechnologyBoard")
|
||||
public List<MesBoard> getTechnologyBoard(@RequestBody MesBoard mesBoard) {
|
||||
return mesInterfaceService.getTechnologyBoard(mesBoard);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,118 @@
|
||||
package com.op.mes.domain;
|
||||
|
||||
import com.op.common.core.domain.BaseFileData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
//看板实体类
|
||||
public class MesBoard {
|
||||
|
||||
private String factoryCode;
|
||||
private String workorderCode;
|
||||
private String workorderCodeSap;
|
||||
private String workorderName;
|
||||
private String equipmentName;
|
||||
private String productCode;
|
||||
private String productName;
|
||||
private String routeCode;
|
||||
private String routeId;
|
||||
private List<BaseFileData> files;
|
||||
private String workshopCode;
|
||||
private String workshopName;
|
||||
|
||||
public String getWorkshopCode() {
|
||||
return workshopCode;
|
||||
}
|
||||
|
||||
public void setWorkshopCode(String workshopCode) {
|
||||
this.workshopCode = workshopCode;
|
||||
}
|
||||
|
||||
public String getWorkshopName() {
|
||||
return workshopName;
|
||||
}
|
||||
|
||||
public void setWorkshopName(String workshopName) {
|
||||
this.workshopName = workshopName;
|
||||
}
|
||||
|
||||
public String getEquipmentName() {
|
||||
return equipmentName;
|
||||
}
|
||||
|
||||
public void setEquipmentName(String equipmentName) {
|
||||
this.equipmentName = equipmentName;
|
||||
}
|
||||
|
||||
public List<BaseFileData> getFiles() {
|
||||
return files;
|
||||
}
|
||||
|
||||
public void setFiles(List<BaseFileData> files) {
|
||||
this.files = files;
|
||||
}
|
||||
|
||||
public String getWorkorderCode() {
|
||||
return workorderCode;
|
||||
}
|
||||
|
||||
public void setWorkorderCode(String workorderCode) {
|
||||
this.workorderCode = workorderCode;
|
||||
}
|
||||
|
||||
public String getWorkorderCodeSap() {
|
||||
return workorderCodeSap;
|
||||
}
|
||||
|
||||
public void setWorkorderCodeSap(String workorderCodeSap) {
|
||||
this.workorderCodeSap = workorderCodeSap;
|
||||
}
|
||||
|
||||
public String getWorkorderName() {
|
||||
return workorderName;
|
||||
}
|
||||
|
||||
public void setWorkorderName(String workorderName) {
|
||||
this.workorderName = workorderName;
|
||||
}
|
||||
|
||||
public String getProductCode() {
|
||||
return productCode;
|
||||
}
|
||||
|
||||
public void setProductCode(String productCode) {
|
||||
this.productCode = productCode;
|
||||
}
|
||||
|
||||
public String getProductName() {
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setProductName(String productName) {
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public String getRouteCode() {
|
||||
return routeCode;
|
||||
}
|
||||
|
||||
public void setRouteCode(String routeCode) {
|
||||
this.routeCode = routeCode;
|
||||
}
|
||||
|
||||
public String getRouteId() {
|
||||
return routeId;
|
||||
}
|
||||
|
||||
public void setRouteId(String routeId) {
|
||||
this.routeId = routeId;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package com.op.mes.service;
|
||||
|
||||
import com.op.mes.domain.MesBoard;
|
||||
import com.op.mes.domain.dto.BaseEquipmentDto;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 看板 Service接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-13
|
||||
*/
|
||||
public interface MesInterfaceService {
|
||||
|
||||
|
||||
List<MesBoard> getTechnologyBoard(MesBoard mesBoard);
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
package com.op.mes.service.impl;
|
||||
|
||||
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
||||
import com.op.common.core.domain.BaseFileData;
|
||||
import com.op.common.core.utils.DateUtils;
|
||||
import com.op.common.core.utils.uuid.IdUtils;
|
||||
import com.op.common.security.utils.SecurityUtils;
|
||||
import com.op.mes.domain.MesBoard;
|
||||
import com.op.mes.domain.dto.BaseEquipmentDto;
|
||||
import com.op.mes.mapper.MesMapper;
|
||||
import com.op.mes.service.MesInterfaceService;
|
||||
import com.op.mes.service.PDAService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* wcs接口业务层处理
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-13
|
||||
*/
|
||||
@Service
|
||||
public class MesInterfaceServiceImpl implements MesInterfaceService {
|
||||
|
||||
@Autowired
|
||||
private MesMapper mesMapper;
|
||||
|
||||
@Override
|
||||
public List<MesBoard> getTechnologyBoard(MesBoard mesBoard) {
|
||||
DynamicDataSourceContextHolder.push(mesBoard.getFactoryCode());
|
||||
List<MesBoard> dtos= mesMapper.getTechnologyBoard(mesBoard);
|
||||
for(MesBoard dto:dtos){
|
||||
//取附件
|
||||
List<BaseFileData> files = mesMapper.getTechnologyFiles(dto);
|
||||
dto.setFiles(files);
|
||||
}
|
||||
return dtos;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
package com.op.quality.controller;
|
||||
|
||||
|
||||
import com.baomidou.dynamic.datasource.annotation.DS;
|
||||
import com.op.common.core.utils.poi.ExcelUtil;
|
||||
import com.op.common.core.web.controller.BaseController;
|
||||
import com.op.common.core.web.page.TableDataInfo;
|
||||
import com.op.common.log.annotation.Log;
|
||||
import com.op.common.log.enums.BusinessType;
|
||||
import com.op.quality.domain.QcProCheck;
|
||||
import com.op.quality.service.QcProCheckService;
|
||||
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.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/qcProCheck")
|
||||
public class QcProCheckController extends BaseController {
|
||||
@Autowired
|
||||
private QcProCheckService qcProCheckService;
|
||||
|
||||
@GetMapping("/list")
|
||||
public List<QcProCheck> list(QcProCheck qcProCheck) {
|
||||
List<QcProCheck> qcProChecks = qcProCheckService.selectQcCheckList(qcProCheck);
|
||||
return qcProCheckService.selectQcCheckList(qcProCheck);
|
||||
}
|
||||
|
||||
@Log(title = "白坯合格统计", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, QcProCheck qcProCheck) {
|
||||
List<QcProCheck> list = qcProCheckService.selectQcCheckList(qcProCheck);
|
||||
ExcelUtil<QcProCheck> util = new ExcelUtil<QcProCheck>(QcProCheck.class);
|
||||
util.exportExcel(response, list, "白坯合格统计数据");
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,97 @@
|
||||
package com.op.quality.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.quality.domain.WmsRawOrderIn;
|
||||
import com.op.quality.service.IWmsRawOrderInService;
|
||||
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-12-26
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/bPproduct")
|
||||
public class WmsRawOrderInController extends BaseController {
|
||||
@Autowired
|
||||
private IWmsRawOrderInService wmsRawOrderInService;
|
||||
|
||||
/**
|
||||
* 查询白坯手动入库单列表
|
||||
*/
|
||||
@RequiresPermissions("quality:bPproduct:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(WmsRawOrderIn wmsRawOrderIn) {
|
||||
startPage();
|
||||
List<WmsRawOrderIn> list = wmsRawOrderInService.selectWmsRawOrderInList(wmsRawOrderIn);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出白坯手动入库单列表
|
||||
*/
|
||||
@RequiresPermissions("quality:bPproduct:export")
|
||||
@Log(title = "白坯手动入库单", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, WmsRawOrderIn wmsRawOrderIn) {
|
||||
List<WmsRawOrderIn> list = wmsRawOrderInService.selectWmsRawOrderInList(wmsRawOrderIn);
|
||||
ExcelUtil<WmsRawOrderIn> util = new ExcelUtil<WmsRawOrderIn>(WmsRawOrderIn.class);
|
||||
util.exportExcel(response, list, "白坯手动入库单数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取白坯手动入库单详细信息
|
||||
*/
|
||||
@RequiresPermissions("quality:bPproduct:query")
|
||||
@GetMapping(value = "/{rawOrderInId}")
|
||||
public AjaxResult getInfo(@PathVariable("rawOrderInId") String rawOrderInId) {
|
||||
return success(wmsRawOrderInService.selectWmsRawOrderInByRawOrderInId(rawOrderInId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增白坯手动入库单
|
||||
*/
|
||||
@RequiresPermissions("quality:bPproduct:add")
|
||||
@Log(title = "白坯手动入库单", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody WmsRawOrderIn wmsRawOrderIn) {
|
||||
return toAjax(wmsRawOrderInService.insertWmsRawOrderIn(wmsRawOrderIn));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改白坯手动入库单
|
||||
*/
|
||||
@RequiresPermissions("quality:bPproduct:edit")
|
||||
@Log(title = "白坯手动入库单", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody WmsRawOrderIn wmsRawOrderIn) {
|
||||
return toAjax(wmsRawOrderInService.updateWmsRawOrderIn(wmsRawOrderIn));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除白坯手动入库单
|
||||
*/
|
||||
@RequiresPermissions("quality:bPproduct:remove")
|
||||
@Log(title = "白坯手动入库单", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{rawOrderInIds}")
|
||||
public AjaxResult remove(@PathVariable String[] rawOrderInIds) {
|
||||
return toAjax(wmsRawOrderInService.deleteWmsRawOrderInByRawOrderInIds(rawOrderInIds));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,170 @@
|
||||
package com.op.quality.domain;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 来料检验任务--不良数量对象 qc_check_task_defect
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-12-27
|
||||
*/
|
||||
public class QcCheckTaskDefect extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** id */
|
||||
private String recordId;
|
||||
|
||||
/** 不良分类编码 */
|
||||
@Excel(name = "不良分类编码")
|
||||
private String defectCode;
|
||||
|
||||
/** 不良分类名称 */
|
||||
@Excel(name = "不良分类名称")
|
||||
private String defectSubclass;
|
||||
|
||||
/** 预留字段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 factoryCode;
|
||||
|
||||
/** 删除标识1删除0正常 */
|
||||
private String delFlag;
|
||||
|
||||
/** 检验任务id */
|
||||
@Excel(name = "检验任务id")
|
||||
private String belongTo;
|
||||
|
||||
/** 合格数量 */
|
||||
@Excel(name = "合格数量")
|
||||
private BigDecimal okQuality;
|
||||
|
||||
/** 不合格数量 */
|
||||
@Excel(name = "不合格数量")
|
||||
private BigDecimal noOkQuality;
|
||||
public void setRecordId(String recordId) {
|
||||
this.recordId = recordId;
|
||||
}
|
||||
|
||||
public String getRecordId() {
|
||||
return recordId;
|
||||
}
|
||||
public void setDefectCode(String defectCode) {
|
||||
this.defectCode = defectCode;
|
||||
}
|
||||
|
||||
public String getDefectCode() {
|
||||
return defectCode;
|
||||
}
|
||||
public void setDefectSubclass(String defectSubclass) {
|
||||
this.defectSubclass = defectSubclass;
|
||||
}
|
||||
|
||||
public String getDefectSubclass() {
|
||||
return defectSubclass;
|
||||
}
|
||||
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 setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
public void setDelFlag(String delFlag) {
|
||||
this.delFlag = delFlag;
|
||||
}
|
||||
|
||||
public String getDelFlag() {
|
||||
return delFlag;
|
||||
}
|
||||
public void setBelongTo(String belongTo) {
|
||||
this.belongTo = belongTo;
|
||||
}
|
||||
|
||||
public String getBelongTo() {
|
||||
return belongTo;
|
||||
}
|
||||
public void setOkQuality(BigDecimal okQuality) {
|
||||
this.okQuality = okQuality;
|
||||
}
|
||||
|
||||
public BigDecimal getOkQuality() {
|
||||
return okQuality;
|
||||
}
|
||||
|
||||
public BigDecimal getNoOkQuality() {
|
||||
return noOkQuality;
|
||||
}
|
||||
|
||||
public void setNoOkQuality(BigDecimal noOkQuality) {
|
||||
this.noOkQuality = noOkQuality;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("recordId", getRecordId())
|
||||
.append("defectCode", getDefectCode())
|
||||
.append("defectSubclass", getDefectSubclass())
|
||||
.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("factoryCode", getFactoryCode())
|
||||
.append("delFlag", getDelFlag())
|
||||
.append("belongTo", getBelongTo())
|
||||
.append("okQuality", getOkQuality())
|
||||
.append("nookQuality", getNoOkQuality())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,212 @@
|
||||
package com.op.quality.domain;
|
||||
|
||||
import com.op.common.core.annotation.Excel;
|
||||
import com.op.common.core.web.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
|
||||
public class QcCheckTaskUser extends BaseEntity {
|
||||
|
||||
|
||||
/**
|
||||
* 生产过程检验任务--检验人 qc_check_task_user
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-12-22
|
||||
*/
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
private String recordId;
|
||||
|
||||
/**
|
||||
* 检验任务编号
|
||||
*/
|
||||
@Excel(name = "检验任务编号")
|
||||
private String checkNo;
|
||||
|
||||
/**
|
||||
* 检测人工号
|
||||
*/
|
||||
@Excel(name = "检测人工号")
|
||||
private String checkManCode;
|
||||
|
||||
/**
|
||||
* 检测人姓名
|
||||
*/
|
||||
@Excel(name = "检测人姓名")
|
||||
private String checkManName;
|
||||
|
||||
/**
|
||||
* 预留字段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 factoryCode;
|
||||
|
||||
/**
|
||||
* 删除标识1删除0正常
|
||||
*/
|
||||
private String delFlag;
|
||||
|
||||
/**
|
||||
* 属于
|
||||
*/
|
||||
private String belongTo;
|
||||
|
||||
private String manNames;
|
||||
private String manCodes;
|
||||
|
||||
public String getManNames() {
|
||||
return manNames;
|
||||
}
|
||||
|
||||
public void setManNames(String manNames) {
|
||||
this.manNames = manNames;
|
||||
}
|
||||
|
||||
public String getManCodes() {
|
||||
return manCodes;
|
||||
}
|
||||
|
||||
public void setManCodes(String manCodes) {
|
||||
this.manCodes = manCodes;
|
||||
}
|
||||
|
||||
public String getRecordId() {
|
||||
return recordId;
|
||||
}
|
||||
|
||||
public void setRecordId(String recordId) {
|
||||
this.recordId = recordId;
|
||||
}
|
||||
|
||||
public String getCheckNo() {
|
||||
return checkNo;
|
||||
}
|
||||
|
||||
public void setCheckNo(String checkNo) {
|
||||
this.checkNo = checkNo;
|
||||
}
|
||||
|
||||
public String getCheckManCode() {
|
||||
return checkManCode;
|
||||
}
|
||||
|
||||
public void setCheckManCode(String checkManCode) {
|
||||
this.checkManCode = checkManCode;
|
||||
}
|
||||
|
||||
public String getCheckManName() {
|
||||
return checkManName;
|
||||
}
|
||||
|
||||
public void setCheckManName(String checkManName) {
|
||||
this.checkManName = checkManName;
|
||||
}
|
||||
|
||||
public String getAttr1() {
|
||||
return attr1;
|
||||
}
|
||||
|
||||
public void setAttr1(String attr1) {
|
||||
this.attr1 = attr1;
|
||||
}
|
||||
|
||||
public String getAttr2() {
|
||||
return attr2;
|
||||
}
|
||||
|
||||
public void setAttr2(String attr2) {
|
||||
this.attr2 = attr2;
|
||||
}
|
||||
|
||||
public String getAttr3() {
|
||||
return attr3;
|
||||
}
|
||||
|
||||
public void setAttr3(String attr3) {
|
||||
this.attr3 = attr3;
|
||||
}
|
||||
|
||||
public String getAttr4() {
|
||||
return attr4;
|
||||
}
|
||||
|
||||
public void setAttr4(String attr4) {
|
||||
this.attr4 = attr4;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getDelFlag() {
|
||||
return delFlag;
|
||||
}
|
||||
|
||||
public void setDelFlag(String delFlag) {
|
||||
this.delFlag = delFlag;
|
||||
}
|
||||
|
||||
public String getBelongTo() {
|
||||
return belongTo;
|
||||
}
|
||||
|
||||
public void setBelongTo(String belongTo) {
|
||||
this.belongTo = belongTo;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("recordId", getRecordId())
|
||||
.append("checkNo", getCheckNo())
|
||||
.append("checkManCode", getCheckManCode())
|
||||
.append("checkManName", getCheckManName())
|
||||
.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("factoryCode", getFactoryCode())
|
||||
.append("delFlag", getDelFlag())
|
||||
.toString();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package com.op.quality.domain;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* echart图返回数据
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-03
|
||||
*/
|
||||
public class QcLineChartDto {
|
||||
private List<String> seriesNames;
|
||||
private List<String> xAxisDatas;
|
||||
private List<QcLineChartSeriesDto> seriesDatas;
|
||||
|
||||
public List<String> getSeriesNames() {
|
||||
return seriesNames;
|
||||
}
|
||||
|
||||
public void setSeriesNames(List<String> seriesNames) {
|
||||
this.seriesNames = seriesNames;
|
||||
}
|
||||
|
||||
public List<String> getxAxisDatas() {
|
||||
return xAxisDatas;
|
||||
}
|
||||
|
||||
public void setxAxisDatas(List<String> xAxisDatas) {
|
||||
this.xAxisDatas = xAxisDatas;
|
||||
}
|
||||
|
||||
public List<QcLineChartSeriesDto> getSeriesDatas() {
|
||||
return seriesDatas;
|
||||
}
|
||||
|
||||
public void setSeriesDatas(List<QcLineChartSeriesDto> seriesDatas) {
|
||||
this.seriesDatas = seriesDatas;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,48 @@
|
||||
package com.op.quality.domain;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* echart图返回数据
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-03
|
||||
*/
|
||||
public class QcLineChartSeriesDto {
|
||||
private String name;
|
||||
private String type;
|
||||
private String stack;
|
||||
private List<String> data;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(String type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public String getStack() {
|
||||
return stack;
|
||||
}
|
||||
|
||||
public void setStack(String stack) {
|
||||
this.stack = stack;
|
||||
}
|
||||
|
||||
public List<String> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(List<String> data) {
|
||||
this.data = data;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,74 @@
|
||||
package com.op.quality.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.op.quality.domain.QcCheckTaskUser;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 来料检验任务--检查人Mapper接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-12-22
|
||||
*/
|
||||
@Mapper
|
||||
public interface QcCheckTaskUserMapper {
|
||||
/**
|
||||
* 查询来料检验任务--检查人
|
||||
*
|
||||
* @param recordId 来料检验任务--检查人主键
|
||||
* @return 来料检验任务--检查人
|
||||
*/
|
||||
public QcCheckTaskUser selectQcCheckTaskUserByRecordId(String recordId);
|
||||
|
||||
/**
|
||||
* 查询来料检验任务--检查人列表
|
||||
*
|
||||
* @param qcCheckTaskUser 来料检验任务--检查人
|
||||
* @return 来料检验任务--检查人集合
|
||||
*/
|
||||
public List<QcCheckTaskUser> selectQcCheckTaskUserList(QcCheckTaskUser qcCheckTaskUser);
|
||||
|
||||
/**
|
||||
* 新增来料检验任务--检查人
|
||||
*
|
||||
* @param qcCheckTaskUser 来料检验任务--检查人
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQcCheckTaskUser(QcCheckTaskUser qcCheckTaskUser);
|
||||
|
||||
/**
|
||||
* 修改来料检验任务--检查人
|
||||
*
|
||||
* @param qcCheckTaskUser 来料检验任务--检查人
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQcCheckTaskUser(QcCheckTaskUser qcCheckTaskUser);
|
||||
|
||||
/**
|
||||
* 删除来料检验任务--检查人
|
||||
*
|
||||
* @param recordId 来料检验任务--检查人主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQcCheckTaskUserByRecordId(String recordId);
|
||||
|
||||
/**
|
||||
* 批量删除来料检验任务--检查人
|
||||
*
|
||||
* @param recordIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQcCheckTaskUserByRecordIds(String[] recordIds);
|
||||
|
||||
/**
|
||||
* 批量插入检验人数据
|
||||
*/
|
||||
public int insertQcCheckTaskUserList(List<QcCheckTaskUser> qcCheckTaskUserList);
|
||||
|
||||
public int deleteQcCheckTaskUserByBelongTo(String belongTo);
|
||||
|
||||
public QcCheckTaskUser selectQcCheckTaskUserByBelongTo(String belongTo);
|
||||
|
||||
public int deleteQcCheckTaskUserByBelongTos(String[] belongToArray);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.op.quality.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.op.quality.domain.WmsRawOrderIn;
|
||||
|
||||
/**
|
||||
* 白坯手动入库单Mapper接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-12-26
|
||||
*/
|
||||
public interface WmsRawOrderInMapper {
|
||||
/**
|
||||
* 查询白坯手动入库单
|
||||
*
|
||||
* @param rawOrderInId 白坯手动入库单主键
|
||||
* @return 白坯手动入库单
|
||||
*/
|
||||
public WmsRawOrderIn selectWmsRawOrderInByRawOrderInId(String rawOrderInId);
|
||||
|
||||
/**
|
||||
* 查询白坯手动入库单列表
|
||||
*
|
||||
* @param wmsRawOrderIn 白坯手动入库单
|
||||
* @return 白坯手动入库单集合
|
||||
*/
|
||||
public List<WmsRawOrderIn> selectWmsRawOrderInList(WmsRawOrderIn wmsRawOrderIn);
|
||||
|
||||
/**
|
||||
* 新增白坯手动入库单
|
||||
*
|
||||
* @param wmsRawOrderIn 白坯手动入库单
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertWmsRawOrderIn(WmsRawOrderIn wmsRawOrderIn);
|
||||
|
||||
/**
|
||||
* 修改白坯手动入库单
|
||||
*
|
||||
* @param wmsRawOrderIn 白坯手动入库单
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateWmsRawOrderIn(WmsRawOrderIn wmsRawOrderIn);
|
||||
|
||||
/**
|
||||
* 删除白坯手动入库单
|
||||
*
|
||||
* @param rawOrderInId 白坯手动入库单主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteWmsRawOrderInByRawOrderInId(String rawOrderInId);
|
||||
|
||||
/**
|
||||
* 批量删除白坯手动入库单
|
||||
*
|
||||
* @param rawOrderInIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteWmsRawOrderInByRawOrderInIds(String[] rawOrderInIds);
|
||||
}
|
||||
@ -0,0 +1,71 @@
|
||||
package com.op.quality.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.op.quality.domain.QcCheckTaskUser;
|
||||
|
||||
/**
|
||||
* 来料检验任务--检查人Service接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-12-22
|
||||
*/
|
||||
public interface IQcCheckTaskUserService {
|
||||
/**
|
||||
* 查询来料检验任务--检查人
|
||||
*
|
||||
* @param recordId 来料检验任务--检查人主键
|
||||
* @return 来料检验任务--检查人
|
||||
*/
|
||||
public QcCheckTaskUser selectQcCheckTaskUserByRecordId(String recordId);
|
||||
|
||||
/**
|
||||
* 查询来料检验任务--检查人列表
|
||||
*
|
||||
* @param qcCheckTaskUser 来料检验任务--检查人
|
||||
* @return 来料检验任务--检查人集合
|
||||
*/
|
||||
public List<QcCheckTaskUser> selectQcCheckTaskUserList(QcCheckTaskUser qcCheckTaskUser);
|
||||
|
||||
/**
|
||||
* 新增来料检验任务--检查人
|
||||
*
|
||||
* @param qcCheckTaskUser 来料检验任务--检查人
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQcCheckTaskUser(QcCheckTaskUser qcCheckTaskUser);
|
||||
|
||||
/**
|
||||
* 修改来料检验任务--检查人
|
||||
*
|
||||
* @param qcCheckTaskUser 来料检验任务--检查人
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQcCheckTaskUser(List<QcCheckTaskUser> qcCheckTaskUser);
|
||||
|
||||
/**
|
||||
* 批量删除来料检验任务--检查人
|
||||
*
|
||||
* @param recordIds 需要删除的来料检验任务--检查人主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQcCheckTaskUserByRecordIds(String[] recordIds);
|
||||
|
||||
public int deleteQcCheckTaskUserByBelongTos(String[] belongToArray);
|
||||
|
||||
/**
|
||||
* 删除来料检验任务--检查人信息
|
||||
*
|
||||
* @param recordId 来料检验任务--检查人主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQcCheckTaskUserByRecordId(String recordId);
|
||||
|
||||
/**
|
||||
* 用户数据批量插入
|
||||
*/
|
||||
public int insertQcCheckTaskUserList(List<QcCheckTaskUser> qcCheckTaskUserList);
|
||||
/**
|
||||
* 根据任务编号查询检验人
|
||||
*/
|
||||
public QcCheckTaskUser selectQcCheckTaskUserByBelongTo(String belongTo);
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
package com.op.quality.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.op.quality.domain.WmsRawOrderIn;
|
||||
|
||||
/**
|
||||
* 白坯手动入库单Service接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-12-26
|
||||
*/
|
||||
public interface IWmsRawOrderInService {
|
||||
/**
|
||||
* 查询白坯手动入库单
|
||||
*
|
||||
* @param rawOrderInId 白坯手动入库单主键
|
||||
* @return 白坯手动入库单
|
||||
*/
|
||||
public WmsRawOrderIn selectWmsRawOrderInByRawOrderInId(String rawOrderInId);
|
||||
|
||||
/**
|
||||
* 查询白坯手动入库单列表
|
||||
*
|
||||
* @param wmsRawOrderIn 白坯手动入库单
|
||||
* @return 白坯手动入库单集合
|
||||
*/
|
||||
public List<WmsRawOrderIn> selectWmsRawOrderInList(WmsRawOrderIn wmsRawOrderIn);
|
||||
|
||||
/**
|
||||
* 新增白坯手动入库单
|
||||
*
|
||||
* @param wmsRawOrderIn 白坯手动入库单
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertWmsRawOrderIn(WmsRawOrderIn wmsRawOrderIn);
|
||||
|
||||
/**
|
||||
* 修改白坯手动入库单
|
||||
*
|
||||
* @param wmsRawOrderIn 白坯手动入库单
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateWmsRawOrderIn(WmsRawOrderIn wmsRawOrderIn);
|
||||
|
||||
/**
|
||||
* 批量删除白坯手动入库单
|
||||
*
|
||||
* @param rawOrderInIds 需要删除的白坯手动入库单主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteWmsRawOrderInByRawOrderInIds(String[] rawOrderInIds);
|
||||
|
||||
/**
|
||||
* 删除白坯手动入库单信息
|
||||
*
|
||||
* @param rawOrderInId 白坯手动入库单主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteWmsRawOrderInByRawOrderInId(String rawOrderInId);
|
||||
}
|
||||
@ -0,0 +1,157 @@
|
||||
package com.op.quality.service.impl;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import com.baomidou.dynamic.datasource.annotation.DS;
|
||||
import com.op.common.core.utils.DateUtils;
|
||||
import com.op.common.core.utils.StringUtils;
|
||||
import com.op.common.core.utils.uuid.IdUtils;
|
||||
import com.op.common.security.utils.SecurityUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.op.quality.mapper.QcCheckTaskUserMapper;
|
||||
import com.op.quality.domain.QcCheckTaskUser;
|
||||
import com.op.quality.service.IQcCheckTaskUserService;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* 来料检验任务--检查人Service业务层处理
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-12-22
|
||||
*/
|
||||
@Service
|
||||
public class QcCheckTaskUserServiceImpl implements IQcCheckTaskUserService {
|
||||
@Autowired
|
||||
private QcCheckTaskUserMapper qcCheckTaskUserMapper;
|
||||
|
||||
/**
|
||||
* 查询来料检验任务--检查人
|
||||
*
|
||||
* @param recordId 来料检验任务--检查人主键
|
||||
* @return 来料检验任务--检查人
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public QcCheckTaskUser selectQcCheckTaskUserByRecordId(String recordId) {
|
||||
return qcCheckTaskUserMapper.selectQcCheckTaskUserByRecordId(recordId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询来料检验任务--检查人列表
|
||||
*
|
||||
* @param qcCheckTaskUser 来料检验任务--检查人
|
||||
* @return 来料检验任务--检查人
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public List<QcCheckTaskUser> selectQcCheckTaskUserList(QcCheckTaskUser qcCheckTaskUser) {
|
||||
return qcCheckTaskUserMapper.selectQcCheckTaskUserList(qcCheckTaskUser);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增来料检验任务--检查人
|
||||
*
|
||||
* @param qcCheckTaskUser 来料检验任务--检查人
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int insertQcCheckTaskUser(QcCheckTaskUser qcCheckTaskUser) {
|
||||
qcCheckTaskUser.setCreateTime(DateUtils.getNowDate());
|
||||
return qcCheckTaskUserMapper.insertQcCheckTaskUser(qcCheckTaskUser);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改来料检验任务--检查人
|
||||
*
|
||||
* @param qcCheckTaskUser 来料检验任务--检查人
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int updateQcCheckTaskUser(List<QcCheckTaskUser> qcCheckTaskUserList) {
|
||||
if (CollectionUtils.isEmpty(qcCheckTaskUserList)){
|
||||
return 0;
|
||||
}
|
||||
String belongTo = qcCheckTaskUserList.get(0).getBelongTo();
|
||||
//根据belongTo删除
|
||||
qcCheckTaskUserMapper.deleteQcCheckTaskUserByBelongTo(belongTo);
|
||||
|
||||
//获取当前所选工厂
|
||||
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
||||
String key = "#header.poolName";
|
||||
String factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
|
||||
//遍历赋值
|
||||
for (QcCheckTaskUser qcCheckTaskUser : qcCheckTaskUserList){
|
||||
qcCheckTaskUser.setRecordId(IdUtils.fastSimpleUUID());
|
||||
qcCheckTaskUser.setCreateTime(DateUtils.getNowDate());
|
||||
qcCheckTaskUser.setCreateBy(SecurityUtils.getUsername());
|
||||
qcCheckTaskUser.setFactoryCode(factoryCode);
|
||||
}
|
||||
//重新插入数据
|
||||
return qcCheckTaskUserMapper.insertQcCheckTaskUserList(qcCheckTaskUserList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除来料检验任务--检查人
|
||||
*
|
||||
* @param recordIds 需要删除的来料检验任务--检查人主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int deleteQcCheckTaskUserByRecordIds(String[] recordIds) {
|
||||
return qcCheckTaskUserMapper.deleteQcCheckTaskUserByRecordIds(recordIds);
|
||||
}
|
||||
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int deleteQcCheckTaskUserByBelongTos(String[] belongToArray) {
|
||||
return qcCheckTaskUserMapper.deleteQcCheckTaskUserByBelongTos(belongToArray);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除来料检验任务--检查人信息
|
||||
*
|
||||
* @param recordId 来料检验任务--检查人主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int deleteQcCheckTaskUserByRecordId(String recordId) {
|
||||
return qcCheckTaskUserMapper.deleteQcCheckTaskUserByRecordId(recordId);
|
||||
}
|
||||
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int insertQcCheckTaskUserList(List<QcCheckTaskUser> qcCheckTaskUserList) {
|
||||
if (CollectionUtils.isEmpty(qcCheckTaskUserList)){
|
||||
return 0;
|
||||
}
|
||||
//获取当前所选工厂
|
||||
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
||||
String key = "#header.poolName";
|
||||
String factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
|
||||
//遍历赋值
|
||||
Date nowTime = DateUtils.getNowDate();
|
||||
for (QcCheckTaskUser qcCheckTaskUser : qcCheckTaskUserList){
|
||||
qcCheckTaskUser.setRecordId(IdUtils.fastSimpleUUID());
|
||||
qcCheckTaskUser.setCreateTime(nowTime);
|
||||
qcCheckTaskUser.setCreateBy(SecurityUtils.getUsername());
|
||||
qcCheckTaskUser.setFactoryCode(factoryCode);
|
||||
}
|
||||
return qcCheckTaskUserMapper.insertQcCheckTaskUserList(qcCheckTaskUserList);
|
||||
}
|
||||
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public QcCheckTaskUser selectQcCheckTaskUserByBelongTo(String belongTo) {
|
||||
return qcCheckTaskUserMapper.selectQcCheckTaskUserByBelongTo(belongTo);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,115 @@
|
||||
package com.op.quality.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.baomidou.dynamic.datasource.annotation.DS;
|
||||
import com.op.common.core.utils.uuid.IdUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.op.quality.mapper.WmsRawOrderInMapper;
|
||||
import com.op.quality.domain.WmsRawOrderIn;
|
||||
import com.op.quality.service.IWmsRawOrderInService;
|
||||
|
||||
/**
|
||||
* 白坯手动入库单Service业务层处理
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-12-26
|
||||
*/
|
||||
@Service
|
||||
public class WmsRawOrderInServiceImpl implements IWmsRawOrderInService {
|
||||
@Autowired
|
||||
private WmsRawOrderInMapper wmsRawOrderInMapper;
|
||||
|
||||
/**
|
||||
* 查询白坯手动入库单
|
||||
*
|
||||
* @param rawOrderInId 白坯手动入库单主键
|
||||
* @return 白坯手动入库单
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public WmsRawOrderIn selectWmsRawOrderInByRawOrderInId(String rawOrderInId) {
|
||||
return wmsRawOrderInMapper.selectWmsRawOrderInByRawOrderInId(rawOrderInId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询白坯手动入库单列表
|
||||
*
|
||||
* @param wmsRawOrderIn 白坯手动入库单
|
||||
* @return 白坯手动入库单
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public List<WmsRawOrderIn> selectWmsRawOrderInList(WmsRawOrderIn wmsRawOrderIn) {
|
||||
return wmsRawOrderInMapper.selectWmsRawOrderInList(wmsRawOrderIn);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增白坯手动入库单
|
||||
*
|
||||
* @param wmsRawOrderIn 白坯手动入库单
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int insertWmsRawOrderIn(WmsRawOrderIn wmsRawOrderIn) {
|
||||
wmsRawOrderIn.setRawOrderInId(IdUtils.fastSimpleUUID());
|
||||
wmsRawOrderIn.setFactoryCode("1000");
|
||||
wmsRawOrderIn.setWhCode("A");
|
||||
wmsRawOrderIn.setWaCode("A");
|
||||
wmsRawOrderIn.setWlCode("A-A01");
|
||||
wmsRawOrderIn.setDnNo("202312");
|
||||
wmsRawOrderIn.setOrderStatus("0");
|
||||
wmsRawOrderIn.setActiveFlag("1");
|
||||
wmsRawOrderIn.setSupplyCode("0000102874");
|
||||
wmsRawOrderIn.setSapFactoryCode("1000");
|
||||
return wmsRawOrderInMapper.insertWmsRawOrderIn(wmsRawOrderIn);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改白坯手动入库单
|
||||
*
|
||||
* @param wmsRawOrderIn 白坯手动入库单
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int updateWmsRawOrderIn(WmsRawOrderIn wmsRawOrderIn) {
|
||||
wmsRawOrderIn.setFactoryCode("1000");
|
||||
wmsRawOrderIn.setWhCode("A");
|
||||
wmsRawOrderIn.setWaCode("A");
|
||||
wmsRawOrderIn.setWlCode("A-A01");
|
||||
wmsRawOrderIn.setDnNo("202312");
|
||||
wmsRawOrderIn.setOrderStatus("0");
|
||||
wmsRawOrderIn.setActiveFlag("1");
|
||||
wmsRawOrderIn.setSupplyCode("0000102874");
|
||||
wmsRawOrderIn.setSapFactoryCode("1000");
|
||||
wmsRawOrderIn.setQualityStatus("0");
|
||||
return wmsRawOrderInMapper.updateWmsRawOrderIn(wmsRawOrderIn);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除白坯手动入库单
|
||||
*
|
||||
* @param rawOrderInIds 需要删除的白坯手动入库单主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int deleteWmsRawOrderInByRawOrderInIds(String[] rawOrderInIds) {
|
||||
return wmsRawOrderInMapper.deleteWmsRawOrderInByRawOrderInIds(rawOrderInIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除白坯手动入库单信息
|
||||
*
|
||||
* @param rawOrderInId 白坯手动入库单主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int deleteWmsRawOrderInByRawOrderInId(String rawOrderInId) {
|
||||
return wmsRawOrderInMapper.deleteWmsRawOrderInByRawOrderInId(rawOrderInId);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,178 @@
|
||||
<?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.quality.mapper.QcCheckTaskUserMapper">
|
||||
|
||||
<resultMap type="QcCheckTaskUser" id="QcCheckTaskUserResult">
|
||||
<result property="recordId" column="record_id" />
|
||||
<result property="checkNo" column="check_no" />
|
||||
<result property="checkManCode" column="check_man_code" />
|
||||
<result property="checkManName" column="check_man_name" />
|
||||
<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="factoryCode" column="factory_code" />
|
||||
<result property="delFlag" column="del_flag" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectQcCheckTaskUserVo">
|
||||
select record_id, check_no, check_man_code, check_man_name, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_check_task_user
|
||||
</sql>
|
||||
|
||||
<select id="selectQcCheckTaskUserList" parameterType="QcCheckTaskUser" resultMap="QcCheckTaskUserResult">
|
||||
<include refid="selectQcCheckTaskUserVo"/>
|
||||
<where>
|
||||
<if test="checkNo != null and checkNo != ''"> and check_no = #{checkNo}</if>
|
||||
<if test="checkManCode != null and checkManCode != ''"> and check_man_code = #{checkManCode}</if>
|
||||
<if test="checkManName != null and checkManName != ''"> and check_man_name like concat('%', #{checkManName}, '%')</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 != ''"> and attr3 = #{attr3}</if>
|
||||
<if test="attr4 != null and attr4 != ''"> and attr4 = #{attr4}</if>
|
||||
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectQcCheckTaskUserByRecordId" parameterType="String" resultMap="QcCheckTaskUserResult">
|
||||
<include refid="selectQcCheckTaskUserVo"/>
|
||||
where record_id = #{recordId}
|
||||
</select>
|
||||
|
||||
<insert id="insertQcCheckTaskUser" parameterType="QcCheckTaskUser">
|
||||
insert into qc_check_task_user
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="recordId != null">record_id,</if>
|
||||
<if test="checkNo != null">check_no,</if>
|
||||
<if test="checkManCode != null">check_man_code,</if>
|
||||
<if test="checkManName != null">check_man_name,</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="factoryCode != null and factoryCode != ''">factory_code,</if>
|
||||
<if test="delFlag != null">del_flag,</if>
|
||||
<if test="belongTo != null">belong_to,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="recordId != null">#{recordId},</if>
|
||||
<if test="checkNo != null">#{checkNo},</if>
|
||||
<if test="checkManCode != null">#{checkManCode},</if>
|
||||
<if test="checkManName != null">#{checkManName},</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="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
|
||||
<if test="delFlag != null">#{delFlag},</if>
|
||||
<if test="belongTo != null">#{belongTo},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateQcCheckTaskUser" parameterType="QcCheckTaskUser">
|
||||
update qc_check_task_user
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="checkNo != null">check_no = #{checkNo},</if>
|
||||
<if test="checkManCode != null">check_man_code = #{checkManCode},</if>
|
||||
<if test="checkManName != null">check_man_name = #{checkManName},</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="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
|
||||
<if test="delFlag != null">del_flag = #{delFlag},</if>
|
||||
<if test="belongTo != null">belong_to = #{belongTo},</if>
|
||||
</trim>
|
||||
where record_id = #{recordId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteQcCheckTaskUserByRecordId" parameterType="String">
|
||||
delete from qc_check_task_user where record_id = #{recordId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteQcCheckTaskUserByRecordIds" parameterType="String">
|
||||
delete from qc_check_task_user where record_id in
|
||||
<foreach item="recordId" collection="array" open="(" separator="," close=")">
|
||||
#{recordId}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<delete id="deleteQcCheckTaskUserByBelongTo" parameterType="String">
|
||||
delete from qc_check_task_user where belong_to = #{belongTo}
|
||||
</delete>
|
||||
|
||||
<insert id="insertQcCheckTaskUserList" parameterType="List">
|
||||
insert into qc_check_task_user(
|
||||
record_id,
|
||||
check_no,
|
||||
check_man_code,
|
||||
check_man_name,
|
||||
attr1,
|
||||
attr2,
|
||||
attr3,
|
||||
attr4,
|
||||
create_by,
|
||||
create_time,
|
||||
update_by,
|
||||
update_time,
|
||||
factory_code,
|
||||
del_flag,
|
||||
belong_to
|
||||
)
|
||||
values
|
||||
<foreach collection="list" item="item" index="index" separator=",">
|
||||
(
|
||||
#{item.recordId},
|
||||
#{item.checkNo},
|
||||
#{item.checkManCode},
|
||||
#{item.checkManName},
|
||||
#{item.attr1},
|
||||
#{item.attr2},
|
||||
#{item.attr3},
|
||||
#{item.attr4},
|
||||
#{item.createBy},
|
||||
#{item.createTime},
|
||||
#{item.updateBy},
|
||||
#{item.updateTime},
|
||||
#{item.factoryCode},
|
||||
#{item.delFlag},
|
||||
#{item.belongTo}
|
||||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<select id="selectQcCheckTaskUserByBelongTo" parameterType="String" resultMap="QcCheckTaskUserResult">
|
||||
select
|
||||
STRING_AGG(check_man_code,',') AS 'manCodes',
|
||||
STRING_AGG(check_man_name,',') AS 'manNames',
|
||||
belong_to
|
||||
from qc_check_task_user
|
||||
where belong_to = #{belongTo}
|
||||
group by belong_to
|
||||
</select>
|
||||
|
||||
<delete id="deleteQcCheckTaskUserByBelongTos" parameterType="String">
|
||||
delete from qc_check_task_user where belong_to in
|
||||
<foreach item="belongTo" collection="Array" open="(" separator="," close=")">
|
||||
#{belongTo}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,307 @@
|
||||
<?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.quality.mapper.WmsRawOrderInMapper">
|
||||
|
||||
<resultMap type="WmsRawOrderIn" id="WmsRawOrderInResult">
|
||||
<result property="rawOrderInId" column="raw_order_in_id" />
|
||||
<result property="factoryCode" column="factory_code" />
|
||||
<result property="whCode" column="wh_code" />
|
||||
<result property="waCode" column="wa_code" />
|
||||
<result property="wlCode" column="wl_code" />
|
||||
<result property="orderInType" column="order_in_type" />
|
||||
<result property="orderNo" column="order_no" />
|
||||
<result property="dnNo" column="dn_no" />
|
||||
<result property="poNo" column="po_no" />
|
||||
<result property="poLine" column="po_line" />
|
||||
<result property="poType" column="po_type" />
|
||||
<result property="materialCode" column="material_code" />
|
||||
<result property="materialDesc" column="material_desc" />
|
||||
<result property="unit" column="unit" />
|
||||
<result property="buyerGroup" column="buyer_group" />
|
||||
<result property="supplyCode" column="supply_code" />
|
||||
<result property="sapFactoryCode" column="sap_factory_code" />
|
||||
<result property="sendSpot" column="send_spot" />
|
||||
<result property="requestAmount" column="request_amount" />
|
||||
<result property="receiptAmount" column="receipt_amount" />
|
||||
<result property="shelvesAmount" column="shelves_amount" />
|
||||
<result property="location" column="location" />
|
||||
<result property="requestTime" column="request_time" />
|
||||
<result property="qualityStatus" column="quality_status" />
|
||||
<result property="orderStatus" column="order_status" />
|
||||
<result property="receiptOperator" column="receipt_operator" />
|
||||
<result property="receiptTime" column="receipt_time" />
|
||||
<result property="shelvesOperator" column="shelves_operator" />
|
||||
<result property="returnAmount" column="return_amount" />
|
||||
<result property="returnName" column="return_name" />
|
||||
<result property="returnTime" column="return_time" />
|
||||
<result property="returnStatus" column="return_status" />
|
||||
<result property="shelvesTime" column="shelves_time" />
|
||||
<result property="returnMessage" column="return_message" />
|
||||
<result property="accountingStatus" column="accounting_status" />
|
||||
<result property="accountingTime" column="accounting_time" />
|
||||
<result property="accountingMessage" column="accounting_message" />
|
||||
<result property="userDefined1" column="user_defined1" />
|
||||
<result property="userDefined2" column="user_defined2" />
|
||||
<result property="userDefined3" column="user_defined3" />
|
||||
<result property="userDefined4" column="user_defined4" />
|
||||
<result property="userDefined5" column="user_defined5" />
|
||||
<result property="userDefined6" column="user_defined6" />
|
||||
<result property="userDefined7" column="user_defined7" />
|
||||
<result property="userDefined8" column="user_defined8" />
|
||||
<result property="userDefined9" column="user_defined9" />
|
||||
<result property="userDefined10" column="user_defined10" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="gmtCreate" column="gmt_create" />
|
||||
<result property="lastModifiedBy" column="last_modified_by" />
|
||||
<result property="gmtModified" column="gmt_modified" />
|
||||
<result property="activeFlag" column="active_flag" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectWmsRawOrderInVo">
|
||||
select raw_order_in_id, factory_code, wh_code, wa_code, wl_code, order_in_type, order_no, dn_no, po_no, po_line, po_type, material_code, material_desc, unit, buyer_group, supply_code, sap_factory_code, send_spot, request_amount, receipt_amount, shelves_amount, location, request_time, quality_status, order_status, receipt_operator, receipt_time, shelves_operator, return_amount, return_name, return_time, return_status, shelves_time, return_message, accounting_status, accounting_time, accounting_message, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag from wms_raw_order_in
|
||||
</sql>
|
||||
|
||||
<select id="selectWmsRawOrderInList" parameterType="WmsRawOrderIn" resultMap="WmsRawOrderInResult">
|
||||
<include refid="selectWmsRawOrderInVo"/>
|
||||
<where>
|
||||
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
|
||||
<if test="whCode != null and whCode != ''"> and wh_code = #{whCode}</if>
|
||||
<if test="waCode != null and waCode != ''"> and wa_code = #{waCode}</if>
|
||||
<if test="wlCode != null and wlCode != ''"> and wl_code = #{wlCode}</if>
|
||||
<if test="orderInType != null and orderInType != ''"> and order_in_type = #{orderInType}</if>
|
||||
<if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if>
|
||||
<if test="dnNo != null and dnNo != ''"> and dn_no = #{dnNo}</if>
|
||||
<if test="poNo != null and poNo != ''"> and po_no = #{poNo}</if>
|
||||
<if test="poLine != null and poLine != ''"> and po_line = #{poLine}</if>
|
||||
<if test="poType != null and poType != ''"> and po_type = #{poType}</if>
|
||||
<if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if>
|
||||
<if test="materialDesc != null and materialDesc != ''"> and material_desc = #{materialDesc}</if>
|
||||
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
|
||||
<if test="buyerGroup != null and buyerGroup != ''"> and buyer_group = #{buyerGroup}</if>
|
||||
<if test="supplyCode != null and supplyCode != ''"> and supply_code = #{supplyCode}</if>
|
||||
<if test="sapFactoryCode != null and sapFactoryCode != ''"> and sap_factory_code = #{sapFactoryCode}</if>
|
||||
<if test="sendSpot != null and sendSpot != ''"> and send_spot = #{sendSpot}</if>
|
||||
<if test="requestAmount != null "> and request_amount = #{requestAmount}</if>
|
||||
<if test="receiptAmount != null "> and receipt_amount = #{receiptAmount}</if>
|
||||
<if test="shelvesAmount != null "> and shelves_amount = #{shelvesAmount}</if>
|
||||
<if test="location != null and location != ''"> and location = #{location}</if>
|
||||
<if test="requestTime != null "> and request_time = #{requestTime}</if>
|
||||
<if test="qualityStatus != null and qualityStatus != ''"> and quality_status = #{qualityStatus}</if>
|
||||
<if test="orderStatus != null and orderStatus != ''"> and order_status = #{orderStatus}</if>
|
||||
<if test="receiptOperator != null and receiptOperator != ''"> and receipt_operator = #{receiptOperator}</if>
|
||||
<if test="receiptTime != null "> and receipt_time = #{receiptTime}</if>
|
||||
<if test="shelvesOperator != null and shelvesOperator != ''"> and shelves_operator = #{shelvesOperator}</if>
|
||||
<if test="returnAmount != null "> and return_amount = #{returnAmount}</if>
|
||||
<if test="returnName != null and returnName != ''"> and return_name like concat('%', #{returnName}, '%')</if>
|
||||
<if test="returnTime != null "> and return_time = #{returnTime}</if>
|
||||
<if test="returnStatus != null and returnStatus != ''"> and return_status = #{returnStatus}</if>
|
||||
<if test="shelvesTime != null "> and shelves_time = #{shelvesTime}</if>
|
||||
<if test="returnMessage != null and returnMessage != ''"> and return_message = #{returnMessage}</if>
|
||||
<if test="accountingStatus != null and accountingStatus != ''"> and accounting_status = #{accountingStatus}</if>
|
||||
<if test="accountingTime != null "> and accounting_time = #{accountingTime}</if>
|
||||
<if test="accountingMessage != null and accountingMessage != ''"> and accounting_message = #{accountingMessage}</if>
|
||||
<if test="userDefined1 != null and userDefined1 != ''"> and user_defined1 = #{userDefined1}</if>
|
||||
<if test="userDefined2 != null and userDefined2 != ''"> and user_defined2 = #{userDefined2}</if>
|
||||
<if test="userDefined3 != null and userDefined3 != ''"> and user_defined3 = #{userDefined3}</if>
|
||||
<if test="userDefined4 != null and userDefined4 != ''"> and user_defined4 = #{userDefined4}</if>
|
||||
<if test="userDefined5 != null and userDefined5 != ''"> and user_defined5 = #{userDefined5}</if>
|
||||
<if test="userDefined6 != null and userDefined6 != ''"> and user_defined6 = #{userDefined6}</if>
|
||||
<if test="userDefined7 != null and userDefined7 != ''"> and user_defined7 = #{userDefined7}</if>
|
||||
<if test="userDefined8 != null and userDefined8 != ''"> and user_defined8 = #{userDefined8}</if>
|
||||
<if test="userDefined9 != null and userDefined9 != ''"> and user_defined9 = #{userDefined9}</if>
|
||||
<if test="userDefined10 != null and userDefined10 != ''"> and user_defined10 = #{userDefined10}</if>
|
||||
<if test="gmtCreate != null "> and gmt_create = #{gmtCreate}</if>
|
||||
<if test="lastModifiedBy != null and lastModifiedBy != ''"> and last_modified_by = #{lastModifiedBy}</if>
|
||||
<if test="gmtModified != null "> and gmt_modified = #{gmtModified}</if>
|
||||
<if test="activeFlag != null and activeFlag != ''"> and active_flag = #{activeFlag}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectWmsRawOrderInByRawOrderInId" parameterType="String" resultMap="WmsRawOrderInResult">
|
||||
<include refid="selectWmsRawOrderInVo"/>
|
||||
where raw_order_in_id = #{rawOrderInId}
|
||||
</select>
|
||||
|
||||
<insert id="insertWmsRawOrderIn" parameterType="WmsRawOrderIn">
|
||||
insert into wms_raw_order_in
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="rawOrderInId != null">raw_order_in_id,</if>
|
||||
<if test="factoryCode != null">factory_code,</if>
|
||||
<if test="whCode != null">wh_code,</if>
|
||||
<if test="waCode != null">wa_code,</if>
|
||||
<if test="wlCode != null">wl_code,</if>
|
||||
<if test="orderInType != null">order_in_type,</if>
|
||||
<if test="orderNo != null">order_no,</if>
|
||||
<if test="dnNo != null">dn_no,</if>
|
||||
<if test="poNo != null">po_no,</if>
|
||||
<if test="poLine != null">po_line,</if>
|
||||
<if test="poType != null">po_type,</if>
|
||||
<if test="materialCode != null">material_code,</if>
|
||||
<if test="materialDesc != null">material_desc,</if>
|
||||
<if test="unit != null">unit,</if>
|
||||
<if test="buyerGroup != null">buyer_group,</if>
|
||||
<if test="supplyCode != null">supply_code,</if>
|
||||
<if test="sapFactoryCode != null">sap_factory_code,</if>
|
||||
<if test="sendSpot != null">send_spot,</if>
|
||||
<if test="requestAmount != null">request_amount,</if>
|
||||
<if test="receiptAmount != null">receipt_amount,</if>
|
||||
<if test="shelvesAmount != null">shelves_amount,</if>
|
||||
<if test="location != null">location,</if>
|
||||
<if test="requestTime != null">request_time,</if>
|
||||
<if test="qualityStatus != null">quality_status,</if>
|
||||
<if test="orderStatus != null">order_status,</if>
|
||||
<if test="receiptOperator != null">receipt_operator,</if>
|
||||
<if test="receiptTime != null">receipt_time,</if>
|
||||
<if test="shelvesOperator != null">shelves_operator,</if>
|
||||
<if test="returnAmount != null">return_amount,</if>
|
||||
<if test="returnName != null">return_name,</if>
|
||||
<if test="returnTime != null">return_time,</if>
|
||||
<if test="returnStatus != null">return_status,</if>
|
||||
<if test="shelvesTime != null">shelves_time,</if>
|
||||
<if test="returnMessage != null">return_message,</if>
|
||||
<if test="accountingStatus != null">accounting_status,</if>
|
||||
<if test="accountingTime != null">accounting_time,</if>
|
||||
<if test="accountingMessage != null">accounting_message,</if>
|
||||
<if test="userDefined1 != null">user_defined1,</if>
|
||||
<if test="userDefined2 != null">user_defined2,</if>
|
||||
<if test="userDefined3 != null">user_defined3,</if>
|
||||
<if test="userDefined4 != null">user_defined4,</if>
|
||||
<if test="userDefined5 != null">user_defined5,</if>
|
||||
<if test="userDefined6 != null">user_defined6,</if>
|
||||
<if test="userDefined7 != null">user_defined7,</if>
|
||||
<if test="userDefined8 != null">user_defined8,</if>
|
||||
<if test="userDefined9 != null">user_defined9,</if>
|
||||
<if test="userDefined10 != null">user_defined10,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="gmtCreate != null">gmt_create,</if>
|
||||
<if test="lastModifiedBy != null">last_modified_by,</if>
|
||||
<if test="gmtModified != null">gmt_modified,</if>
|
||||
<if test="activeFlag != null">active_flag,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="rawOrderInId != null">#{rawOrderInId},</if>
|
||||
<if test="factoryCode != null">#{factoryCode},</if>
|
||||
<if test="whCode != null">#{whCode},</if>
|
||||
<if test="waCode != null">#{waCode},</if>
|
||||
<if test="wlCode != null">#{wlCode},</if>
|
||||
<if test="orderInType != null">#{orderInType},</if>
|
||||
<if test="orderNo != null">#{orderNo},</if>
|
||||
<if test="dnNo != null">#{dnNo},</if>
|
||||
<if test="poNo != null">#{poNo},</if>
|
||||
<if test="poLine != null">#{poLine},</if>
|
||||
<if test="poType != null">#{poType},</if>
|
||||
<if test="materialCode != null">#{materialCode},</if>
|
||||
<if test="materialDesc != null">#{materialDesc},</if>
|
||||
<if test="unit != null">#{unit},</if>
|
||||
<if test="buyerGroup != null">#{buyerGroup},</if>
|
||||
<if test="supplyCode != null">#{supplyCode},</if>
|
||||
<if test="sapFactoryCode != null">#{sapFactoryCode},</if>
|
||||
<if test="sendSpot != null">#{sendSpot},</if>
|
||||
<if test="requestAmount != null">#{requestAmount},</if>
|
||||
<if test="receiptAmount != null">#{receiptAmount},</if>
|
||||
<if test="shelvesAmount != null">#{shelvesAmount},</if>
|
||||
<if test="location != null">#{location},</if>
|
||||
<if test="requestTime != null">#{requestTime},</if>
|
||||
<if test="qualityStatus != null">#{qualityStatus},</if>
|
||||
<if test="orderStatus != null">#{orderStatus},</if>
|
||||
<if test="receiptOperator != null">#{receiptOperator},</if>
|
||||
<if test="receiptTime != null">#{receiptTime},</if>
|
||||
<if test="shelvesOperator != null">#{shelvesOperator},</if>
|
||||
<if test="returnAmount != null">#{returnAmount},</if>
|
||||
<if test="returnName != null">#{returnName},</if>
|
||||
<if test="returnTime != null">#{returnTime},</if>
|
||||
<if test="returnStatus != null">#{returnStatus},</if>
|
||||
<if test="shelvesTime != null">#{shelvesTime},</if>
|
||||
<if test="returnMessage != null">#{returnMessage},</if>
|
||||
<if test="accountingStatus != null">#{accountingStatus},</if>
|
||||
<if test="accountingTime != null">#{accountingTime},</if>
|
||||
<if test="accountingMessage != null">#{accountingMessage},</if>
|
||||
<if test="userDefined1 != null">#{userDefined1},</if>
|
||||
<if test="userDefined2 != null">#{userDefined2},</if>
|
||||
<if test="userDefined3 != null">#{userDefined3},</if>
|
||||
<if test="userDefined4 != null">#{userDefined4},</if>
|
||||
<if test="userDefined5 != null">#{userDefined5},</if>
|
||||
<if test="userDefined6 != null">#{userDefined6},</if>
|
||||
<if test="userDefined7 != null">#{userDefined7},</if>
|
||||
<if test="userDefined8 != null">#{userDefined8},</if>
|
||||
<if test="userDefined9 != null">#{userDefined9},</if>
|
||||
<if test="userDefined10 != null">#{userDefined10},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="gmtCreate != null">#{gmtCreate},</if>
|
||||
<if test="lastModifiedBy != null">#{lastModifiedBy},</if>
|
||||
<if test="gmtModified != null">#{gmtModified},</if>
|
||||
<if test="activeFlag != null">#{activeFlag},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateWmsRawOrderIn" parameterType="WmsRawOrderIn">
|
||||
update wms_raw_order_in
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
|
||||
<if test="whCode != null">wh_code = #{whCode},</if>
|
||||
<if test="waCode != null">wa_code = #{waCode},</if>
|
||||
<if test="wlCode != null">wl_code = #{wlCode},</if>
|
||||
<if test="orderInType != null">order_in_type = #{orderInType},</if>
|
||||
<if test="orderNo != null">order_no = #{orderNo},</if>
|
||||
<if test="dnNo != null">dn_no = #{dnNo},</if>
|
||||
<if test="poNo != null">po_no = #{poNo},</if>
|
||||
<if test="poLine != null">po_line = #{poLine},</if>
|
||||
<if test="poType != null">po_type = #{poType},</if>
|
||||
<if test="materialCode != null">material_code = #{materialCode},</if>
|
||||
<if test="materialDesc != null">material_desc = #{materialDesc},</if>
|
||||
<if test="unit != null">unit = #{unit},</if>
|
||||
<if test="buyerGroup != null">buyer_group = #{buyerGroup},</if>
|
||||
<if test="supplyCode != null">supply_code = #{supplyCode},</if>
|
||||
<if test="sapFactoryCode != null">sap_factory_code = #{sapFactoryCode},</if>
|
||||
<if test="sendSpot != null">send_spot = #{sendSpot},</if>
|
||||
<if test="requestAmount != null">request_amount = #{requestAmount},</if>
|
||||
<if test="receiptAmount != null">receipt_amount = #{receiptAmount},</if>
|
||||
<if test="shelvesAmount != null">shelves_amount = #{shelvesAmount},</if>
|
||||
<if test="location != null">location = #{location},</if>
|
||||
<if test="requestTime != null">request_time = #{requestTime},</if>
|
||||
<if test="qualityStatus != null">quality_status = #{qualityStatus},</if>
|
||||
<if test="orderStatus != null">order_status = #{orderStatus},</if>
|
||||
<if test="receiptOperator != null">receipt_operator = #{receiptOperator},</if>
|
||||
<if test="receiptTime != null">receipt_time = #{receiptTime},</if>
|
||||
<if test="shelvesOperator != null">shelves_operator = #{shelvesOperator},</if>
|
||||
<if test="returnAmount != null">return_amount = #{returnAmount},</if>
|
||||
<if test="returnName != null">return_name = #{returnName},</if>
|
||||
<if test="returnTime != null">return_time = #{returnTime},</if>
|
||||
<if test="returnStatus != null">return_status = #{returnStatus},</if>
|
||||
<if test="shelvesTime != null">shelves_time = #{shelvesTime},</if>
|
||||
<if test="returnMessage != null">return_message = #{returnMessage},</if>
|
||||
<if test="accountingStatus != null">accounting_status = #{accountingStatus},</if>
|
||||
<if test="accountingTime != null">accounting_time = #{accountingTime},</if>
|
||||
<if test="accountingMessage != null">accounting_message = #{accountingMessage},</if>
|
||||
<if test="userDefined1 != null">user_defined1 = #{userDefined1},</if>
|
||||
<if test="userDefined2 != null">user_defined2 = #{userDefined2},</if>
|
||||
<if test="userDefined3 != null">user_defined3 = #{userDefined3},</if>
|
||||
<if test="userDefined4 != null">user_defined4 = #{userDefined4},</if>
|
||||
<if test="userDefined5 != null">user_defined5 = #{userDefined5},</if>
|
||||
<if test="userDefined6 != null">user_defined6 = #{userDefined6},</if>
|
||||
<if test="userDefined7 != null">user_defined7 = #{userDefined7},</if>
|
||||
<if test="userDefined8 != null">user_defined8 = #{userDefined8},</if>
|
||||
<if test="userDefined9 != null">user_defined9 = #{userDefined9},</if>
|
||||
<if test="userDefined10 != null">user_defined10 = #{userDefined10},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="gmtCreate != null">gmt_create = #{gmtCreate},</if>
|
||||
<if test="lastModifiedBy != null">last_modified_by = #{lastModifiedBy},</if>
|
||||
<if test="gmtModified != null">gmt_modified = #{gmtModified},</if>
|
||||
<if test="activeFlag != null">active_flag = #{activeFlag},</if>
|
||||
</trim>
|
||||
where raw_order_in_id = #{rawOrderInId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteWmsRawOrderInByRawOrderInId" parameterType="String">
|
||||
delete from wms_raw_order_in where raw_order_in_id = #{rawOrderInId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteWmsRawOrderInByRawOrderInIds" parameterType="String">
|
||||
delete from wms_raw_order_in where raw_order_in_id in
|
||||
<foreach item="rawOrderInId" collection="array" open="(" separator="," close=")">
|
||||
#{rawOrderInId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue