tijiao

hs_err_pid6728.log

@@ -0,0 +1,340 @@
+#
+# There is insufficient memory for the Java Runtime Environment to continue.
+# Native memory allocation (malloc) failed to allocate 32744 bytes for ChunkPool::allocate
+# Possible reasons:
+#   The system is out of physical RAM or swap space
+#   In 32 bit mode, the process size limit was hit
+# Possible solutions:
+#   Reduce memory load on the system
+#   Increase physical memory or swap space
+#   Check if swap backing store is full
+#   Use 64 bit Java on a 64 bit OS
+#   Decrease Java heap size (-Xmx/-Xms)
+#   Decrease number of Java threads
+#   Decrease Java thread stack sizes (-Xss)
+#   Set larger code cache with -XX:ReservedCodeCacheSize=
+# This output file may be truncated or incomplete.
+#
+#  Out of Memory Error (allocation.cpp:273), pid=6728, tid=0x0000000000006220
+#
+# JRE version: Java(TM) SE Runtime Environment (8.0_152-b16) (build 1.8.0_152-b16)
+# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.152-b16 mixed mode windows-amd64 compressed oops)
+# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows
+#
+
+---------------  T H R E A D  ---------------
+
+Current thread (0x00000000212df800):  JavaThread "C1 CompilerThread10" daemon [_thread_in_native, id=25120, stack(0x0000000022af0000,0x0000000022bf0000)]
+
+Stack: [0x0000000022af0000,0x0000000022bf0000]
+[error occurred during error reporting (printing stack bounds), id 0xc0000005]
+
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+
+
+Current CompileTask:
+C1:   4905 2772       1       org.springframework.asm.ClassReader::readCode (3619 bytes)
+
+
+---------------  P R O C E S S  ---------------
+
+Java Threads: ( => current thread )
+  0x0000000021a7d000 JavaThread "RMI Scheduler(0)" daemon [_thread_blocked, id=10520, stack(0x0000000023a60000,0x0000000023b60000)]
+  0x0000000021a2f000 JavaThread "RMI TCP Connection(1)-192.168.1.104" daemon [_thread_in_native, id=22516, stack(0x0000000023960000,0x0000000023a60000)]
+  0x00000000215ec000 JavaThread "RMI TCP Accept-0" daemon [_thread_in_native, id=22856, stack(0x0000000022fb0000,0x00000000230b0000)]
+  0x000000002131e800 JavaThread "Service Thread" daemon [_thread_blocked, id=5024, stack(0x0000000022cf0000,0x0000000022df0000)]
+  0x00000000212ec000 JavaThread "C1 CompilerThread11" daemon [_thread_blocked, id=28800, stack(0x0000000022bf0000,0x0000000022cf0000)]
+=>0x00000000212df800 JavaThread "C1 CompilerThread10" daemon [_thread_in_native, id=25120, stack(0x0000000022af0000,0x0000000022bf0000)]
+  0x00000000212b6800 JavaThread "C1 CompilerThread9" daemon [_thread_blocked, id=24260, stack(0x00000000229f0000,0x0000000022af0000)]
+  0x00000000212a0000 JavaThread "C1 CompilerThread8" daemon [_thread_blocked, id=15128, stack(0x00000000228f0000,0x00000000229f0000)]
+  0x0000000021291000 JavaThread "C2 CompilerThread7" daemon [_thread_blocked, id=2736, stack(0x00000000227f0000,0x00000000228f0000)]
+  0x000000002128e800 JavaThread "C2 CompilerThread6" daemon [_thread_blocked, id=30488, stack(0x00000000226f0000,0x00000000227f0000)]
+  0x0000000021283800 JavaThread "C2 CompilerThread5" daemon [_thread_blocked, id=21244, stack(0x00000000225f0000,0x00000000226f0000)]
+  0x0000000021281000 JavaThread "C2 CompilerThread4" daemon [_thread_blocked, id=18692, stack(0x00000000224f0000,0x00000000225f0000)]
+  0x000000002127e000 JavaThread "C2 CompilerThread3" daemon [_thread_blocked, id=9944, stack(0x00000000223f0000,0x00000000224f0000)]
+  0x000000002127d800 JavaThread "C2 CompilerThread2" daemon [_thread_blocked, id=10828, stack(0x00000000222f0000,0x00000000223f0000)]
+  0x000000002126c800 JavaThread "C2 CompilerThread1" daemon [_thread_blocked, id=17480, stack(0x00000000221f0000,0x00000000222f0000)]
+  0x000000002126b800 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=6404, stack(0x00000000220f0000,0x00000000221f0000)]
+  0x000000001ead1800 JavaThread "JDWP Command Reader" daemon [_thread_in_native, id=21752, stack(0x0000000020820000,0x0000000020920000)]
+  0x000000001eacd000 JavaThread "JDWP Event Helper Thread" daemon [_thread_blocked, id=3896, stack(0x0000000020720000,0x0000000020820000)]
+  0x000000001eac9800 JavaThread "JDWP Transport Listener: dt_socket" daemon [_thread_blocked, id=26444, stack(0x0000000020620000,0x0000000020720000)]
+  0x000000001ea57000 JavaThread "Attach Listener" daemon [_thread_blocked, id=10264, stack(0x0000000020520000,0x0000000020620000)]
+  0x000000001ea3f800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=13904, stack(0x0000000020420000,0x0000000020520000)]
+  0x000000001ea2c000 JavaThread "Finalizer" daemon [_thread_blocked, id=10788, stack(0x00000000202c0000,0x00000000203c0000)]
+  0x000000001cfc9000 JavaThread "Reference Handler" daemon [_thread_blocked, id=7976, stack(0x00000000201c0000,0x00000000202c0000)]
+  0x000000000326c800 JavaThread "main" [_thread_in_native, id=21632, stack(0x0000000003160000,0x0000000003260000)]
+
+Other Threads:
+  0x000000001ea05000 VMThread [stack: 0x00000000200c0000,0x00000000201c0000] [id=1676]
+  0x00000000215fa800 WatcherThread [stack: 0x00000000230b0000,0x00000000231b0000] [id=30068]
+
+VM state:not at safepoint (normal execution)
+
+VM Mutex/Monitor currently owned by a thread: None
+
+Heap:
+ PSYoungGen      total 138240K, used 36663K [0x000000076df00000, 0x0000000777000000, 0x00000007c0000000)
+  eden space 128000K, 22% used [0x000000076df00000,0x000000076fb43928,0x0000000775c00000)
+  from space 10240K, 75% used [0x0000000775c00000,0x000000077638a590,0x0000000776600000)
+  to   space 10240K, 0% used [0x0000000776600000,0x0000000776600000,0x0000000777000000)
+ ParOldGen       total 84992K, used 6581K [0x00000006c9c00000, 0x00000006cef00000, 0x000000076df00000)
+  object space 84992K, 7% used [0x00000006c9c00000,0x00000006ca26d520,0x00000006cef00000)
+ Metaspace       used 28418K, capacity 29558K, committed 29696K, reserved 1075200K
+  class space    used 3808K, capacity 4073K, committed 4096K, reserved 1048576K
+
+Card table byte_map: [0x0000000012900000,0x00000000130c0000] byte_map_base: 0x000000000f2b2000
+
+Marking Bits: (ParMarkBitMap*) 0x00000000638b0860
+ Begin Bits: [0x00000000142f0000, 0x0000000018080000)
+ End Bits:   [0x0000000018080000, 0x000000001be10000)
+
+Polling page: 0x0000000002cc0000
+
+CodeCache: size=245760Kb used=7721Kb max_used=7721Kb free=238038Kb
+ bounds [0x0000000003540000, 0x0000000003cd0000, 0x0000000012540000]
+ total_blobs=3205 nmethods=2780 adapters=343
+ compilation: enabled
+
+Compilation events (10 events):
+Event: 4.898 Thread 0x00000000212a0000 2776       1       org.springframework.core.type.classreading.RecursiveAnnotationAttributesVisitor::<init> (12 bytes)
+Event: 4.899 Thread 0x00000000212b6800 nmethod 2775 0x0000000003cc8210 code [0x0000000003cc8380, 0x0000000003cc84e8]
+Event: 4.899 Thread 0x00000000212b6800 2777       1       org.springframework.core.type.classreading.RecursiveAnnotationAttributesVisitor::visitEnd (8 bytes)
+Event: 4.899 Thread 0x00000000212b6800 nmethod 2777 0x0000000003cc8590 code [0x0000000003cc86e0, 0x0000000003cc8828]
+Event: 4.899 Thread 0x00000000212a0000 nmethod 2776 0x0000000003cc8890 code [0x0000000003cc8a00, 0x0000000003cc8c68]
+Event: 4.899 Thread 0x00000000212ec000 nmethod 2774 0x0000000003cc8e10 code [0x0000000003cc8f80, 0x0000000003cc9218]
+Event: 4.902 Thread 0x00000000212b6800 2778       1       java.nio.channels.spi.AbstractInterruptibleChannel::isOpen (5 bytes)
+Event: 4.902 Thread 0x00000000212b6800 nmethod 2778 0x0000000003cc93d0 code [0x0000000003cc9520, 0x0000000003cc9630]
+Event: 4.903 Thread 0x00000000212a0000 2779       1       org.springframework.asm.MethodVisitor::visitFieldInsn (20 bytes)
+Event: 4.903 Thread 0x00000000212a0000 nmethod 2779 0x0000000003cc9690 code [0x0000000003cc97e0, 0x0000000003cc9968]
+
+GC Heap History (10 events):
+Event: 1.459 GC heap before
+{Heap before GC invocations=2 (full 0):
+ PSYoungGen      total 74240K, used 70481K [0x000000076df00000, 0x0000000773180000, 0x00000007c0000000)
+  eden space 64000K, 100% used [0x000000076df00000,0x0000000771d80000,0x0000000771d80000)
+  from space 10240K, 63% used [0x0000000771d80000,0x00000007723d4760,0x0000000772780000)
+  to   space 10240K, 0% used [0x0000000772780000,0x0000000772780000,0x0000000773180000)
+ ParOldGen       total 169472K, used 16K [0x00000006c9c00000, 0x00000006d4180000, 0x000000076df00000)
+  object space 169472K, 0% used [0x00000006c9c00000,0x00000006c9c04000,0x00000006d4180000)
+ Metaspace       used 15747K, capacity 16112K, committed 16512K, reserved 1062912K
+  class space    used 1937K, capacity 2050K, committed 2176K, reserved 1048576K
+Event: 1.465 GC heap after
+Heap after GC invocations=2 (full 0):
+ PSYoungGen      total 74240K, used 7781K [0x000000076df00000, 0x0000000777000000, 0x00000007c0000000)
+  eden space 64000K, 0% used [0x000000076df00000,0x000000076df00000,0x0000000771d80000)
+  from space 10240K, 75% used [0x0000000772780000,0x0000000772f197e8,0x0000000773180000)
+  to   space 10240K, 0% used [0x0000000771d80000,0x0000000771d80000,0x0000000772780000)
+ ParOldGen       total 169472K, used 24K [0x00000006c9c00000, 0x00000006d4180000, 0x000000076df00000)
+  object space 169472K, 0% used [0x00000006c9c00000,0x00000006c9c06000,0x00000006d4180000)
+ Metaspace       used 15747K, capacity 16112K, committed 16512K, reserved 1062912K
+  class space    used 1937K, capacity 2050K, committed 2176K, reserved 1048576K
+}
+Event: 1.765 GC heap before
+{Heap before GC invocations=3 (full 0):
+ PSYoungGen      total 74240K, used 71781K [0x000000076df00000, 0x0000000777000000, 0x00000007c0000000)
+  eden space 64000K, 100% used [0x000000076df00000,0x0000000771d80000,0x0000000771d80000)
+  from space 10240K, 75% used [0x0000000772780000,0x0000000772f197e8,0x0000000773180000)
+  to   space 10240K, 0% used [0x0000000771d80000,0x0000000771d80000,0x0000000772780000)
+ ParOldGen       total 169472K, used 24K [0x00000006c9c00000, 0x00000006d4180000, 0x000000076df00000)
+  object space 169472K, 0% used [0x00000006c9c00000,0x00000006c9c060a0,0x00000006d4180000)
+ Metaspace       used 19866K, capacity 20414K, committed 20736K, reserved 1067008K
+  class space    used 2551K, capacity 2689K, committed 2816K, reserved 1048576K
+Event: 1.770 GC heap after
+Heap after GC invocations=3 (full 0):
+ PSYoungGen      total 74240K, used 9105K [0x000000076df00000, 0x0000000777000000, 0x00000007c0000000)
+  eden space 64000K, 0% used [0x000000076df00000,0x000000076df00000,0x0000000771d80000)
+  from space 10240K, 88% used [0x0000000771d80000,0x0000000772664550,0x0000000772780000)
+  to   space 10240K, 0% used [0x0000000776600000,0x0000000776600000,0x0000000777000000)
+ ParOldGen       total 169472K, used 32K [0x00000006c9c00000, 0x00000006d4180000, 0x000000076df00000)
+  object space 169472K, 0% used [0x00000006c9c00000,0x00000006c9c080a0,0x00000006d4180000)
+ Metaspace       used 19866K, capacity 20414K, committed 20736K, reserved 1067008K
+  class space    used 2551K, capacity 2689K, committed 2816K, reserved 1048576K
+}
+Event: 1.799 GC heap before
+{Heap before GC invocations=4 (full 0):
+ PSYoungGen      total 74240K, used 17818K [0x000000076df00000, 0x0000000777000000, 0x00000007c0000000)
+  eden space 64000K, 13% used [0x000000076df00000,0x000000076e7825a8,0x0000000771d80000)
+  from space 10240K, 88% used [0x0000000771d80000,0x0000000772664550,0x0000000772780000)
+  to   space 10240K, 0% used [0x0000000776600000,0x0000000776600000,0x0000000777000000)
+ ParOldGen       total 169472K, used 32K [0x00000006c9c00000, 0x00000006d4180000, 0x000000076df00000)
+  object space 169472K, 0% used [0x00000006c9c00000,0x00000006c9c080a0,0x00000006d4180000)
+ Metaspace       used 20685K, capacity 21152K, committed 21248K, reserved 1067008K
+  class space    used 2655K, capacity 2786K, committed 2816K, reserved 1048576K
+Event: 1.803 GC heap after
+Heap after GC invocations=4 (full 0):
+ PSYoungGen      total 138240K, used 6750K [0x000000076df00000, 0x0000000777000000, 0x00000007c0000000)
+  eden space 128000K, 0% used [0x000000076df00000,0x000000076df00000,0x0000000775c00000)
+  from space 10240K, 65% used [0x0000000776600000,0x0000000776c97970,0x0000000777000000)
+  to   space 10240K, 0% used [0x0000000775c00000,0x0000000775c00000,0x0000000776600000)
+ ParOldGen       total 169472K, used 40K [0x00000006c9c00000, 0x00000006d4180000, 0x000000076df00000)
+  object space 169472K, 0% used [0x00000006c9c00000,0x00000006c9c0a0a0,0x00000006d4180000)
+ Metaspace       used 20685K, capacity 21152K, committed 21248K, reserved 1067008K
+  class space    used 2655K, capacity 2786K, committed 2816K, reserved 1048576K
+}
+Event: 1.803 GC heap before
+{Heap before GC invocations=5 (full 1):
+ PSYoungGen      total 138240K, used 6750K [0x000000076df00000, 0x0000000777000000, 0x00000007c0000000)
+  eden space 128000K, 0% used [0x000000076df00000,0x000000076df00000,0x0000000775c00000)
+  from space 10240K, 65% used [0x0000000776600000,0x0000000776c97970,0x0000000777000000)
+  to   space 10240K, 0% used [0x0000000775c00000,0x0000000775c00000,0x0000000776600000)
+ ParOldGen       total 169472K, used 40K [0x00000006c9c00000, 0x00000006d4180000, 0x000000076df00000)
+  object space 169472K, 0% used [0x00000006c9c00000,0x00000006c9c0a0a0,0x00000006d4180000)
+ Metaspace       used 20685K, capacity 21152K, committed 21248K, reserved 1067008K
+  class space    used 2655K, capacity 2786K, committed 2816K, reserved 1048576K
+Event: 1.824 GC heap after
+Heap after GC invocations=5 (full 1):
+ PSYoungGen      total 138240K, used 0K [0x000000076df00000, 0x0000000777000000, 0x00000007c0000000)
+  eden space 128000K, 0% used [0x000000076df00000,0x000000076df00000,0x0000000775c00000)
+  from space 10240K, 0% used [0x0000000776600000,0x0000000776600000,0x0000000777000000)
+  to   space 10240K, 0% used [0x0000000775c00000,0x0000000775c00000,0x0000000776600000)
+ ParOldGen       total 84992K, used 6480K [0x00000006c9c00000, 0x00000006cef00000, 0x000000076df00000)
+  object space 84992K, 7% used [0x00000006c9c00000,0x00000006ca2543f8,0x00000006cef00000)
+ Metaspace       used 20685K, capacity 21152K, committed 21248K, reserved 1067008K
+  class space    used 2655K, capacity 2786K, committed 2816K, reserved 1048576K
+}
+Event: 2.681 GC heap before
+{Heap before GC invocations=6 (full 1):
+ PSYoungGen      total 138240K, used 128000K [0x000000076df00000, 0x0000000777000000, 0x00000007c0000000)
+  eden space 128000K, 100% used [0x000000076df00000,0x0000000775c00000,0x0000000775c00000)
+  from space 10240K, 0% used [0x0000000776600000,0x0000000776600000,0x0000000777000000)
+  to   space 10240K, 0% used [0x0000000775c00000,0x0000000775c00000,0x0000000776600000)
+ ParOldGen       total 84992K, used 6509K [0x00000006c9c00000, 0x00000006cef00000, 0x000000076df00000)
+  object space 84992K, 7% used [0x00000006c9c00000,0x00000006ca25b510,0x00000006cef00000)
+ Metaspace       used 27261K, capacity 28228K, committed 28544K, reserved 1073152K
+  class space    used 3632K, capacity 3878K, committed 3968K, reserved 1048576K
+Event: 2.686 GC heap after
+Heap after GC invocations=6 (full 1):
+ PSYoungGen      total 138240K, used 7721K [0x000000076df00000, 0x0000000777000000, 0x00000007c0000000)
+  eden space 128000K, 0% used [0x000000076df00000,0x000000076df00000,0x0000000775c00000)
+  from space 10240K, 75% used [0x0000000775c00000,0x000000077638a590,0x0000000776600000)
+  to   space 10240K, 0% used [0x0000000776600000,0x0000000776600000,0x0000000777000000)
+ ParOldGen       total 84992K, used 6581K [0x00000006c9c00000, 0x00000006cef00000, 0x000000076df00000)
+  object space 84992K, 7% used [0x00000006c9c00000,0x00000006ca26d520,0x00000006cef00000)
+ Metaspace       used 27261K, capacity 28228K, committed 28544K, reserved 1073152K
+  class space    used 3632K, capacity 3878K, committed 3968K, reserved 1048576K
+}
+
+Deoptimization events (0 events):
+No events
+
+Classes redefined (0 events):
+No events
+
+Internal exceptions (10 events):
+Event: 4.546 Thread 0x0000000021a2f000 Exception <a 'java/lang/reflect/InvocationTargetException'> (0x000000076e878f38) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u152\9742\hotspot\src\share\vm\runtime\reflection.cpp, line 1092]
+Event: 4.759 Thread 0x000000000326c800 Exception <a 'java/net/ConnectException': Connection refused: connect> (0x000000076e64d5a8) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u152\9742\hotspot\src\share\vm\prims\jni.cpp, line 735]
+Event: 4.815 Thread 0x000000000326c800 Exception <a 'java/lang/ClassNotFoundException': java/lang/ObjectCustomizer> (0x000000076ed502b8) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u152\9742\hotspot\src\share\vm\classfile\systemDictionary.cpp, line 210]
+Event: 4.815 Thread 0x000000000326c800 Exception <a 'java/lang/ArrayIndexOutOfBoundsException'> (0x000000076ed53418) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u152\9742\hotspot\src\share\vm\runtime\sharedRuntime.cpp, line 605]
+Event: 4.816 Thread 0x000000000326c800 Exception <a 'java/lang/ClassNotFoundException': org/springframework/context/annotation/ConfigurationClassPostProcessorCustomizer> (0x000000076eda6320) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u152\9742\hotspot\src\share\vm\classfile\
+Event: 4.817 Thread 0x000000000326c800 Exception <a 'java/lang/ClassNotFoundException': org/springframework/beans/factory/support/BeanDefinitionRegistryPostProcessorCustomizer> (0x000000076ee0f0a0) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u152\9742\hotspot\src\share\vm\cla
+Event: 4.818 Thread 0x000000000326c800 Exception <a 'java/lang/ClassNotFoundException': org/springframework/core/PriorityOrderedCustomizer> (0x000000076ee479e0) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u152\9742\hotspot\src\share\vm\classfile\systemDictionary.cpp, line 210
+Event: 4.818 Thread 0x000000000326c800 Exception <a 'java/lang/ClassNotFoundException': org/springframework/context/ResourceLoaderAwareCustomizer> (0x000000076ee85a48) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u152\9742\hotspot\src\share\vm\classfile\systemDictionary.cpp, l
+Event: 4.819 Thread 0x000000000326c800 Exception <a 'java/lang/ClassNotFoundException': org/springframework/beans/factory/BeanClassLoaderAwareCustomizer> (0x000000076eecb400) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u152\9742\hotspot\src\share\vm\classfile\systemDictionary
+Event: 4.819 Thread 0x000000000326c800 Exception <a 'java/lang/ClassNotFoundException': org/springframework/context/EnvironmentAwareCustomizer> (0x000000076ef083c8) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u152\9742\hotspot\src\share\vm\classfile\systemDictionary.cpp, line
+
+Events (10 events):
+Event: 4.873 Thread 0x000000000326c800 DEOPT PACKING pc=0x0000000003c7380c sp=0x000000000325c550
+Event: 4.873 Thread 0x000000000326c800 DEOPT UNPACKING pc=0x000000000358747f sp=0x000000000325c370 mode 1
+Event: 4.874 loading class org/springframework/web/bind/annotation/PostMapping
+Event: 4.874 loading class org/springframework/web/bind/annotation/PostMapping done
+Event: 4.874 Thread 0x000000000326c800 DEOPT PACKING pc=0x000000000393e791 sp=0x000000000325e230
+Event: 4.874 Thread 0x000000000326c800 DEOPT UNPACKING pc=0x000000000358747f sp=0x000000000325df80 mode 1
+Event: 4.874 Thread 0x000000000326c800 DEOPT PACKING pc=0x0000000003c738c4 sp=0x000000000325e2b0
+Event: 4.874 Thread 0x000000000326c800 DEOPT UNPACKING pc=0x000000000358747f sp=0x000000000325e0d0 mode 1
+Event: 4.874 Thread 0x000000000326c800 DEOPT PACKING pc=0x0000000003c7380c sp=0x000000000325e440
+Event: 4.874 Thread 0x000000000326c800 DEOPT UNPACKING pc=0x000000000358747f sp=0x000000000325e260 mode 1
+
+
+Dynamic libraries:
+0x00007ff68d130000 - 0x00007ff68d167000 	C:\Program Files\Java\jdk1.8.0_152\bin\java.exe
+0x00007ffd917f0000 - 0x00007ffd919e5000 	C:\Windows\SYSTEM32\ntdll.dll
+0x00007ffd8fe00000 - 0x00007ffd8febe000 	C:\Windows\System32\KERNEL32.DLL
+0x00007ffd8f130000 - 0x00007ffd8f3f8000 	C:\Windows\System32\KERNELBASE.dll
+0x00007ffd90350000 - 0x00007ffd903fc000 	C:\Windows\System32\ADVAPI32.dll
+0x00007ffd8f830000 - 0x00007ffd8f8ce000 	C:\Windows\System32\msvcrt.dll
+0x00007ffd90210000 - 0x00007ffd902ab000 	C:\Windows\System32\sechost.dll
+0x00007ffd8fb10000 - 0x00007ffd8fc3a000 	C:\Windows\System32\RPCRT4.dll
+0x00007ffd8fc40000 - 0x00007ffd8fde1000 	C:\Windows\System32\USER32.dll
+0x00007ffd8f5a0000 - 0x00007ffd8f5c2000 	C:\Windows\System32\win32u.dll
+0x00007ffd902c0000 - 0x00007ffd902eb000 	C:\Windows\System32\GDI32.dll
+0x00007ffd8f490000 - 0x00007ffd8f59d000 	C:\Windows\System32\gdi32full.dll
+0x00007ffd8f790000 - 0x00007ffd8f82d000 	C:\Windows\System32\msvcp_win.dll
+0x00007ffd8ef00000 - 0x00007ffd8f000000 	C:\Windows\System32\ucrtbase.dll
+0x00007ffd7df90000 - 0x00007ffd7e22a000 	C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.1110_none_60b5254171f9507e\COMCTL32.dll
+0x00007ffd90500000 - 0x00007ffd90530000 	C:\Windows\System32\IMM32.DLL
+0x0000000063930000 - 0x0000000063a02000 	C:\Program Files\Java\jdk1.8.0_152\jre\bin\msvcr100.dll
+0x0000000063090000 - 0x0000000063930000 	C:\Program Files\Java\jdk1.8.0_152\jre\bin\server\jvm.dll
+0x00007ffd902b0000 - 0x00007ffd902b8000 	C:\Windows\System32\PSAPI.DLL
+0x00007ffd86000000 - 0x00007ffd86027000 	C:\Windows\SYSTEM32\WINMM.dll
+0x00007ffd89110000 - 0x00007ffd89119000 	C:\Windows\SYSTEM32\WSOCK32.dll
+0x00007ffd869c0000 - 0x00007ffd869ca000 	C:\Windows\SYSTEM32\VERSION.dll
+0x00007ffd90490000 - 0x00007ffd904fb000 	C:\Windows\System32\WS2_32.dll
+0x0000000063080000 - 0x000000006308f000 	C:\Program Files\Java\jdk1.8.0_152\jre\bin\verify.dll
+0x0000000063050000 - 0x0000000063079000 	C:\Program Files\Java\jdk1.8.0_152\jre\bin\java.dll
+0x0000000062fb0000 - 0x0000000062fe5000 	C:\Program Files\Java\jdk1.8.0_152\jre\bin\jdwp.dll
+0x0000000062fa0000 - 0x0000000062fa8000 	C:\Program Files\Java\jdk1.8.0_152\jre\bin\npt.dll
+0x0000000062f70000 - 0x0000000062f93000 	C:\Program Files\Java\jdk1.8.0_152\jre\bin\instrument.dll
+0x0000000063030000 - 0x0000000063046000 	C:\Program Files\Java\jdk1.8.0_152\jre\bin\zip.dll
+0x00007ffd90d10000 - 0x00007ffd91454000 	C:\Windows\System32\SHELL32.dll
+0x00007ffd8cff0000 - 0x00007ffd8d784000 	C:\Windows\SYSTEM32\windows.storage.dll
+0x00007ffd909b0000 - 0x00007ffd90d05000 	C:\Windows\System32\combase.dll
+0x00007ffd8e8e0000 - 0x00007ffd8e90e000 	C:\Windows\SYSTEM32\Wldp.dll
+0x00007ffd91480000 - 0x00007ffd9152d000 	C:\Windows\System32\SHCORE.dll
+0x00007ffd902f0000 - 0x00007ffd90345000 	C:\Windows\System32\shlwapi.dll
+0x00007ffd8ee40000 - 0x00007ffd8ee5f000 	C:\Windows\SYSTEM32\profapi.dll
+0x0000000062f60000 - 0x0000000062f69000 	C:\Program Files\Java\jdk1.8.0_152\jre\bin\dt_socket.dll
+0x00007ffd8e640000 - 0x00007ffd8e6aa000 	C:\Windows\system32\mswsock.dll
+0x0000000063010000 - 0x000000006302a000 	C:\Program Files\Java\jdk1.8.0_152\jre\bin\net.dll
+0x00007ffd74a00000 - 0x00007ffd74a33000 	C:\Program Files (x86)\Sangfor\SSL\ClientComponent\1_SangforNspX64.dll
+0x00007ffd8f9e0000 - 0x00007ffd8fb0a000 	C:\Windows\System32\ole32.dll
+0x00007ffd900d0000 - 0x00007ffd9019d000 	C:\Windows\System32\OLEAUT32.dll
+0x00007ffd8e380000 - 0x00007ffd8e44b000 	C:\Windows\SYSTEM32\DNSAPI.dll
+0x00007ffd8e330000 - 0x00007ffd8e36b000 	C:\Windows\SYSTEM32\IPHLPAPI.DLL
+0x00007ffd901a0000 - 0x00007ffd901a8000 	C:\Windows\System32\NSI.dll
+0x00007ffd87230000 - 0x00007ffd8723a000 	C:\Windows\System32\rasadhlp.dll
+0x00007ffd86210000 - 0x00007ffd8628f000 	C:\Windows\System32\fwpuclnt.dll
+0x00007ffd8f100000 - 0x00007ffd8f127000 	C:\Windows\System32\bcrypt.dll
+0x0000000062f50000 - 0x0000000062f5d000 	C:\Program Files\Java\jdk1.8.0_152\jre\bin\management.dll
+0x0000000062ff0000 - 0x0000000063001000 	C:\Program Files\Java\jdk1.8.0_152\jre\bin\nio.dll
+0x00007ffd8e840000 - 0x00007ffd8e858000 	C:\Windows\SYSTEM32\CRYPTSP.dll
+0x00007ffd8dfc0000 - 0x00007ffd8dff4000 	C:\Windows\system32\rsaenh.dll
+0x00007ffd8edc0000 - 0x00007ffd8edee000 	C:\Windows\SYSTEM32\USERENV.dll
+0x00007ffd8f400000 - 0x00007ffd8f482000 	C:\Windows\System32\bcryptprimitives.dll
+0x00007ffd8e830000 - 0x00007ffd8e83c000 	C:\Windows\SYSTEM32\CRYPTBASE.dll
+0x00007ffd870f0000 - 0x00007ffd87107000 	C:\Windows\SYSTEM32\dhcpcsvc6.DLL
+0x00007ffd871a0000 - 0x00007ffd871bd000 	C:\Windows\SYSTEM32\dhcpcsvc.DLL
+0x00007ffd749e0000 - 0x00007ffd749f7000 	C:\Windows\system32\napinsp.dll
+0x00007ffd74000000 - 0x00007ffd7401b000 	C:\Windows\system32\pnrpnsp.dll
+0x00007ffd89c20000 - 0x00007ffd89c35000 	C:\Windows\system32\wshbth.dll
+0x00007ffd8ab20000 - 0x00007ffd8ab3d000 	C:\Windows\system32\NLAapi.dll
+0x00007ffd73fe0000 - 0x00007ffd73ff2000 	C:\Windows\System32\winrnr.dll
+
+VM Arguments:
+jvm_args: -agentlib:jdwp=transport=dt_socket,address=127.0.0.1:58689,suspend=y,server=n -XX:TieredStopAtLevel=1 -Xverify:none -Dspring.output.ansi.enabled=always -javaagent:C:\Users\zx\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: com.steerinfo.DilApplicationMain
+java_class_path (initial): C:\Program Files\Java\jdk1.8.0_152\jre\lib\charsets.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\deploy.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\ext\access-bridge-64.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\ext\cldrdata.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\ext\dnsns.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\ext\jaccess.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\ext\jfxrt.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\ext\localedata.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\ext\nashorn.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\ext\sunec.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\ext\sunjce_provider.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\ext\sunmscapi.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\ext\sunpkcs11.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\ext\zipfs.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\javaws.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\jce.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\jfr.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\jfxswt.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\jsse.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\management-agent.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\plugin.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\resources.jar;C:\Program Files\Java\jdk1.8.0_152\jre\lib\rt.jar;D:\댐멀淃커\12-21\빈똥묏넋\DAL-TMS-TRUCK-API\target\classes;D:\apache-maven-3.6.3\cangku\io\minio\minio\8.2.1\minio-8.2.1.jar;D:\apache-maven-3.6.3\cangku\com\carrotsearch\thirdparty\simple-xml-safe\2.7.1\simple-xml-safe-2.7.1.jar;D:\apache-maven-3.6.3\cangku\com\google\guava\guava\29.0-jre\guava-29.0-jre.jar;D:\apache-maven-3.6.3\cangku\com\google\guava\failureaccess\1.0.1\failureaccess-1.0.1.jar;D:\apache-maven-3.6.3\cangku\com\google\guava\listenablefuture\9999.0-empty-to-avoid-conflict-with-guava\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar;D:\apache-maven-3.6.3\cangku\com\google\code\findbugs\jsr305\3.0.2\jsr305-3.0.2.
+Launcher Type: SUN_STANDARD
+
+Environment Variables:
+JAVA_HOME=C:\Program Files\Java\jdk1.8.0_152
+CLASSPATH=.;C:\Program Files\Java\jdk1.8.0_152\lib;C:\Program Files\Java\jdk1.8.0_152\lib\tools.jar
+PATH=D:\Oracle\WINDOWS.X64_193000_db_home\bin;C:\Program Files\Java\jdk1.8.0_152\bin;C:\Program Files\Java\jdk1.8.0_152\jre\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;D:\Git\cmd;D:\xftp\;D:\apache-maven-3.5.0\bin;C:\Program Files\nodejs\;D:\젯쌈묏야\;C:\Users\zx\AppData\Local\Microsoft\WindowsApps;C:\Program Files\Java\jdk1.8.0_152\bin;C:\Program Files\Java\jdk1.8.0_152\jre\bin;D:\VSCode\Microsoft VS Code\bin;C:\Users\zx\AppData\Roaming\npm;D:\node_global;;D:\idea2021\IntelliJ IDEA 2021.1\bin;
+USERNAME=zx
+OS=Windows_NT
+PROCESSOR_IDENTIFIER=AMD64 Family 23 Model 104 Stepping 1, AuthenticAMD
+
+
+
+---------------  S Y S T E M  ---------------
+
+OS: Windows 10.0 , 64 bit Build 19041 (10.0.19041.1348)
+
+CPU:total 16 (initial active 16) (16 cores per cpu, 1 threads per core) family 23 model 104 stepping 1, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, aes, clmul, mmxext, 3dnowpref, lzcnt, sse4a, tsc, tscinvbit, tscinv, bmi1
+
+Memory: 4k page, physical 16133884k(2248660k free), swap 29293348k(784k free)
+
+vm_info: Java HotSpot(TM) 64-Bit Server VM (25.152-b16) for windows-amd64 JRE (1.8.0_152-b16), built on Sep 14 2017 02:29:36 by "java_re" with MS VC++ 10.0 (VS2010)
+
+time: Tue Dec 21 16:44:18 2021
+elapsed time: 4 seconds (0d 0h 0m 4s)
+

