root/yongYuJiaJu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/yongYuJiaJu

Browse Source
This commit is contained in:
liyongde
2022-12-23 16:05:21 +08:00
parent be527e4dbb a2dae50e5d
commit 805c62d71a
34 changed files with 417 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

249
acs/nladmin-system/hs_err_pid16808.log Normal file
View File

@@ -0,0 +1,249 @@
#
# A fatal error has been detected by the Java Runtime Environment:
#
# Internal Error (vmThread.cpp:658), pid=16808, tid=0x0000000000003fb8
# fatal error: Nested VM operation CollectForMetadataAllocation requested by operation ChangeBreakpoints
#
# JRE version: Java(TM) SE Runtime Environment (8.0_131-b11) (build 1.8.0_131-b11)
# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.131-b11 mixed mode windows-amd64 compressed oops)
# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows
#
# If you would like to submit a bug report, please visit:
# http://bugreport.java.com/bugreport/crash.jsp
#
--------------- T H R E A D ---------------
Current thread (0x000000001cf4e000): VMThread [stack: 0x000000001e5b0000,0x000000001e6b0000] [id=16312]
Stack: [0x000000001e5b0000,0x000000001e6b0000]
[error occurred during error reporting (printing stack bounds), id 0xc0000005]
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
VM_Operation (0x000000001f00f350): ChangeBreakpoints, mode: safepoint, requested by thread 0x000000001e856800
--------------- P R O C E S S ---------------
Java Threads: ( => current thread )
0x00000000214fc800 JavaThread "Thread-3" daemon [_thread_blocked, id=16892, stack(0x00000000227f0000,0x00000000228f0000)]
0x00000000214ef800 JavaThread "rebel-build-info" daemon [_thread_blocked, id=6932, stack(0x00000000226f0000,0x00000000227f0000)]
0x00000000214f2800 JavaThread "rebel-change-detector-thread" daemon [_thread_blocked, id=2416, stack(0x00000000225f0000,0x00000000226f0000)]
0x00000000214f5000 JavaThread "rebel-debugger-thread" daemon [_thread_blocked, id=16992, stack(0x00000000224f0000,0x00000000225f0000)]
0x00000000214f3800 JavaThread "rebel-debugger-attach-notifier" daemon [_thread_blocked, id=936, stack(0x00000000223f0000,0x00000000224f0000)]
0x00000000214f0800 JavaThread "rebel-heartbeat-thread" daemon [_thread_blocked, id=18400, stack(0x00000000222f0000,0x00000000223f0000)]
0x00000000214f2000 JavaThread "rebel-redeploy-thread" daemon [_thread_blocked, id=18252, stack(0x00000000221f0000,0x00000000222f0000)]
0x00000000214f1000 JavaThread "rebel-IDENotificationsImpl-PostCycle" daemon [_thread_blocked, id=20796, stack(0x0000000020610000,0x0000000020710000)]
0x00000000214f6800 JavaThread "rebel-init-licensing" daemon [_thread_blocked, id=12180, stack(0x000000001ff10000,0x0000000020010000)]
0x00000000214f6000 JavaThread "rebel-leaseManager-1" daemon [_thread_blocked, id=18936, stack(0x000000001fe10000,0x000000001ff10000)]
0x000000001f931000 JavaThread "rebel-weak-reaper" daemon [_thread_blocked, id=1868, stack(0x000000001fb10000,0x000000001fc10000)]
0x000000001f937000 JavaThread "rebel-cache-writer" daemon [_thread_blocked, id=19024, stack(0x000000001fa10000,0x000000001fb10000)]
0x000000001f932800 JavaThread "rebel-fsnotify-OutputReader" daemon [_thread_in_native, id=15124, stack(0x0000000020310000,0x0000000020410000)]
0x000000001f938000 JavaThread "rebel-fsnotify-OutputReader" daemon [_thread_in_native, id=17832, stack(0x0000000020210000,0x0000000020310000)]
0x000000001f935800 JavaThread "rebel-fsnotify-ShutdownOnTermination" daemon [_thread_blocked, id=19144, stack(0x0000000020110000,0x0000000020210000)]
0x000000001f936800 JavaThread "rebel-logger" daemon [_thread_blocked, id=788, stack(0x0000000021ad0000,0x0000000021bd0000)]
0x000000001f935000 JavaThread "rebel-CacheKeepAlive" daemon [_thread_blocked, id=15092, stack(0x0000000020010000,0x0000000020110000)]
0x000000001e868000 JavaThread "JDWP Command Reader" daemon [_thread_in_native, id=7780, stack(0x000000001f110000,0x000000001f210000)]
0x000000001e866800 JavaThread "JDWP Event Helper Thread" daemon [_thread_blocked, id=16532, stack(0x000000001f010000,0x000000001f110000)]
0x000000001e856800 JavaThread "JDWP Transport Listener: dt_socket" daemon [_thread_blocked, id=2752, stack(0x000000001ef10000,0x000000001f010000)]
0x000000001e81f800 JavaThread "Attach Listener" daemon [_thread_blocked, id=19928, stack(0x000000001ee10000,0x000000001ef10000)]
0x000000001e81e000 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=3344, stack(0x000000001ed10000,0x000000001ee10000)]
0x000000001cf5b800 JavaThread "Finalizer" daemon [_thread_blocked, id=5504, stack(0x000000001ebb0000,0x000000001ecb0000)]
0x000000001cf54800 JavaThread "Reference Handler" daemon [_thread_blocked, id=16900, stack(0x000000001e6b0000,0x000000001e7b0000)]
0x00000000034ab000 JavaThread "main" [_thread_blocked, id=20608, stack(0x0000000003370000,0x0000000003470000)]
Other Threads:
=>0x000000001cf4e000 VMThread [stack: 0x000000001e5b0000,0x000000001e6b0000] [id=16312]
VM state:at safepoint (normal execution)
VM Mutex/Monitor currently owned by a thread: ([mutex/lock_event])
[0x00000000034a0dd0] Threads_lock - owner thread: 0x000000001cf4e000
Heap:
PSYoungGen total 76288K, used 61360K [0x000000076b500000, 0x0000000774a00000, 0x00000007c0000000)
eden space 65536K, 77% used [0x000000076b500000,0x000000076e673e10,0x000000076f500000)
from space 10752K, 99% used [0x0000000773f80000,0x00000007749f8460,0x0000000774a00000)
to space 10752K, 0% used [0x000000076f500000,0x000000076f500000,0x000000076ff80000)
ParOldGen total 175104K, used 14872K [0x00000006c1e00000, 0x00000006cc900000, 0x000000076b500000)
object space 175104K, 8% used [0x00000006c1e00000,0x00000006c2c860b0,0x00000006cc900000)
Metaspace used 20080K, capacity 21152K, committed 21296K, reserved 1067008K
class space used 2599K, capacity 2930K, committed 2944K, reserved 1048576K
Card table byte_map: [0x0000000012b00000,0x0000000013300000] byte_map_base: 0x000000000f4f1000
Marking Bits: (ParMarkBitMap*) 0x000000005889c720
Begin Bits: [0x0000000013e50000, 0x0000000017dd8000)
End Bits: [0x0000000017dd8000, 0x000000001bd60000)
Polling page: 0x0000000002ef0000
CodeCache: size=245760Kb used=574Kb max_used=574Kb free=245185Kb
bounds [0x0000000003740000, 0x00000000039b0000, 0x0000000012740000]
total_blobs=385 nmethods=55 adapters=303
compilation: enabled
Compilation events (0 events):
No events
GC Heap History (4 events):
Event: 1.081 GC heap before
{Heap before GC invocations=1 (full 0):
PSYoungGen total 76288K, used 65536K [0x000000076b500000, 0x0000000770a00000, 0x00000007c0000000)
eden space 65536K, 100% used [0x000000076b500000,0x000000076f500000,0x000000076f500000)
from space 10752K, 0% used [0x000000076ff80000,0x000000076ff80000,0x0000000770a00000)
to space 10752K, 0% used [0x000000076f500000,0x000000076f500000,0x000000076ff80000)
ParOldGen total 175104K, used 0K [0x00000006c1e00000, 0x00000006cc900000, 0x000000076b500000)
object space 175104K, 0% used [0x00000006c1e00000,0x00000006c1e00000,0x00000006cc900000)
Metaspace used 13840K, capacity 14844K, committed 15104K, reserved 1062912K
class space used 1699K, capacity 2002K, committed 2048K, reserved 1048576K
Event: 1.092 GC heap after
Heap after GC invocations=1 (full 0):
PSYoungGen total 76288K, used 10653K [0x000000076b500000, 0x0000000774a00000, 0x00000007c0000000)
eden space 65536K, 0% used [0x000000076b500000,0x000000076b500000,0x000000076f500000)
from space 10752K, 99% used [0x000000076f500000,0x000000076ff67578,0x000000076ff80000)
to space 10752K, 0% used [0x0000000773f80000,0x0000000773f80000,0x0000000774a00000)
ParOldGen total 175104K, used 0K [0x00000006c1e00000, 0x00000006cc900000, 0x000000076b500000)
object space 175104K, 0% used [0x00000006c1e00000,0x00000006c1e00000,0x00000006cc900000)
Metaspace used 13840K, capacity 14844K, committed 15104K, reserved 1062912K
class space used 1699K, capacity 2002K, committed 2048K, reserved 1048576K
}
Event: 2.995 GC heap before
{Heap before GC invocations=2 (full 0):
PSYoungGen total 76288K, used 76189K [0x000000076b500000, 0x0000000774a00000, 0x00000007c0000000)
eden space 65536K, 100% used [0x000000076b500000,0x000000076f500000,0x000000076f500000)
from space 10752K, 99% used [0x000000076f500000,0x000000076ff67578,0x000000076ff80000)
to space 10752K, 0% used [0x0000000773f80000,0x0000000773f80000,0x0000000774a00000)
ParOldGen total 175104K, used 0K [0x00000006c1e00000, 0x00000006cc900000, 0x000000076b500000)
object space 175104K, 0% used [0x00000006c1e00000,0x00000006c1e00000,0x00000006cc900000)
Metaspace used 14788K, capacity 15784K, committed 16000K, reserved 1062912K
class space used 1820K, capacity 2146K, committed 2176K, reserved 1048576K
Event: 3.009 GC heap after
Heap after GC invocations=2 (full 0):
PSYoungGen total 76288K, used 10721K [0x000000076b500000, 0x0000000774a00000, 0x00000007c0000000)
eden space 65536K, 0% used [0x000000076b500000,0x000000076b500000,0x000000076f500000)
from space 10752K, 99% used [0x0000000773f80000,0x00000007749f8460,0x0000000774a00000)
to space 10752K, 0% used [0x000000076f500000,0x000000076f500000,0x000000076ff80000)
ParOldGen total 175104K, used 14872K [0x00000006c1e00000, 0x00000006cc900000, 0x000000076b500000)
object space 175104K, 8% used [0x00000006c1e00000,0x00000006c2c860b0,0x00000006cc900000)
Metaspace used 14788K, capacity 15784K, committed 16000K, reserved 1062912K
class space used 1820K, capacity 2146K, committed 2176K, reserved 1048576K
}
Deoptimization events (0 events):
No events
Internal exceptions (10 events):
Event: 0.570 Thread 0x00000000034ab000 Exception <a 'java/lang/NoSuchFieldError': method resolution failed> (0x000000076c1113c0) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u131\8869\hotspot\src\share\vm\prims\methodHandles.cpp, line 1146]
Event: 0.572 Thread 0x00000000034ab000 Exception <a 'java/lang/NoSuchFieldError': method resolution failed> (0x000000076c11eb40) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u131\8869\hotspot\src\share\vm\prims\methodHandles.cpp, line 1146]
Event: 0.613 Thread 0x00000000034ab000 Exception <a 'java/lang/ClassNotFoundException': com/ibm/oti/vm/VM> (0x000000076c2829e8) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u131\8869\hotspot\src\share\vm\classfile\systemDictionary.cpp, line 210]
Event: 0.683 Thread 0x000000001f92e000 Exception <a 'java/lang/ClassNotFoundException': com/ibm/oti/vm/VM> (0x000000076c992700) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u131\8869\hotspot\src\share\vm\classfile\systemDictionary.cpp, line 210]
Event: 0.751 Thread 0x000000001f931000 Exception <a 'java/lang/ClassNotFoundException': com/ibm/oti/vm/VM> (0x000000076d9c0220) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u131\8869\hotspot\src\share\vm\classfile\systemDictionary.cpp, line 210]
Event: 0.982 Thread 0x00000000034ab000 Exception <a 'java/lang/NoClassDefFoundError': jdk/internal/misc/Unsafe> (0x000000076f2475f0) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u131\8869\hotspot\src\share\vm\classfile\systemDictionary.cpp, line 208]
Event: 2.903 Thread 0x00000000034ab000 Exception <a 'java/lang/ClassNotFoundException': java/lang/invoke/MethodHandleImpl$FieldAccessor> (0x000000076f032dc0) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u131\8869\hotspot\src\share\vm\classfile\systemDictionary.cpp, line 210]
Event: 2.930 Thread 0x00000000034ab000 Exception <a 'java/lang/ClassNotFoundException': jdk/internal/misc/Unsafe> (0x000000076f0ea520) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u131\8869\hotspot\src\share\vm\classfile\systemDictionary.cpp, line 210]
Event: 3.990 Thread 0x00000000034ab000 Exception <a 'java/lang/ClassNotFoundException': com/ibm/oti/vm/VM> (0x000000076db8cc28) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u131\8869\hotspot\src\share\vm\classfile\systemDictionary.cpp, line 210]
Event: 4.015 Thread 0x00000000034ab000 Exception <a 'java/lang/ClassNotFoundException': java/lang/J9VMInternals> (0x000000076dc30aa8) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u131\8869\hotspot\src\share\vm\classfile\systemDictionary.cpp, line 210]
Events (10 events):
Event: 4.285 loading class com/zeroturnaround/jrebel/bundled/org/apache/http/message/x
Event: 4.285 loading class com/zeroturnaround/javarebel/mj
Event: 4.285 loading class com/zeroturnaround/jrebel/bundled/org/apache/http/message/x done
Event: 4.286 loading class com/zeroturnaround/javarebel/mj done
Event: 4.286 loading class com/zeroturnaround/javarebel/mi
Event: 4.286 loading class java/util/concurrent/ConcurrentHashMap$EntryIterator
Event: 4.286 loading class com/zeroturnaround/javarebel/mi done
Event: 4.286 loading class java/util/concurrent/ConcurrentHashMap$EntryIterator done
Event: 4.286 loading class com/zeroturnaround/jrebel/bundled/org/apache/http/cookie/f
Event: 4.287 Executing VM operation: ChangeBreakpoints
Dynamic libraries:
0x00007ff7a0380000 - 0x00007ff7a03b7000 D:\Program Files\Java\jdk8u131\bin\java.exe
0x00007ffe5a0b0000 - 0x00007ffe5a2a8000 C:\WINDOWS\SYSTEM32\ntdll.dll
0x00007ffe58550000 - 0x00007ffe5860d000 C:\WINDOWS\System32\KERNEL32.DLL
0x00007ffe57b50000 - 0x00007ffe57e1e000 C:\WINDOWS\System32\KERNELBASE.dll
0x00007ffe59f60000 - 0x00007ffe5a00e000 C:\WINDOWS\System32\ADVAPI32.dll
0x00007ffe59850000 - 0x00007ffe598ee000 C:\WINDOWS\System32\msvcrt.dll
0x00007ffe59ea0000 - 0x00007ffe59f3c000 C:\WINDOWS\System32\sechost.dll
0x00007ffe59360000 - 0x00007ffe59485000 C:\WINDOWS\System32\RPCRT4.dll
0x00007ffe596b0000 - 0x00007ffe59850000 C:\WINDOWS\System32\USER32.dll
0x00007ffe57ee0000 - 0x00007ffe57f02000 C:\WINDOWS\System32\win32u.dll
0x00007ffe594a0000 - 0x00007ffe594ca000 C:\WINDOWS\System32\GDI32.dll
0x00007ffe57f10000 - 0x00007ffe5801b000 C:\WINDOWS\System32\gdi32full.dll
0x00007ffe58020000 - 0x00007ffe580bd000 C:\WINDOWS\System32\msvcp_win.dll
0x00007ffe57930000 - 0x00007ffe57a30000 C:\WINDOWS\System32\ucrtbase.dll
0x00007ffe41a50000 - 0x00007ffe41cea000 C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.1110_none_60b5254171f9507e\COMCTL32.dll
0x00007ffe594d0000 - 0x00007ffe59500000 C:\WINDOWS\System32\IMM32.DLL
0x0000000058920000 - 0x00000000589f2000 D:\Program Files\Java\jdk8u131\jre\bin\msvcr100.dll
0x0000000058080000 - 0x000000005891c000 D:\Program Files\Java\jdk8u131\jre\bin\server\jvm.dll
0x00007ffe599c0000 - 0x00007ffe599c8000 C:\WINDOWS\System32\PSAPI.DLL
0x00007ffe41900000 - 0x00007ffe41927000 C:\WINDOWS\SYSTEM32\WINMM.dll
0x00007ffe52200000 - 0x00007ffe5220a000 C:\WINDOWS\SYSTEM32\VERSION.dll
0x00007ffe455b0000 - 0x00007ffe455b9000 C:\WINDOWS\SYSTEM32\WSOCK32.dll
0x00007ffe591e0000 - 0x00007ffe5924b000 C:\WINDOWS\System32\WS2_32.dll
0x0000000058070000 - 0x000000005807f000 D:\Program Files\Java\jdk8u131\jre\bin\verify.dll
0x0000000058040000 - 0x0000000058069000 D:\Program Files\Java\jdk8u131\jre\bin\java.dll
0x0000000057410000 - 0x0000000057445000 D:\Program Files\Java\jdk8u131\jre\bin\jdwp.dll
0x0000000057fd0000 - 0x0000000057fd8000 D:\Program Files\Java\jdk8u131\jre\bin\npt.dll
0x00007ffdfb590000 - 0x00007ffdfb5dd000 C:\Users\85896\AppData\Roaming\JetBrains\IntelliJIdea2021.1\plugins\jr-ide-idea\lib\jrebel6\lib\jrebel64.dll
0x00007ffe58610000 - 0x00007ffe58d54000 C:\WINDOWS\System32\SHELL32.dll
0x00007ffe570b0000 - 0x00007ffe570bc000 C:\WINDOWS\SYSTEM32\CRYPTBASE.DLL
0x00007ffe59250000 - 0x00007ffe592fd000 C:\WINDOWS\System32\shcore.dll
0x00007ffe58e80000 - 0x00007ffe591d4000 C:\WINDOWS\System32\combase.dll
0x00000000573e0000 - 0x0000000057403000 D:\Program Files\Java\jdk8u131\jre\bin\instrument.dll
0x0000000058020000 - 0x0000000058036000 D:\Program Files\Java\jdk8u131\jre\bin\zip.dll
0x00007ffe558d0000 - 0x00007ffe56064000 C:\WINDOWS\SYSTEM32\windows.storage.dll
0x00007ffe57230000 - 0x00007ffe57260000 C:\WINDOWS\SYSTEM32\Wldp.dll
0x00007ffe58e20000 - 0x00007ffe58e75000 C:\WINDOWS\System32\shlwapi.dll
0x00007ffe57710000 - 0x00007ffe5772f000 C:\WINDOWS\SYSTEM32\profapi.dll
0x00000000573d0000 - 0x00000000573d9000 D:\Program Files\Java\jdk8u131\jre\bin\dt_socket.dll
0x00007ffe56ec0000 - 0x00007ffe56f2a000 C:\WINDOWS\system32\mswsock.dll
0x00000000573c0000 - 0x00000000573cd000 D:\Program Files\Java\jdk8u131\jre\bin\management.dll
0x0000000058000000 - 0x000000005801a000 D:\Program Files\Java\jdk8u131\jre\bin\net.dll
0x0000000057fe0000 - 0x0000000057ff1000 D:\Program Files\Java\jdk8u131\jre\bin\nio.dll
0x0000000057390000 - 0x00000000573b4000 D:\Program Files\Java\jdk8u131\jre\bin\sunec.dll
0x00007ffe4f7e0000 - 0x00007ffe4f7fb000 C:\Users\85896\.jrebel\jrebel-temp\ver-e8f09868\IdeaWin64.dll
0x0000000057380000 - 0x000000005738b000 D:\Program Files\Java\jdk8u131\jre\bin\sunmscapi.dll
0x00007ffe577d0000 - 0x00007ffe57926000 C:\WINDOWS\System32\CRYPT32.dll
0x00007ffe570c0000 - 0x00007ffe570d8000 C:\WINDOWS\SYSTEM32\CRYPTSP.dll
0x00007ffe56840000 - 0x00007ffe56874000 C:\WINDOWS\system32\rsaenh.dll
0x00007ffe57e20000 - 0x00007ffe57e47000 C:\WINDOWS\System32\bcrypt.dll
0x00007ffe576d0000 - 0x00007ffe576fe000 C:\WINDOWS\SYSTEM32\USERENV.dll
0x00007ffe57e50000 - 0x00007ffe57ed2000 C:\WINDOWS\System32\bcryptprimitives.dll
0x00007ffe56bb0000 - 0x00007ffe56beb000 C:\WINDOWS\SYSTEM32\IPHLPAPI.DLL
0x00007ffe58e10000 - 0x00007ffe58e18000 C:\WINDOWS\System32\NSI.dll
0x00007ffe50120000 - 0x00007ffe50137000 C:\WINDOWS\SYSTEM32\dhcpcsvc6.DLL
0x00007ffe4fed0000 - 0x00007ffe4feed000 C:\WINDOWS\SYSTEM32\dhcpcsvc.DLL
0x00007ffe56bf0000 - 0x00007ffe56cba000 C:\WINDOWS\SYSTEM32\DNSAPI.dll
VM Arguments:
jvm_args: -agentlib:jdwp=transport=dt_socket,address=127.0.0.1:14508,suspend=y,server=n -Drebel.base=C:\Users\85896\.jrebel -Drebel.env.ide.plugin.version=2022.2.0 -Drebel.env.ide.version=2021.1.3 -Drebel.env.ide.product=IU -Drebel.env.ide=intellij -Drebel.notification.url=http://localhost:11125 -agentpath:C:\Users\85896\AppData\Roaming\JetBrains\IntelliJIdea2021.1\plugins\jr-ide-idea\lib\jrebel6\lib\jrebel64.dll -XX:TieredStopAtLevel=1 -Xverify:none -Dspring.output.ansi.enabled=always -javaagent:C:\Users\85896\AppData\Local\JetBrains\IntelliJIdea2021.1\captureAgent\debugger-agent.jar -Dcom.sun.management.jmxremote -Dspring.jmx.enabled=true -Dspring.liveBeansView.mbeanDomain -Dspring.application.admin.enabled=true -Dfile.encoding=UTF-8
java_command: org.nl.AppRun
java_class_path (initial): D:\Program Files\Java\jdk8u131\jre\lib\charsets.jar;D:\Program Files\Java\jdk8u131\jre\lib\deploy.jar;D:\Program Files\Java\jdk8u131\jre\lib\ext\access-bridge-64.jar;D:\Program Files\Java\jdk8u131\jre\lib\ext\cldrdata.jar;D:\Program Files\Java\jdk8u131\jre\lib\ext\dnsns.jar;D:\Program Files\Java\jdk8u131\jre\lib\ext\jaccess.jar;D:\Program Files\Java\jdk8u131\jre\lib\ext\jfxrt.jar;D:\Program Files\Java\jdk8u131\jre\lib\ext\localedata.jar;D:\Program Files\Java\jdk8u131\jre\lib\ext\nashorn.jar;D:\Program Files\Java\jdk8u131\jre\lib\ext\sunec.jar;D:\Program Files\Java\jdk8u131\jre\lib\ext\sunjce_provider.jar;D:\Program Files\Java\jdk8u131\jre\lib\ext\sunmscapi.jar;D:\Program Files\Java\jdk8u131\jre\lib\ext\sunpkcs11.jar;D:\Program Files\Java\jdk8u131\jre\lib\ext\zipfs.jar;D:\Program Files\Java\jdk8u131\jre\lib\javaws.jar;D:\Program Files\Java\jdk8u131\jre\lib\jce.jar;D:\Program Files\Java\jdk8u131\jre\lib\jfr.jar;D:\Program Files\Java\jdk8u131\jre\lib\jfxswt.jar;D:\Program Files\Java\jdk8u131\jre\lib\jsse.jar;D:\Program Files\Java\jdk8u131\jre\lib\management-agent.jar;D:\Program Files\Java\jdk8u131\jre\lib\plugin.jar;D:\Program Files\Java\jdk8u131\jre\lib\resources.jar;D:\Program Files\Java\jdk8u131\jre\lib\rt.jar;F:\yyjj\acs\nladmin-system\target\classes;D:\Maven\org\apache\commons\commons-csv\1.8\commons-csv-1.8.jar;D:\Maven\commons-io\commons-io\2.8.0\commons-io-2.8.0.jar;D:\Maven\org\openscada\jinterop\org.openscada.jinterop.core\2.1.8\org.openscada.jinterop.core-2.1.8.jar;D:\Maven\org\slf4j\slf4j-api\1.7.30\slf4j-api-1.7.30.jar;D:\Maven\org\openscada\external\org.openscada.external.jcifs\1.2.25\org.openscada.external.jcifs-1.2.25.jar;D:\Maven\javax\servlet\javax.servlet-api\4.0.1\javax.servlet-api-4.0.1.jar;D:\Maven\org\openscada\jinterop\org.openscada.jinterop.deps\1.5.0\org.openscada.jinterop.deps-1.5.0.jar;D:\Maven\org\bouncycastle\bcprov-jdk15on\1.50\bcprov-jdk15on-1.50.jar;D:\Maven\org\openscada\utgard\org.openscada.opc.dcom\1.5.0\
Launcher Type: SUN_STANDARD
Environment Variables:
JAVA_HOME=D:\Program Files\Java\jdk8u131
CLASSPATH=.;D:\Program Files\Java\jdk8u131\lib\dt.jar;D:\Program Files\Java\jdk8u131\lib\tools.jar;
PATH=D:\Program Files\VMware\bin\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;D:\Program Files\Java\jdk8u131\bin;D:\Program Files\Java\jdk8u131\jre\bin;D:\Program Files\apache-maven-3.6.3\bin;D:\Program Files\NodeJs\;D:\Program Files\Git\cmd;D:\Program Files\Xshell\;D:\Program Files\Xftp\;D:\Program Files\Redis\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\MySQL\MySQL Shell 8.0\bin\;C:\Users\85896\AppData\Local\Microsoft\WindowsApps;C:\Users\85896\AppData\Roaming\npm
USERNAME=ONEPIECE
OS=Windows_NT
PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 158 Stepping 10, GenuineIntel
--------------- S Y S T E M ---------------
OS: Windows 10.0 , 64 bit Build 19041 (10.0.19041.1889)
CPU:total 6 (initial active 6) (6 cores per cpu, 1 threads per core) family 6 model 158 stepping 10, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, aes, clmul, erms, 3dnowpref, lzcnt, tsc, tscinvbit, bmi1, bmi2, adx
Memory: 4k page, physical 16653528k(3484212k free), swap 36576472k(13152328k free)
vm_info: Java HotSpot(TM) 64-Bit Server VM (25.131-b11) for windows-amd64 JRE (1.8.0_131-b11), built on Mar 15 2017 01:23:53 by "java_re" with MS VC++ 10.0 (VS2010)
time: Mon Nov 28 20:06:01 2022
elapsed time: 4 seconds (0d 0h 0m 4s)

