胡半仙 hace 3 años
padre
commit
bb20d0b538

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/wms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

+ 3 - 2
src/main/resources/com/steerinfo/dil/mapper/WmspInboundResultMapper.xml

@@ -629,7 +629,8 @@
         RPG.GRID_GRADATION_NUMBER "gridGradationNumber"
 
         from wmsp_inbound_result wir
-
+        LEFT JOIN WMSP_GRID_MATERIAL wgm
+        ON wgm.MATERIAL_ID = wir.MATERIAL_ID
         LEFT JOIN RMS_MATERIAL_STEEL rms
         ON rms.MATERIAL_STEEL_ID = wir.MATERIAL_ID
         LEFT JOIN RMS_MATERIAL rm
@@ -646,7 +647,7 @@
         where wir.inbound_type = 0
         and wir.result_deleted = 0
         and wir.INBOUND_ISCOMPLETE != 2
-        and wir.UPDATE_TIME is null
+        and wgm.UPDATE_TIME is null
         order by wir.inbound_time desc
         <where>
             <if test="INBOUND_NUMBER != null">