pom.xml

@@ -136,34 +136,29 @@
     <build>
         <plugins>
             <!--             自动生成代码文件 -->
-            <plugin>
-                <groupId>com.steerinfo</groupId>
-                <artifactId>generator-maven-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
-                    <user>dil</user>
-                    <password>Dil123789</password>
-                    <!--包名-->
-                    <targetPackage>com.steerinfo.dil</targetPackage>
-                    <tables>
-                        <param>TMSTRUCK_UNLOAD_RESULT</param>
-<!--                        <param>TMSTRUCK_LOAD_RESULT</param>-->
-<!--                        <param>TMSTRUCK_LEAVE_FACTORY_RESULT</param>-->
-<!--                        <param>TMSTRUCK_UNLOAD_RESULT</param>-->
-<!--                        <param>TMSTRUCK_WEIGHT_RESULT</param>-->
-
-                    </tables>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>steerinfo</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>com.steerinfo</groupId>-->
+<!--                <artifactId>generator-maven-plugin</artifactId>-->
+<!--                <version>3.0</version>-->
+<!--                <configuration>-->
+<!--                    <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>-->
+<!--                    <user>dil</user>-->
+<!--                    <password>Dil123789</password>-->
+<!--                    &lt;!&ndash;包名&ndash;&gt;-->
+<!--                    <targetPackage>com.steerinfo.dil</targetPackage>-->
+<!--                    <tables>-->
+<!--                        <param></param>-->
+<!--                    </tables>-->
+<!--                </configuration>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <phase>compile</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>steerinfo</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