102
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
@@ -51,67 +52,44 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue();
AddressDto addressDto = addressService.findByCode("applyTaskToWms");
String url = wmsurl + addressDto.getMethods_url();
log.info("applyTaskToWms-----请求参数{}", jo.toString());
HttpResponse result2 = null;
logServer.acsToLms("acsToLms", url, String.valueOf(jo), "开始请求~");
try {
result2 = HttpRequest.post(url)
HttpResponse result = HttpRequest.post(url)
.header("Authorization", token)
.body(String.valueOf(jo))
.execute();
System.out.println(result2);
JSONObject jsonObject = JSONObject.parseObject(result.body());
logServer.acsToLms("acsToLms", url, String.valueOf(jo), jsonObject.getString("status"), jsonObject.getString("message"));
return result.body();
} catch (Exception e) {
String msg = e.getMessage();
//网络不通
System.out.println(msg);
logServer.acsToLms("acsToLms", url, String.valueOf(jo), "400", e.getMessage());
JSONObject resp = new JSONObject();
resp.put("status", "400");
resp.put("message", e.getMessage());
return JSON.toJSONString(resp);
}
String type = "";
if (result2.getStatus() == 200) {
type = "info";
} else {
type = "error";
}
log.info("applyTaskToWms-----输出参数{}", result2.body());
return result2.body();
}
@Override
public HttpResponse feedbackTaskStatusToWms(JSONArray data) {
String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue();
String task_code = "";
for (int i = 0; i < data.size(); i++) {
JSONObject json = (JSONObject) data.get(i);
task_code = json.getString("task_code");
}
TaskDto taskDto = taskService.findByCode(task_code);
String vehicle_code = taskDto.getVehicle_code();
HttpResponse result2 = null;
log.info("feedbackTaskStatusToWms-----请求参数{}", data.toString());
AddressDto addressDto = addressService.findByCode("feedbackTaskStatusToWms");
String methods_url = addressDto.getMethods_url();
String url = wmsurl + methods_url;
logServer.acsToLms("acsToLms", url, String.valueOf(data), "开始请求~");
HttpResponse result = null;
try {
result2 = HttpRequest.post(wmsurl + methods_url)
.header("Authorization", token).body(String.valueOf(data))
result = HttpRequest.post(url)
.header("Authorization", token)
.body(String.valueOf(data))
.execute();
System.out.println(result2);
JSONObject jsonObject = JSONObject.parseObject(result.body());
logServer.acsToLms("acsToLms", url, String.valueOf(data), jsonObject.getString("status"), jsonObject.getString("message"));
return result;
} catch (Exception e) {
String msg = e.getMessage();
//网络不通
System.out.println(msg);
logServer.acsToLms("acsToLms", url, String.valueOf(data), "400", e.getMessage());
return result;
}
String type = "";
if (result2.getStatus() == 200) {
type = "info";
} else {
type = "error";
}
JSONObject jo = JSONObject.parseObject(result2.body());
log.info("feedbackTaskStatusToWms-----输出参数{}", jo.toString());
return result2;
}
@Override
@@ -121,13 +99,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String methods_url = addressDto.getMethods_url();
String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue();
String url = wmsurl + methods_url;
JSONObject json = new JSONObject();
json.put("task_uuid", jsonObject.get("device_code"));
json.put("task_code", jsonObject.get("point_status"));
json.put("task_status", jsonObject.get("point_mode"));
json.put("point_error", jsonObject.get("point_error"));
log.info("feedbackPointStatusToWms----请求参数{}", json.toString());
logServer.acsToLms("acsToLms", url, String.valueOf(json), "开始请求~");
try {
String result2 = HttpRequest.post(url)
.body(String.valueOf(json))
@@ -155,6 +132,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String methods_url = addressDto.getMethods_url();
String url = wmsurl + methods_url;
String result = "";
logServer.acsToLms("acsToLms", url, null, "开始请求~");
try {
result = HttpRequest.get(url)
.execute().body();
@@ -180,20 +158,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String methods_url = addressDto.getMethods_url();
String url = wmsurl + methods_url;
HttpResponse result = null;
log.info("requestSignalInteraction----请求参数{}", json.toString());
logServer.acsToLms("acsToLms", url, String.valueOf(json), "开始请求~");
try {
result = HttpRequest.post(url)
.body(String.valueOf(json))
.execute();
System.out.println(result);
log.info("requestSignalInteraction----返回参数{}", result);
JSONObject jsonObject = JSONObject.parseObject(result.body());
logServer.acsToLms("acsToLms", url, String.valueOf(json), jsonObject.getString("status"), jsonObject.getString("message"));
return result;
} catch (Exception e) {
String msg = e.getMessage();
//网络不通
System.out.println(msg);
logServer.acsToLms("acsToLms", url, String.valueOf(json), "400", e.getMessage());
return result;
}
return result;
}
@@ -203,25 +179,23 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String device_code = deviceService.queryDeviceCodeByAddress(Integer.parseInt(address));
JSONObject jo = new JSONObject();
jo.put("task_id", task_id);
String result2 = null;
String result = null;
AddressDto addressDto = addressService.findByCode("requestTaskAgain");
String methods_url = addressDto.getMethods_url();
String url = wmsurl + methods_url;
log.info("requestTaskAgain----请求参数{}", jo);
logServer.acsToLms("acsToLms", url, String.valueOf(jo), "开始请求~");
try {
result2 = HttpRequest.post(url)
result = HttpRequest.post(url)
.body(String.valueOf(jo))
.execute().body();
System.out.println(result2);
log.info("requestTaskAgain----返回参数{}", result2);
JSONObject jsonObject = JSONObject.parseObject(result);
logServer.acsToLms("acsToLms", url, String.valueOf(jo), jsonObject.getString("status"), jsonObject.getString("message"));
return result;
} catch (Exception e) {
String msg = e.getMessage();
//网络不通
System.out.println(msg);
logServer.acsToLms("acsToLms", url, String.valueOf(jo), "400", e.getMessage());
return result;
}
return result2;
}
@Override

