Redeem 1 vuosi sitten
vanhempi
commit
d8cebb1904

+ 1 - 1
pom.xml

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

+ 9 - 0
src/main/java/com/steerinfo/dil/controller/StatisticalReportController.java

@@ -15,6 +15,7 @@ import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -31,6 +32,9 @@ public class StatisticalReportController extends BaseRESTfulController {
     @Autowired
     StatisticalReportImpl statisticalReportService;
 
+    @Resource
+    StatisticalReportMapper statisticalReportMapper;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
@@ -737,6 +741,10 @@ public class StatisticalReportController extends BaseRESTfulController {
         if(carrierSsoId != null){
             if(!"null".equals(carrierSsoId) && carrierSsoId != null){
                 map.put("carrierSsoId", carrierSsoId);
+                String realSsoId = statisticalReportMapper.getRealSsoId(carrierSsoId);
+                if(realSsoId != null) {
+                    map.put("carrierSsoId",realSsoId);
+                }
             }
         }
         if (receiveName != null && !"null".equals(receiveName)) {
@@ -1497,6 +1505,7 @@ public class StatisticalReportController extends BaseRESTfulController {
         if(carrierSsoId != null){
             if(!"null".equals(carrierSsoId) && carrierSsoId != null){
                 map.put("carrierSsoId", carrierSsoId);
+
             }
         }
         if (receiveName != null && !"null".equals(receiveName)) {

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/StatisticalReportMapper.java

@@ -142,4 +142,6 @@ public interface StatisticalReportMapper {
 
     List<Map<String, Object>> getOyeSteelReportDetailsListBySmId(BigDecimal saleOrderMaterialId);
 
+
+    String getRealSsoId(String carrierSsoId);
 }

+ 6 - 1
src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -6572,7 +6572,6 @@
         ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
         LEFT JOIN OYE_REALTIME_INVENTORY ORI
         ON ORI.INVENTORY_ID = ASM.SALE_WAREHOUSE
-
         WHERE
         ASM.SALE_MATERIAL_ID IS NOT NULL
         and asm.SALE_ORDER_ID != -1
@@ -6942,4 +6941,10 @@
           AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
         ORDER BY TWB.WEIGHT_BATCH_ID DESC
     </select>
+    <select id="getRealSsoId" resultType="java.lang.String">
+        SELECT RC.CARRIER_TRANSPORT_CERTIFICATE
+        FROM
+        RMS_CARRIER RC
+        WHERE RC.CARRIER_SSO_ID = #{carrierSsoId}
+    </select>
 </mapper>