src/main/java/com/steerinfo/dil/controller/TmstruckEnfactoryResultController.java

@@ -103,7 +103,12 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
     })
     @PostMapping("/enFactoryResultByPDA")
     public RESTfulResult enFactoryResultByPDA(@RequestBody(required=false) Map<String,Object> mapValue){
-        int i = tmstruckEnfactoryResultService.enFactoryResultByPDA(mapValue);
+        int i = 0;
+        try {
+            i = tmstruckEnfactoryResultService.enFactoryResultByPDA(mapValue);
+        } catch (Exception e) {
+            return failed(e.getMessage());
+        }
         return success(i);
     }
 

src/main/java/com/steerinfo/dil/mapper/TmstruckUnloadResultMapper.java

@@ -44,4 +44,10 @@ public interface TmstruckUnloadResultMapper extends IBaseMapper<TmstruckUnloadRe
 //    通过总实绩ID查询卸货点
     List<Map<String, Object>> getSporadicSuppliesUnloadResult(Map<String, Object> map);
 
+    //根据运输订单号查询物资id优先级
+     List<Map<String,Object>>  selectMaterialForUnload(String orderNumber);
+
+     //查询物资是否被计量(map:orderNumber,MaterialId)
+    Integer selectUnloadMaterialId(Map<String,Object> map);
+
 }