2
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -123,7 +123,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
}
JSONObject jo = new JSONObject();
jo.put("task_code", task_code);
jo.put("task_id", ext_task_id);
jo.put("ext_task_id", ext_task_id);
jo.put("start_point_code", start_point_code);
jo.put("next_point_code", next_point_code);
jo.put("start_parent_code", start_point_code);

6
acs/nladmin-system/src/main/java/org/nl/acs/log/service/DeviceExecuteLogService.java
View File

@@ -20,4 +20,10 @@ public interface DeviceExecuteLogService {
* @param message 日志信息
*/
void deviceExecuteLog(String device_code, String vehicle_code, String inst_code, String message);
void acsToLms(String title, String requestUrl, String requestParam, String responseCode, String responseMessage);
void acsToLms(String title,String requestUrl,String requestParam,String result);
void lmsToAcs(String title, String requestType, String requestParam);
}

35
acs/nladmin-system/src/main/java/org/nl/acs/log/service/impl/DeviceExecuteLogServiceImpl.java
View File

@@ -3,6 +3,7 @@ package org.nl.acs.log.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.log.service.DeviceExecuteLogService;
@@ -36,6 +37,40 @@ public class DeviceExecuteLogServiceImpl implements DeviceExecuteLogService {
MDC.remove("device_code_log");
}
}
@Override
public void acsToLms(String title, String requestUrl, String requestParam, String responseCode, String responseMessage) {
try {
MDC.put("device_code_log", title);
if (!StrUtil.equals(responseCode + "", "200")) {
log.error("日志标题:{},请求路径:{},请求参数:{},响应编码:{},响应消息:{}", title, requestUrl, requestParam, responseCode, responseMessage);
} else {
log.info("日志标题:{},请求路径:{},请求参数:{},响应编码:{},响应消息:{}", title, requestUrl, requestParam, responseCode, responseMessage);
}
} finally {
MDC.remove("device_code_log");
}
}
@Override
public void acsToLms(String title, String requestUrl, String requestParam, String result) {
try {
MDC.put("device_code_log", title);
log.info("日志主题:{},请求路径:{},请求参数:{},请求结果:{}", title, requestUrl, requestParam, result);
} finally {
MDC.remove("device_code_log");
}
}
@Override
public void lmsToAcs(String title, String requestType, String requestParam) {
try {
MDC.put("device_code_log", title);
log.info("日志主题:{},请求类型:{},请求参数:{}", title, requestType, requestParam);
} finally {
MDC.remove("device_code_log");
}
}
}

