Redeem 1 year ago
parent
commit
e4b5b16dad

+ 1 - 1
pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-tms-truck-api</artifactId>
-    <version>1.6</version>
+    <version>1.8</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -6635,7 +6635,7 @@
         LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
         ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
         LEFT JOIN OYE_REALTIME_INVENTORY ORI
-        ON ORI.INVENTORY_ID = ASM.SALE_WAREHOUSE
+        ON to_char(ORI.INVENTORY_ID) = ASM.SALE_WAREHOUSE
         LEFT JOIN OYE_OUTBOUND_RESULT OOR
         ON OOR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
         WHERE
@@ -6936,7 +6936,6 @@
                            ON TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                  LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR
                            ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
-
         WHERE ASO.SALE_TYPE = 50
           AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
     </select>
@@ -7000,7 +6999,7 @@
                  LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
                            ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
                  LEFT JOIN OYE_REALTIME_INVENTORY ORI
-                           ON ORI.INVENTORY_ID = ASM.SALE_WAREHOUSE
+                           ON to_char(ORI.INVENTORY_ID) = ASM.SALE_WAREHOUSE
                  LEFT JOIN OYE_OUTBOUND_RESULT  OOR
                            ON OOR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
         WHERE ASO.SALE_TYPE in (1, 50)