src/main/java/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.java

@@ -17,8 +17,8 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
     @Select("select seq_tmstruck_weight_result.nextval from dual")
     BigDecimal selectMaxId();
 
-    //通过物资ID或运输订单ID查询计量实绩ID
-    BigDecimal getWeightIdByMaterialIdAndOrderId(Map<String, Object> map);
+    //通过订单Id 查询路段顺序号为最小的 且没有净重的计量实绩ID
+    BigDecimal getWeightIdBySQEAndOrderId(Map<String, Object> map);
 
     //通过运输订单号和查询订单Id 和物资ID (针对单拼)
     Map<String, Object> getOrderIdAndMaterialIdByOrderNum(String orderNumber);

src/main/java/com/steerinfo/dil/model/TmstruckUnloadResult.java

@@ -105,6 +105,12 @@ public class TmstruckUnloadResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="路段顺序号",required=false)
     private BigDecimal segmentSqe;
 
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -245,6 +251,14 @@ public class TmstruckUnloadResult implements IBasePO<BigDecimal> {
         this.segmentSqe = segmentSqe;
     }
 
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -267,6 +281,7 @@ public class TmstruckUnloadResult implements IBasePO<BigDecimal> {
         sb.append(", deleteTime=").append(deleteTime);
         sb.append(", resultUnloadPlaceId=").append(resultUnloadPlaceId);
         sb.append(", segmentSqe=").append(segmentSqe);
+        sb.append(", materialId=").append(materialId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/ITmstruckEnfactoryResultService.java

@@ -31,7 +31,7 @@ public interface ITmstruckEnfactoryResultService{
     Integer selectNodeNumber(String orderNumber);
 
     //进厂实绩
-    int enFactoryResultByPDA(Map<String, Object> map);
+    int enFactoryResultByPDA(Map<String, Object> map) throws Exception;
 
     //
     int enFactoryResultByMJ(Map<String, Object> map);

src/main/java/com/steerinfo/dil/service/ITmstruckUnloadResultService.java

@@ -37,4 +37,7 @@ public interface ITmstruckUnloadResultService{
 
     //根据运输订单号查找装车实绩
     Map<String,Object> selectLoadResultIdByOrderNumber(String orderNumber);
+
+    //零星物资判断多拼物资是否计量
+    int materialIdIsNorWeight(Map<String,Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/TmstruckEnfactoryResultServiceImpl.java

@@ -142,7 +142,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
      * @return
      */
     @Transactional
-    public int enFactoryResultByPDA(Map<String, Object> map){
+    public int enFactoryResultByPDA(Map<String, Object> map) throws Exception {
         int i = 0;
         //通过运输订单号查询订单类型
         String orderNumber = (String) map.get("orderNumber");
@@ -153,16 +153,20 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         i += updateEnFactoryResultByPDA(map); //添加进厂实绩
         //修改路段顺序号
         i += utilsService.updateOrderLineSequence(map);
+        //判断委托是否发送成功
+        int checkMeasureCommission = 0;
         switch (orderType.intValue()){
             case 1:
             case 4:
                 //查询未装车实绩
                 List<Map<String, Object>> mapList = rulesService.judgeLastMaterial(DataChange.dataToBigDecimal(map.get("orderId")));
                 if(mapList.size() == 1){
-                    //如果是单拼 不需要走计算 直接走钢材的汽车衡
+                    //如果是单拼 不需要走计算 直接走钢材的汽车衡(钢材)
                     Map<String, Object> mesMap = new HashMap<>();
                     mesMap.put("materialId",mapList.get(0).get("materialId"));
+                    map.put("materialId", mapList.get(0).get("materialId"));
                     mesMap.put("nature", 1);
+                    mesMap.put("orderId", map.get("orderId"));
                     //计算计皮汽车衡
                     int tarePlaceId = rulesService.calculateWeighbridge(mesMap);
                     mesMap.put("tarePlaceId", tarePlaceId);
@@ -182,7 +186,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                     //更新汽车衡
                     i += tmstruckWeightResultService.updateWeightResult(calculateMap);
                 }
-//                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //添加计皮委托
+                checkMeasureCommission += tmstruckMeasureCommissionService.addXSMeasureCommission(map); //添加计皮委托
                 break;
             case 2:
             case 3:
@@ -197,12 +201,12 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 8:
             case 9:
                 //计算计毛汽车衡并更新计量实绩 (暂时无法计算汽车衡)  需要写一个单独的方法 先计皮再计毛的
-                map.put("grossPlaceId", 3);
+                map.put("grossPlaceId", 18);
                 i += tmstruckWeightResultService.updateWeightResult(map);
                 //通过物资ID查询物资Id
                 List<Integer> materialIdList = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
                 map.put("materialId", materialIdList.get(0));
-                i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
+                checkMeasureCommission += tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
                 break;
             case 10: // 采购内转（老区-厂内） 没有进厂
                 if(lineSqe.intValue() == 1){
@@ -218,6 +222,19 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 }
                 break;
             case 11:
+            case 12:
+                //更新计量实绩
+                map.put("grossPlaceId", 5);
+                i += tmstruckWeightResultService.updateWeightResult(map);
+                //发送计量委托
+                List<Integer> materialIdByOrderId = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+                map.put("materialId", materialIdByOrderId.get(0));
+                //默认收货单位为新厂区
+
+                checkMeasureCommission += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
+        }
+        if(checkMeasureCommission == 0){
+            throw new Exception("委托发送失败");
         }
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "车辆进厂");
         return i;
@@ -257,6 +274,10 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 10: // 采购内转（老区-厂内）
                 break;
             case 11:
+                break;
+            case 12:
+                break;
+
         }
         omsFeign.pushMesToWebsocket(map);
         return i;

src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -182,6 +182,10 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 10:
                 break;
             case 11:
+                break;
+            case 12:
+                //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
+                i += utilsService.closeOrderNormally(map);
         }
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "出厂");
         return i;

src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -79,15 +79,11 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      * @return
      */
     public int addMaoMeasureCommission(Map<String, Object> map){
-        int i = addMeasureCommission(map); // 添加计毛委托
+        int i = 0;
+        addMeasureCommission(map); // 添加计毛委托
         //发送数据给计量系统 必要数据 orderTypee：订单类型  resultTotalId： 总实绩Id   orderId
         //获取当前订单是属于哪个厂区订单
-        Integer receiveId = 0 ;
-        if(DataChange.dataToBigDecimal(map.get("orderTypee")).intValue() == 10){
-             receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByRequirementOrderId(map.get("orderId"));
-        }else{
-             receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-        }
+        Integer receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
         if(receiveId == 1){
             //发送委托给达州钢铁
             i += sendMeasureCommissionMes(map);
@@ -99,13 +95,15 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         return i;
     }
 
+
     /**
      * 发送销售订单计量委托
      * @param map
      * @return
      */
     public int addXSMeasureCommission(Map<String, Object> map){
-        int i = addMeasureCommission(map); // 添加计毛委托
+        int i = 0;
+        addMeasureCommission(map); // 添加计毛委托
         //发送数据给计量系统 必要数据 orderTypee：订单类型  resultTotalId： 总实绩Id   orderId
         //获取当前订单是属于哪个厂区订单
         Integer shipperId = tmstruckMeasureCommissionMapper.getShipperIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
@@ -126,9 +124,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      * @return
      */
     public int addLXMeasureCommission(Map<String, Object> map){
-        int i = addMeasureCommission(map); // 添加计毛委托
-        i += sendDXMeasureCommissionMes(map);
-        return i;
+        addMeasureCommission(map); // 添加计毛委托
+        return sendDXMeasureCommissionMes(map);
     }
 
 
@@ -242,7 +239,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("ended", "0");
                 break;
             case 11:
-                break;
             case 12:
                 measureCommission = tmstruckMeasureCommissionMapper.sporadicDXMeasure(map);
                 measureCommission.put("regionName", " "); //无法确定汽车衡
@@ -256,6 +252,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 13:
             case 14:
 
+
         }
         /*访问接口发送数据*/
         return sendMesToDXMeasure(measureCommission);

src/main/java/com/steerinfo/dil/service/impl/TmstruckUnloadResultServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -167,7 +168,11 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 11:
                 //判断出厂路段顺序号是否为最后一个
                 i += utilsService.closeOrderNormally(map);
-
+            case 12:
+                i += updateUnloadResultBy(map); //更新卸货实绩
+                //判断是否还有物资，如果还有物资就执行发送计量委托
+                materialIdIsNorWeight(map);
+                break;
         }
         //卸货成功后推送消息给websocket
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "卸货");
@@ -191,6 +196,10 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         if(map.get("warehouseId") != null){
             tmstruckUnloadResult.setResultUnloadPlaceId(DataChange.dataToBigDecimal(map.get("warehouseId")));
         }
+        //判断物资id是否为空
+        if (map.get("materialId") != null){
+            tmstruckUnloadResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+        }
         //获得卸货时间
         tmstruckUnloadResult.setResultEndTime(new Date());
         //扫码后确认卸货所以卸货状态码为  同意
@@ -235,6 +244,29 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         return tmstruckUnloadResultMapper.selectUnloadResultIdByOrderNumber(orderNumber);
     }
 
+
+    //零星物资判断物资是否需要多次计量，并发送计量委托
+    @Override
+    public int materialIdIsNorWeight(Map<String, Object> map) {
+        //获取订单id
+        String orderNumber =(String) map.get("orderNumber");
+        List<Map<String, Object>> maps = tmstruckUnloadResultMapper.selectMaterialForUnload(orderNumber);
+        for (Map<String,Object> map1:maps){
+            BigDecimal materialId =(BigDecimal) map1.get("materialId");
+            BigDecimal orderId =(BigDecimal) map1.get("orderId");
+            Map<String,Object> map2=new HashMap<>();
+            map2.put("materialId",materialId);
+            map2.put("orderId",orderId);
+            //判断物资是否被计量
+            Integer integer = tmstruckUnloadResultMapper.selectUnloadMaterialId(map2);
+            if (integer==0){
+                //调用计量实绩接口,发送计量委托
+                tmstruckMeasureCommissionService.addLXMeasureCommission(map2);
+            }
+        }
+        return 2;
+    }
+
     //内转物流新增卸车实绩
     @Override
     public int addUnloadresultForconverted(Map<String, Object> map) {
@@ -262,4 +294,5 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         return i;
     }
 
+
 }