3
acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java
View File

@@ -166,7 +166,7 @@ public class TaskFeedbackServiceImpl implements TaskFeedbackService {
TaskFeedbackDto dto = this.findById(id);
TaskDto entity = taskService.findById(dto.getTask_id());
JSONObject feed_jo = new JSONObject();
feed_jo.put("task_id", entity.getTask_id());
feed_jo.put("ext_task_id", entity.getExt_task_id());
feed_jo.put("task_code", entity.getTask_code());
feed_jo.put("task_status", entity.getTask_status());
JSONArray ja = new JSONArray();
@@ -180,7 +180,6 @@ public class TaskFeedbackServiceImpl implements TaskFeedbackService {
e.printStackTrace();
}
int status = body.getStatus();
JSONObject jo = (JSONObject) JSONObject.toJSON(body.body());
dto.setTask_status(entity.getTask_status());
if (status == 200) {

6
acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -542,7 +542,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
if (!StrUtil.startWith(dto.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code());
JSONObject feed_jo = new JSONObject();
feed_jo.put("task_id", entity.getTask_id());
feed_jo.put("ext_task_id", entity.getExt_task_id());
feed_jo.put("task_code", dto.getTask_code());
feed_jo.put("task_status", dto.getTask_status());
JSONArray ja = new JSONArray();
@@ -658,7 +658,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code());
JSONObject feed_jo = new JSONObject();
feed_jo.put("task_id", entity.getTask_id());
feed_jo.put("ext_task_id", entity.getExt_task_id());
feed_jo.put("task_code", entity.getTask_code());
feed_jo.put("task_status", entity.getTask_status());
JSONArray ja = new JSONArray();
@@ -785,7 +785,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue();
if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
JSONObject feed_jo = new JSONObject();
feed_jo.put("task_id", entity.getTask_id());
feed_jo.put("ext_task_id", entity.getExt_task_id());
feed_jo.put("task_code", entity.getTask_code());
feed_jo.put("task_status", entity.getTask_status());
JSONArray ja = new JSONArray();

6
acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryOneZDAgvTaskStatus.java
View File

@@ -39,7 +39,7 @@ public class QueryOneZDAgvTaskStatus {
JSONObject inst_jo = inst_rows.getJSONObject(i);
String inst_code = inst_jo.getString("task_code");
Instruction inst = instructionService.findByCodeFromCache(inst_code);
if (ObjectUtil.isEmpty(inst)){
if (ObjectUtil.isEmpty(inst)) {
continue;
}
//反馈结果状态
@@ -88,7 +88,7 @@ public class QueryOneZDAgvTaskStatus {
String device = jo.getString("locationName");
for (int k = 0; k < pro_rows.size(); k++) {
JSONObject item = pro_rows.getJSONObject(k);
if ("True".equals(item.get("value"))) {
if ("true".equals(item.get("value"))) {
String param = item.get("key").toString();
//EntryRequired是否进入前等待 PauseOnStation是否离开等待 Wait在该点进行等待
agvService.process(inst_code, param, device, operation, vehicle);
@@ -96,7 +96,7 @@ public class QueryOneZDAgvTaskStatus {
}
}
}
}catch (Exception e){
} catch (Exception e) {
}

1
acs/nladmin-ui/.env.production
View File

@@ -3,5 +3,6 @@ ENV = 'production'
# 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
VUE_APP_BASE_API = 'http://192.168.4.116:8010'
VUE_APP_WS_API = 'ws://http://192.168.4.116:8010'
# 如果接口是 http 形式， wss 需要改为 ws
VUE_APP_WS_API = 'ws://192.168.4.116:8010'

8
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
View File

@@ -2,7 +2,7 @@
package org.nl.wms.ext.acs.rest;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaIgnore;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -32,6 +32,7 @@ public class AcsToWmsController {
@PostMapping("/status")
@Log("ACS给WMS反馈任务状态")
@ApiOperation("ACS给WMS反馈任务状态")
@SaIgnore
public ResponseEntity<Object> receiveTaskStatusAcs(@RequestBody String string) {
return new ResponseEntity<>(acsToWmsService.receiveTaskStatusAcs(string), HttpStatus.OK);
}
@@ -39,6 +40,7 @@ public class AcsToWmsController {
@PostMapping("/orderFinish")
@Log("ACS给WMS下发工单完成状态")
@ApiOperation("ACS给WMS下发工单完成状态")
@SaIgnore
public ResponseEntity<Object> orderFinish(@RequestBody String string) {
return new ResponseEntity<>(acsToWmsService.orderFinish(string), HttpStatus.OK);
}
@@ -46,7 +48,7 @@ public class AcsToWmsController {
@PostMapping("/apply")
@Log("申请任务")
@ApiOperation("申请任务")
@SaCheckPermission("menu:list")
@SaIgnore
public ResponseEntity<Object> apply(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(acsToWmsService.apply(whereJson), HttpStatus.OK);
}
@@ -54,7 +56,7 @@ public class AcsToWmsController {
@PostMapping("/againApply")
@Log("二次申请任务")
@ApiOperation("二次申请任务")
@SaCheckPermission("menu:list")
@SaIgnore
public ResponseEntity<Object> againApply(@RequestBody String task_id) {
return new ResponseEntity<>(acsToWmsService.againApply(task_id), HttpStatus.OK);
}

8
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -53,7 +53,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
JSONArray errArr = new JSONArray();
for (int i = 0; i < array.size(); i++) {
JSONObject row = array.getJSONObject(i);
String task_id = row.getString("task_id");
String task_id = row.getString("ext_task_id");
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
// 任务处理类
String processing_class = taskObj.getString("handle_class");
@@ -62,10 +62,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String message = "";
String status = "";
if ("1".equals(acs_task_status)) {
status = TaskStatusEnum.EXECUTING.getCode();
status = "1";
}
if ("2".equals(acs_task_status)) {
status = TaskStatusEnum.FINISHED.getCode();
status = "2";
}
if ("3".equals(acs_task_status)) {
status = "0";
@@ -76,7 +76,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
Object obj = clz.newInstance();
// 调用每个任务类的forceFinishInst()强制结束方法
Method m = obj.getClass().getDeclaredMethod("updateTaskStatus", JSONObject.class, String.class);
m.invoke(obj, row, status);
m.invoke(obj, taskObj, status);
} catch (InvocationTargetException e) {
e.printStackTrace();
//空指针

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/rest/CallMaterialController.java
View File

@@ -27,6 +27,7 @@ public class CallMaterialController {
@PostMapping("/queryPoint")
@Log("查询区域点位")
@ApiOperation("查询区域点位")
@SaIgnore
public ResponseEntity<Object> queryPoint() {
return new ResponseEntity<>(callMaterialService.queryPoint(), HttpStatus.OK);
}
@@ -34,6 +35,7 @@ public class CallMaterialController {
@PostMapping("/confirm")
@Log("叫料确定")
@ApiOperation("叫料确定")
@SaIgnore
public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(callMaterialService.confirm(whereJson), HttpStatus.OK);
}

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/rest/CallVehicleController.java
View File

@@ -28,6 +28,7 @@ public class CallVehicleController {
@PostMapping("/queryPoint")
@Log("查询区域点位")
@ApiOperation("查询区域点位")
@SaIgnore
public ResponseEntity<Object> queryPoint() {
return new ResponseEntity<>(callVehicleService.queryPoint(), HttpStatus.OK);
}
@@ -35,6 +36,7 @@ public class CallVehicleController {
@PostMapping("/confirm")
@Log("呼叫空托盘确定")
@ApiOperation("呼叫空托盘确定")
@SaIgnore
public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(callVehicleService.confirm(whereJson), HttpStatus.OK);
}

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/rest/SendMaterialController.java
View File

@@ -27,6 +27,7 @@ public class SendMaterialController {
@PostMapping("/queryPoint")
@Log("查询区域点位")
@ApiOperation("查询区域点位")
@SaIgnore
public ResponseEntity<Object> queryPoint() {
return new ResponseEntity<>(sendMaterialService.queryPoint(), HttpStatus.OK);
}
@@ -34,6 +35,7 @@ public class SendMaterialController {
@PostMapping("/confirm")
@Log("送料确定")
@ApiOperation("送料确定")
@SaIgnore
public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(sendMaterialService.confirm(whereJson), HttpStatus.OK);
}

5
lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/service/impl/SendMaterialServiceImpl.java
View File

@@ -29,7 +29,7 @@ public class SendMaterialServiceImpl implements SendMaterialService {
JSONObject resultJson = new JSONObject();
for (int i = 0; i < regionArr.size(); i++) {
JSONObject jsonRegion = regionArr.getJSONObject(i);
JSONArray pointArr = WQL.getWO("PDA_SENDMATERIAL_01").addParam("flag", "2").addParam("region_id", jsonRegion.getString("region_id")).process().getResultJSONArray(0);
JSONArray pointArr = WQL.getWO("PDA_SENDMATERIAL_01").addParam("flag", "2").addParam("region_code", jsonRegion.getString("region_code")).process().getResultJSONArray(0);
jsonRegion.put("pointArr", pointArr);
}
resultJson.put("regionja", regionArr);
@@ -43,7 +43,7 @@ public class SendMaterialServiceImpl implements SendMaterialService {
@Transactional(rollbackFor = Exception.class)
public JSONObject confirm(JSONObject whereJson) {
JSONObject result = new JSONObject();
// 1、准备参数：point_code、type：2为共挤区域，8为豪凯区域
// 1、准备参数：point_code、type：2为共挤区域，8为豪凯区域,7为油漆线满料
JSONObject param = new JSONObject();
String region_id = whereJson.getString("region_id");
@@ -51,6 +51,7 @@ public class SendMaterialServiceImpl implements SendMaterialService {
String region_code = jsonObject.getString("region_code");
if (StrUtil.equals(region_code, "GJQY01")) param.put("type", "2");
if (StrUtil.equals(region_code, "HKQY01")) param.put("type", "8");
if (StrUtil.equals(region_code, "YQQY01")) param.put("type", "7");
param.put("point_code", whereJson.getString("point_code"));
param.put("material_num", whereJson.getString("qty"));

17
lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/wql/PDA_SENDMATERIAL_01.wql
View File

@@ -15,6 +15,7 @@
#################################################
输入.flag TYPEAS s_string
输入.region_id TYPEAS s_string
输入.region_code TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
@@ -47,7 +48,7 @@
FROM
sch_base_region
WHERE
region_code in ('HKQY01','GJQY01')
region_code in ('HKQY01','GJQY01','YQQY01')
ENDSELECT
ENDQUERY
@@ -64,11 +65,17 @@
WHERE
is_used = '1'
AND is_delete = '0'
AND point_type = '3'
OPTION 输入.region_id <> ""
region_id = 输入.region_id
OPTION 输入.region_code = "YQQY01"
point_type = '4'
ENDOPTION
OPTION 输入.region_code <> "YQQY01"
point_type = '3'
ENDOPTION
OPTION 输入.region_code <> ""
region_code = 输入.region_code
ENDOPTION
ENDSELECT
ENDQUERY

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/rest/SendVehicleController.java
View File

@@ -29,6 +29,7 @@ public class SendVehicleController {
@PostMapping("/queryPoint")
@Log("查询区域点位")
@ApiOperation("查询区域点位")
@SaIgnore
public ResponseEntity<Object> queryPoint() {
return new ResponseEntity<>(sendVehicleService.queryPoint(), HttpStatus.OK);
}
@@ -36,6 +37,7 @@ public class SendVehicleController {
@PostMapping("/confirm")
@Log("送空托盘确定")
@ApiOperation("送空托盘确定")
@SaIgnore
public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(sendVehicleService.confirm(whereJson), HttpStatus.OK);
}

4
lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java
View File

@@ -192,7 +192,7 @@ public class WorkorderServiceImpl implements WorkordeService {
JSONArray orderArr = wo.query("device_id = '" + param.getString("device_id") + "' and order_status = '02'").getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(orderArr)) throw new BadRequestException("当前设备正在生产中");
json.put("order_status", "02");
json.put("order_status", "2");
json.put("update_optid", currentUserId);
json.put("update_optname", nickName);
json.put("update_time", now);
@@ -271,7 +271,7 @@ public class WorkorderServiceImpl implements WorkordeService {
JSONObject produceorderMap = new JSONObject();
produceorderMap.put("workorder_id", workorder_id);
produceorderMap.put("device_id", device_id);
produceorderMap.put("order_status", "02");
produceorderMap.put("order_status", "2");
produceorderMap.put("update_optid", currentUserId);
produceorderMap.put("update_optname", nickName);
produceorderMap.put("update_time", now);

1
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
View File

@@ -69,7 +69,6 @@ public abstract class AbstractAcsTask {
}
;
/**
* @param form 创建任务需要的参数

9
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java
View File

@@ -108,9 +108,12 @@ public class AutoCreateTask {
//处理下发失败的任务
for (int i = 0; i < errArr.size(); i++) {
JSONObject taskObj = errArr.getJSONObject(i);
taskObj.put("remark", "下发失败:"+taskObj.getString("message"));
taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj);
JSONObject param=new JSONObject();
param.put("remark", "下发失败:"+taskObj.getString("message"));
param.put("update_time", DateUtil.now());
param.put("task_id", taskObj.getString("ext_task_id"));
taskTab.update(param);
}
}

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
View File

@@ -50,6 +50,10 @@ public class PointServiceImpl implements PointService {
map.put("point_status", whereJson.get("point_status"));
map.put("is_used", whereJson.get("is_used"));
map.put("point_type", whereJson.get("point_type"));
map.put("block_num", whereJson.get("block_num"));
map.put("row_num", whereJson.get("row_num"));
map.put("col_num", whereJson.get("col_num"));
map.put("layer_num", whereJson.get("layer_num"));
map.put("name", whereJson.get("name"));
JSONObject json = WQL.getWO("QSCH_BASE_POINT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "point_code asc");
JSONArray content = json.getJSONArray("content");

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java
View File

@@ -398,7 +398,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
//判断起点是否属于养生A区
if (point_code1.startsWith("2")) {
//养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
point_code1 = point_code1.substring(0, 4) + "1" + point_code1.substring(4, 9);
point_code1 = point_code1.substring(0, 4) + "2" + point_code1.substring(4, 10);
}
AcsTaskDto dto = AcsTaskDto.builder()

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java
View File

@@ -405,8 +405,8 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
String point_code1 = json.getString("point_code1");
//判断起点是否属于养生A区
if (point_code1.startsWith("2")) {
//养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
point_code1 = point_code1.substring(0, 4) + "1" + point_code1.substring(4, 9);
//养生A区发给ACS需要新的点位(21012-03-1----->21011-03-1)
point_code1 = point_code1.substring(0, 4) + "2" + point_code1.substring(4, 10);
}
AcsTaskDto dto = AcsTaskDto.builder()

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java
View File

@@ -165,7 +165,7 @@ public class YqxCallMaterialTask extends AbstractAcsTask {
JSONObject json = arr.getJSONObject(i);
//养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
String point_code =json.getString("point_code1");
String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9);
String newPoint = point_code.substring(0, 4) + "2" + point_code.substring(4, 10);
AcsTaskDto dto = AcsTaskDto.builder()
.task_id(json.getString("task_id"))

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java
View File

@@ -407,7 +407,7 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask {
//判断点位是否属于养生A区
if (point_code.startsWith("2")) {
//养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
point_code = point_code.substring(0, 4) + "1" + point_code.substring(4, 9);
point_code = point_code.substring(0, 4) + "1" + point_code.substring(4, 10);
}
return point_code;
}
@@ -427,7 +427,7 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask {
//判断终点是否属于养生A区
if (point_code3.startsWith("2")) {
//养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
point_code3 = point_code3.substring(0, 4) + "1" + point_code3.substring(4, 9);
point_code3 = point_code3.substring(0, 4) + "1" + point_code3.substring(4, 10);
}

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java
View File

@@ -360,7 +360,7 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask {
//判断点位是否属于养生A区
if (point_code.startsWith("2")) {
//养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
point_code = point_code.substring(0, 4) + "1" + point_code.substring(4, 9);
point_code = point_code.substring(0, 4) + "1" + point_code.substring(4, 10);
}
return point_code;
}
@@ -379,7 +379,7 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask {
//判断终点是否属于养生A区
if (point_code3.startsWith("2")) {
//养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
point_code3 = point_code3.substring(0, 4) + "1" + point_code3.substring(4, 9);
point_code3 = point_code3.substring(0, 4) + "1" + point_code3.substring(4, 10);
}

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
View File

@@ -252,7 +252,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
//养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
String point_code = json.getString("point_code2");
String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9);
String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 10);
AcsTaskDto dto = AcsTaskDto.builder()
.task_id(json.getString("task_id"))
@@ -373,7 +373,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
//养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
String point_code = taskObj.getString("point_code3");
String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9);
String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 10);
return newPoint;
}
}

16
lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql
View File

@@ -19,6 +19,10 @@
输入.name TYPEAS s_string
输入.point_type TYPEAS s_string
输入.point_status TYPEAS s_string
输入.block_num TYPEAS s_string
输入.row_num TYPEAS s_string
输入.col_num TYPEAS s_string
输入.layer_num TYPEAS s_string
输入.is_used TYPEAS s_string
输入.ids TYPEAS f_string
@@ -79,6 +83,18 @@
OPTION 输入.is_used <> ""
point.is_used = 输入.is_used
ENDOPTION
OPTION 输入.block_num <> ""
point.block_num = 输入.block_num
ENDOPTION
OPTION 输入.row_num <> ""
point.row_num = 输入.row_num
ENDOPTION
OPTION 输入.col_num <> ""
point.col_num = 输入.col_num
ENDOPTION
OPTION 输入.layer_num <> ""
point.layer_num = 输入.layer_num
ENDOPTION
OPTION 输入.name <> ""
( point.point_code like "%" 输入.name "%" or point.point_name like "%" 输入.name "%" )
ENDOPTION

2
lms/nladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -162,4 +162,4 @@ sa-token:
loki:
url: http://localhost:3100/loki/api/v1
systemName: lms
systemName: lms

2
lms/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -122,7 +122,7 @@ https://juejin.cn/post/6844903775631572999
<!--生产环境:打印控制台和输出到文件-->
<springProfile name="prod">
<root level="debug">
<root level="info">
<appender-ref ref="asyncFileAppender"/>
<appender-ref ref="lokiAppender"/>
</root>

4
lms/nladmin-ui/.env.development
View File

@@ -1,8 +1,8 @@
ENV = 'development'
# 接口地址
VUE_APP_BASE_API = 'http://localhost:8010'
VUE_APP_WS_API = 'ws://localhost:8010'
VUE_APP_BASE_API = 'http://localhost:8011'
VUE_APP_WS_API = 'ws://localhost:8011'
# 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true

4
lms/nladmin-ui/.env.production
View File

@@ -2,6 +2,6 @@ ENV = 'production'
# 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
VUE_APP_BASE_API = 'http://47.97.157.227:8010'
VUE_APP_BASE_API = 'http://192.168.4.117:8010'
# 如果接口是 http 形式， wss 需要改为 ws
VUE_APP_WS_API = 'ws://47.97.157.227:8010'
VUE_APP_WS_API = 'ws://192.168.4.117:8010'

3
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -441,9 +441,8 @@ export default {
rounding(row, column) {
return parseFloat(row[column.property]).toFixed(2)
},
// 下发按钮禁用条件
is_disabled(len, row) {
if (len === 1 && row.order_status === '00') {
if (len === 1 && row.order_status === '1') {
return false
} else {
return true

74
lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
View File

@@ -84,81 +84,13 @@
</el-form>
</el-card>
<el-card class="box-card" shadow="always">
<div slot="header" class="clearfix">
<span style="font-weight: bold;font-size: 15px;">库存信息:</span>
<!-- <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
</div>
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="物料编码">
<el-input v-model="form.region_code" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="form.region_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.point_code" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料批次">
<el-input v-model="form.point_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="库存量">
<el-input v-model="form.point_type_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="计量单位">
<el-input v-model="form.point_status_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="入库时间">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="静置时间(分)">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
</el-form-item>
</el-form>
</el-card>
<el-card class="box-card" shadow="always">
<div slot="header" class="clearfix">
<span style="font-weight: bold;font-size: 15px;">库存信息:</span>
<!-- <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
</div>
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="物料编码">
<el-input v-model="form.region_code" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="form.region_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.point_code" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料批次">
<el-input v-model="form.point_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="库存量">
<el-input v-model="form.point_type_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="计量单位">
<el-input v-model="form.point_status_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="入库时间">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="静置时间(分)">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
</el-form-item>
</el-form>
</el-card>
<!--表格渲染-->
<el-card class="box-card" shadow="always">
<!--<el-card class="box-card" shadow="always">
<div slot="header" class="clearfix">
<span style="font-weight: bold;font-size: 15px;">更新记录:</span>
<!-- <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
&lt;!&ndash; <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>&ndash;&gt;
</div>
<el-table
ref="table"
@@ -179,7 +111,7 @@
<el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip/>
<el-table-column prop="nick_name" label="操作人" align="center"/>
</el-table>
</el-card>
</el-card>-->
<!--<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false">确定</el-button>