src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -225,6 +225,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 10:
                 break;
             case 11:
+                break;
+            case 12:
+
                 break;
         }
         i += tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
@@ -378,8 +381,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
      */
     public int updateWeightResult(Map<String, Object> map){
         TmstruckWeightResult tmstruckWeightResult = new TmstruckWeightResult();
-        //通过(物资ID)和运输订单Id修改查找计量实绩ID
-        BigDecimal id = tmstruckWeightResultMapper.getWeightIdByMaterialIdAndOrderId(map);
+        //通过订单Id 查询路段顺序号为最小的 且没有净重的计量实绩ID
+        BigDecimal id = tmstruckWeightResultMapper.getWeightIdBySQEAndOrderId(map);
         tmstruckWeightResult.setId(id);
         if(map.get("tarePlaceId") != null){ //如果皮重汽车衡不为空 更新皮重汽车衡
             tmstruckWeightResult.setResultTarePlaceId(DataChange.dataToBigDecimal(map.get("tarePlaceId")));

src/main/resources/com/steerinfo/dil/mapper/TmstruckMeasureCommissionMapper.xml

@@ -846,7 +846,6 @@
     <select id="saleDXMeasure" parameterType="map" resultType="map">
         select
                OO.ORDER_NUMBER          "orderId",
-               ASM.MATERIAL_ID          "item",
                RTC.TRUCK_CALCULATE_NUMBER                                                     "regionName",
                RC.CAPACITY_NUMBER                                                             "carNumber",
                RM.MATERIAL_ID || ''                                                           "item",
@@ -871,7 +870,7 @@
 
         from OMSTRUCK_ORDER OO
         left join AMS_SALE_ORDER_MATERIAL ASOM
-            on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_ID
+            on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
         left join AMS_SALE_ORDER ASO
             on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
         left join AMS_SALE_TRUCKNO_MATERIAL ASTM            --获得分路主键ID

src/main/resources/com/steerinfo/dil/mapper/TmstruckUnloadResultMapper.xml

@@ -18,23 +18,24 @@
         <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
         <result column="RESULT_UNLOAD_PLACE_ID" jdbcType="DECIMAL" property="resultUnloadPlaceId" />
         <result column="SEGMENT_SQE" jdbcType="DECIMAL" property="segmentSqe" />
+        <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
     </resultMap>
     <sql id="columns">
         RESULT_ID, RESULT_NUMBER, RESULT_TOTAL_ID, RESULT_START_TIME, RESULT_END_TIME, RESULT_DURATION,
     UNLOAD_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
-    DELETE_NAME, DELETE_TIME, RESULT_UNLOAD_PLACE_ID, SEGMENT_SQE
+    DELETE_NAME, DELETE_TIME, RESULT_UNLOAD_PLACE_ID, SEGMENT_SQE, MATERIAL_ID
     </sql>
     <sql id="columns_alias">
         t.RESULT_ID, t.RESULT_NUMBER, t.RESULT_TOTAL_ID, t.RESULT_START_TIME, t.RESULT_END_TIME,
     t.RESULT_DURATION, t.UNLOAD_STATUS, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
     t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETE_NAME, t.DELETE_TIME, t.RESULT_UNLOAD_PLACE_ID,
-    t.SEGMENT_SQE
+    t.SEGMENT_SQE, t.MATERIAL_ID
     </sql>
     <sql id="select">
-        SELECT <include refid="columns"/> FROM TMSTRUCK_UNLOAD_RESULT
+        SELECT <include refid="columns" /> FROM TMSTRUCK_UNLOAD_RESULT
     </sql>
     <sql id="select_alias">
-        SELECT <include refid="columns_alias"/> FROM TMSTRUCK_UNLOAD_RESULT t
+        SELECT <include refid="columns_alias" /> FROM TMSTRUCK_UNLOAD_RESULT t
     </sql>
     <sql id="where">
         <where>
@@ -86,6 +87,9 @@
             <if test="segmentSqe != null">
                 and SEGMENT_SQE = #{segmentSqe}
             </if>
+            <if test="materialId != null">
+                and MATERIAL_ID = #{materialId}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -138,6 +142,9 @@
             <if test="segmentSqe != null">
                 and SEGMENT_SQE = #{segmentSqe}
             </if>
+            <if test="materialId != null">
+                and MATERIAL_ID = #{materialId}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
@@ -192,6 +199,9 @@
         <if test="segmentSqe != null">
             or SEGMENT_SQE = #{segmentSqe}
         </if>
+        <if test="materialId != null">
+            or MATERIAL_ID = #{materialId}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckUnloadResult">
         insert into TMSTRUCK_UNLOAD_RESULT (RESULT_ID, RESULT_NUMBER, RESULT_TOTAL_ID,
@@ -199,13 +209,13 @@
                                             UNLOAD_STATUS, INSERT_USERNAME, INSERT_TIME,
                                             UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
                                             DELETE_NAME, DELETE_TIME, RESULT_UNLOAD_PLACE_ID,
-                                            SEGMENT_SQE)
+                                            SEGMENT_SQE, MATERIAL_ID)
         values (#{resultId,jdbcType=DECIMAL}, #{resultNumber,jdbcType=VARCHAR}, #{resultTotalId,jdbcType=DECIMAL},
                 #{resultStartTime,jdbcType=TIMESTAMP}, #{resultEndTime,jdbcType=TIMESTAMP}, #{resultDuration,jdbcType=DECIMAL},
                 #{unloadStatus,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
                 #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
                 #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, #{resultUnloadPlaceId,jdbcType=DECIMAL},
-                #{segmentSqe,jdbcType=DECIMAL})
+                #{segmentSqe,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckUnloadResult">
         insert into TMSTRUCK_UNLOAD_RESULT
@@ -258,6 +268,9 @@
             <if test="segmentSqe != null">
                 SEGMENT_SQE,
             </if>
+            <if test="materialId != null">
+                MATERIAL_ID,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="resultId != null">
@@ -308,6 +321,9 @@
             <if test="segmentSqe != null">
                 #{segmentSqe,jdbcType=DECIMAL},
             </if>
+            <if test="materialId != null">
+                #{materialId,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckUnloadResult">
@@ -326,7 +342,8 @@
             DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
             DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
             RESULT_UNLOAD_PLACE_ID = #{resultUnloadPlaceId,jdbcType=DECIMAL},
-            SEGMENT_SQE = #{segmentSqe,jdbcType=DECIMAL}
+            SEGMENT_SQE = #{segmentSqe,jdbcType=DECIMAL},
+            MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
         where RESULT_ID = #{resultId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckUnloadResult">
@@ -377,20 +394,23 @@
             <if test="segmentSqe != null">
                 SEGMENT_SQE = #{segmentSqe,jdbcType=DECIMAL},
             </if>
+            <if test="materialId != null">
+                MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+            </if>
         </set>
         where RESULT_ID = #{resultId,jdbcType=DECIMAL}
     </update>
     <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
-        <include refid="select"/>
+        <include refid="select" />
         where RESULT_ID = #{resultId,jdbcType=DECIMAL}
     </select>
     <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="where"/>
+        <include refid="select" />
+        <include refid="where" />
     </select>
     <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="whereLike"/>
+        <include refid="select" />
+        <include refid="whereLike" />
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into TMSTRUCK_UNLOAD_RESULT
@@ -402,7 +422,7 @@
         UPDATE_USERNAME, UPDATE_TIME,
         INSERT_UPDATE_REMARK, DELETE_NAME,
         DELETE_TIME, RESULT_UNLOAD_PLACE_ID,
-        SEGMENT_SQE)
+        SEGMENT_SQE, MATERIAL_ID)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.resultId,jdbcType=DECIMAL},
@@ -413,85 +433,89 @@
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR},
         #{item.deleteTime,jdbcType=TIMESTAMP}, #{item.resultUnloadPlaceId,jdbcType=DECIMAL},
-        #{item.segmentSqe,jdbcType=DECIMAL} from dual
+        #{item.segmentSqe,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
         update TMSTRUCK_UNLOAD_RESULT
         set
         RESULT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_NUMBER=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultNumber,jdbcType=VARCHAR}
         </foreach>
         ,RESULT_TOTAL_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_START_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultStartTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_END_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultEndTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_DURATION=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultDuration,jdbcType=DECIMAL}
         </foreach>
         ,UNLOAD_STATUS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.unloadStatus,jdbcType=VARCHAR}
         </foreach>
         ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
         </foreach>
         ,INSERT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
         </foreach>
         ,UPDATE_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
         </foreach>
         ,UPDATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
         </foreach>
         ,INSERT_UPDATE_REMARK=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
         </foreach>
         ,DELETE_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
         </foreach>
         ,DELETE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_UNLOAD_PLACE_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultUnloadPlaceId,jdbcType=DECIMAL}
         </foreach>
         ,SEGMENT_SQE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.segmentSqe,jdbcType=DECIMAL}
         </foreach>
+        ,MATERIAL_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+        </foreach>
         where RESULT_ID in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.resultId,jdbcType=DECIMAL}
         </foreach>
     </update>
     <delete id="batchDelete" parameterType="java.util.List">
         delete from TMSTRUCK_UNLOAD_RESULT
         where RESULT_ID in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
             #{id}
         </foreach>
     </delete>
@@ -515,15 +539,15 @@
         select *
         from (
         select
-                TUR.RESULT_ID "resultId",
-                APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-                OO.ORDER_NUMBER "orderNumber",
-                RC.CAPACITY_NUMBER "capacityNumber",
-                RM.MATERIAL_NAME "materialName",
-                TWR.RESULT_NET_WEIGHT "resultNetWeight",
-                RW.WAREHOUSE_NAME "warehouseName",
-                TUR.RESULT_END_TIME "resultEndTime",
-                TUR.INSERT_TIME "insertTime"
+        TUR.RESULT_ID "resultId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RM.MATERIAL_NAME "materialName",
+        TWR.RESULT_NET_WEIGHT "resultNetWeight",
+        RW.WAREHOUSE_NAME "warehouseName",
+        TUR.RESULT_END_TIME "resultEndTime",
+        TUR.INSERT_TIME "insertTime"
         from TMSTRUCK_UNLOAD_RESULT TUR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -616,7 +640,7 @@
                  left join TMSTRUCK_UNLOAD_RESULT TUR
                            on TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
                  left join RMS_CAPACITY RC
-                            on RC.CAPACITY_ID = OO.CAPACITY_ID
+                           on RC.CAPACITY_ID = OO.CAPACITY_ID
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
 
@@ -627,50 +651,50 @@
         where WAREHOUSE_NAME = #{warehouseName}
     </select>
 
-<!--  通过总实绩ID查询订单中卸货实绩  -->
+    <!--  通过总实绩ID查询订单中卸货实绩  -->
     <select id="getUnloadPointId" resultType="java.math.BigDecimal" parameterType="java.util.Map">
         select OO.UNLOAD_POINT_ID from OMSTRUCK_ORDER OO
-            left join TMSTRUCK_TOTAL_RESULT TTR
-                on OO.ORDER_ID = TTR.ORDER_ID
+                                           left join TMSTRUCK_TOTAL_RESULT TTR
+                                                     on OO.ORDER_ID = TTR.ORDER_ID
         where TTR.RESULT_TOTAL_ID = #{resultTotalId}
     </select>
 
-<!--   查询内转采购进口矿国产矿实绩 -->
+    <!--   查询内转采购进口矿国产矿实绩 -->
     <select id="getImportedDomesticNzUnloadResult" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
-                 select TUR.RESULT_ID         "resultId",
-                        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-                        OO.ORDER_NUMBER       "orderNumber",
-                        RC.CAPACITY_NUMBER    "capacityNumber",
-                        RM.MATERIAL_NAME      "materialName",
-                        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-                        TWR.RESULT_NET_WEIGHT "resultNetWeight",
-                        RW.WAREHOUSE_NAME     "warehouseName",
-                        TUR.RESULT_START_TIME "resultStartTime",
-                        TUR.INSERT_TIME       "insertTime"
-                 from TMSTRUCK_UNLOAD_RESULT TUR
-                          left join TMSTRUCK_TOTAL_RESULT TTR
-                                    on TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                          left join TMSTRUCK_WEIGHT_RESULT TWR
-                                    on TWR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
-                          left join OMSTRUCK_ORDER OO
-                                    on OO.ORDER_ID = TTR.ORDER_ID
-                          left join AMS_PURCHASE_ORDER APO
-                                    on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
-                          left join DIL_BATCH DB
-                                    on DB.BATCH_ID = APO.BATCH_ID
-                          left join OMSTRUCK_ORDER_MATERIAL OOM
-                                    on OOM.ORDER_ID = OO.ORDER_ID
-                          left join RMS_MATERIAL RM
-                                    on OOM.MATERIAL_ID = RM.MATERIAL_ID
-                          left join RMS_CAPACITY RC
-                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
-                          left join RMS_WAREHOUSE RW
-                                    on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-                 where RESULT_START_TIME is not null
-                   and OO.ORDER_TYPE = 9
-             )
+        select TUR.RESULT_ID         "resultId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        OO.ORDER_NUMBER       "orderNumber",
+        RC.CAPACITY_NUMBER    "capacityNumber",
+        RM.MATERIAL_NAME      "materialName",
+        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        TWR.RESULT_NET_WEIGHT "resultNetWeight",
+        RW.WAREHOUSE_NAME     "warehouseName",
+        TUR.RESULT_START_TIME "resultStartTime",
+        TUR.INSERT_TIME       "insertTime"
+        from TMSTRUCK_UNLOAD_RESULT TUR
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join TMSTRUCK_WEIGHT_RESULT TWR
+        on TWR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+        left join OMSTRUCK_ORDER OO
+        on OO.ORDER_ID = TTR.ORDER_ID
+        left join AMS_PURCHASE_ORDER APO
+        on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        left join DIL_BATCH DB
+        on DB.BATCH_ID = APO.BATCH_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        on OOM.ORDER_ID = OO.ORDER_ID
+        left join RMS_MATERIAL RM
+        on OOM.MATERIAL_ID = RM.MATERIAL_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join RMS_WAREHOUSE RW
+        on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+        where RESULT_START_TIME is not null
+        and OO.ORDER_TYPE = 9
+        )
         <where>
             <if test="purchaseOrderNo != null">
                 <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
@@ -735,36 +759,36 @@
         <include refid="orderBy"></include>
     </select>
 
-<!--  查询内转采购进口矿国产矿实绩(老区-厂内)  -->
+    <!--  查询内转采购进口矿国产矿实绩(老区-厂内)  -->
     <select id="getImportedDomesticNzUnload2Result" parameterType="java.util.Map" resultType="java.util.Map">
 
         SELECT *
         FROM (
-                 SELECT
-                        TUR.RESULT_ID          "resultId",
-                        OO.ORDER_NUMBER       "orderNumber",
-                        RC.CAPACITY_NUMBER    "capacityNumber",
-                        RM.MATERIAL_NAME      "materialName",
-                        TWR.RESULT_NET_WEIGHT "resultNetWeight",
-                        RW.WAREHOUSE_NAME     "warehouseName",
-                        TUR.RESULT_START_TIME "resultStartTime"
-                 FROM TMSTRUCK_UNLOAD_RESULT TUR
-                          LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-                                    ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
-                          LEFT JOIN OMSTRUCK_ORDER OO
-                                    ON OO.ORDER_ID = TTR.ORDER_ID
-                          LEFT JOIN RMS_CAPACITY RC
-                                    ON RC.CAPACITY_ID = OO.CAPACITY_ID
-                          LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
-                                    ON OOM.ORDER_ID = OO.ORDER_ID
-                          LEFT JOIN RMS_MATERIAL RM
-                                    ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-                          LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
-                                    ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                          LEFT JOIN RMS_WAREHOUSE RW
-                                    ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-                          WHERE TUR.RESULT_START_TIME IS NOT NULL AND OO.ORDER_TYPE = 10
-             )
+        SELECT
+        TUR.RESULT_ID          "resultId",
+        OO.ORDER_NUMBER       "orderNumber",
+        RC.CAPACITY_NUMBER    "capacityNumber",
+        RM.MATERIAL_NAME      "materialName",
+        TWR.RESULT_NET_WEIGHT "resultNetWeight",
+        RW.WAREHOUSE_NAME     "warehouseName",
+        TUR.RESULT_START_TIME "resultStartTime"
+        FROM TMSTRUCK_UNLOAD_RESULT TUR
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+        WHERE TUR.RESULT_START_TIME IS NOT NULL AND OO.ORDER_TYPE = 10
+        )
         <where>
             <if test="orderNumber != null">
                 <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
@@ -805,36 +829,36 @@
         <include refid="orderBy"></include>
     </select>
 
-<!--  查询内转厂内卸货实绩  -->
+    <!--  查询内转厂内卸货实绩  -->
     <select id="getInFactoryUnloadResult" parameterType="java.util.Map" resultType="java.util.Map">
 
         SELECT *
         FROM (
-                 SELECT TUR.RESULT_ID             "resultId",
-                        OO.ORDER_NUMBER           "orderNumber",
-                        RC.CAPACITY_NUMBER        "capacityNumber",
-                        RM.MATERIAL_NAME          "materialName",
-                        OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
-                        TUR.RESULT_START_TIME     "resultStartTime",
-                        TUR.RESULT_END_TIME       "resultEndTime",
-                        TUR.RESULT_DURATION       "resultDuration",
-                        RW.WAREHOUSE_NAME         "warehouseName"
-                 FROM TMSTRUCK_UNLOAD_RESULT TUR
-                          LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-                                    ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
-                          LEFT JOIN OMSTRUCK_ORDER OO
-                                    ON OO.ORDER_ID = TTR.ORDER_ID
-                          LEFT JOIN RMS_CAPACITY RC
-                                    ON RC.CAPACITY_ID = OO.CAPACITY_ID
-                          LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
-                                    ON OOM.ORDER_ID = OO.ORDER_ID
-                          LEFT JOIN RMS_MATERIAL RM
-                                    ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-                          LEFT JOIN RMS_WAREHOUSE RW
-                                    ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-                 WHERE TUR.RESULT_START_TIME IS NOT NULL
-                   AND OO.ORDER_TYPE = 11
-             )
+        SELECT TUR.RESULT_ID             "resultId",
+        OO.ORDER_NUMBER           "orderNumber",
+        RC.CAPACITY_NUMBER        "capacityNumber",
+        RM.MATERIAL_NAME          "materialName",
+        OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+        TUR.RESULT_START_TIME     "resultStartTime",
+        TUR.RESULT_END_TIME       "resultEndTime",
+        TUR.RESULT_DURATION       "resultDuration",
+        RW.WAREHOUSE_NAME         "warehouseName"
+        FROM TMSTRUCK_UNLOAD_RESULT TUR
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+        WHERE TUR.RESULT_START_TIME IS NOT NULL
+        AND OO.ORDER_TYPE = 11
+        )
         <where>
             <if test="orderNumber != null">
                 <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
@@ -902,17 +926,17 @@
 
         FROM TMSTRUCK_UNLOAD_RESULT TUR
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-        ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+            ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
         LEFT JOIN OMSTRUCK_ORDER OO
-        ON OO.ORDER_ID = TTR.ORDER_ID
+            ON OO.ORDER_ID = TTR.ORDER_ID
         LEFT JOIN AMSTRUCK_SPORADIC_ORDER ASO
-        ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
+            ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
         LEFT JOIN RMS_CAPACITY RC
-        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+            ON RC.CAPACITY_ID = OO.CAPACITY_ID
         LEFT JOIN RMS_WAREHOUSE RW
-        ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-        WHERE TUR.RESULT_START_TIME IS NOT NULL
-        AND OO.ORDER_TYPE = 12
+            ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+        WHERE TUR.RESULT_END_TIME IS NOT NULL
+                AND OO.ORDER_TYPE = 12
         )
         <where>
             <if test="orderNumber != null">
@@ -953,5 +977,26 @@
         </where>
         <include refid="orderBy"></include>
     </select>
+    <!-- 根据优先级查询物资   -->
+    <select id="selectMaterialForUnload" resultType="java.util.Map">
+        select OOM.MATERIAL_ID "materialId",
+               OO.ORDER_ID "orderId"
+        from OMSTRUCK_ORDER_MATERIAL OOM
+                 JOIN OMSTRUCK_ORDER OO
+                      ON OO.ORDER_ID=OOM.ORDER_ID
+        where OO.ORDER_NUMBER=#{orderNumber}
+        ORDER BY OOM.MATERIAL_PRIORITY
+    </select>
+    <!--  根据物资是否计量 -->
+    <select id="selectUnloadMaterialId" resultType="java.lang.Integer" parameterType="java.util.Map">
+        SELECT
+            COUNT( * )
+        FROM
+            OMSTRUCK_ORDER_MATERIAL OOM
+                JOIN OMSTRUCK_ORDER OO ON OO.ORDER_ID = OOM.ORDER_ID
+                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+                LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE OOM.MATERIAL_ID=#{materialId}  AND OO.ORDER_ID=#{orderId}
+    </select>
 
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

@@ -1378,22 +1378,21 @@
     </select>
 
     <!--   通过物资Id和运输订单id 查询计量实绩Id -->
-    <select id="getWeightIdByMaterialIdAndOrderId" parameterType="java.util.Map" resultType="DECIMAL">
+
+    <select id="getWeightIdBySQEAndOrderId" parameterType="java.util.Map" resultType="DECIMAL">
         select *
-        from （select TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId"
-        from omstruck_order oo
-        left join tmstruck_total_result ttr
-        on OO.ORDER_ID = TTR.ORDER_ID
-        left join TMSTRUCK_WEIGHT_RESULT TWR
-        on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        where oo.order_id =  #{orderId}
-        and (twr.result_tare_place_id is null or
-        twr.result_gross_place_id is null)
-        order by twr.tare_segment_sqe)
+        from (
+                 select TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId"
+                 from OMSTRUCK_ORDER OO
+                          left join TMSTRUCK_TOTAL_RESULT TTR
+                                    on OO.ORDER_ID = TTR.ORDER_ID
+                          left join TMSTRUCK_WEIGHT_RESULT TWR
+                                    on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 where OO.ORDER_ID = #{orderId}
+                   and (TWR.RESULT_NET_WEIGHT is null or TWR.RESULT_NET_WEIGHT = 0)
+                 order by TWR.TARE_SEGMENT_SQE
+             )
         where rownum = 1
-        <if test="materialId != null">
-            and TWR.MATERIAL_ID = #{materialId}
-        </if>
     </select>
 
     <!--    通过运输订单号和查询订单Id 和物资ID (针对单拼)  -->