luobang 2 years ago
parent
commit
0074f4b704

+ 4 - 0
src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -5,6 +5,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -23,4 +24,7 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getInwardPriceBy")
     Map<String,Object> getInwardPriceBy(Map<String, Object> priceMap);
 
+    @PostMapping("/api/v1/ams/amssaleorders/getMakeOrderDate")
+    List<Map<String,Object>> getMakeOrderDate(@RequestBody Map<String, Object> easPrimaryMap);
+
 }

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

@@ -144,4 +144,6 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
 
     String getAddressPlace(BigDecimal orderId);
 
+    List<String> getEasPrimaryIds(String orderNumber);
+
 }

+ 9 - 0
src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -284,6 +284,15 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+                //查询该订单的出库单制作日期
+                try {
+                    List<String> easPrimaryIds = tmstruckLeaveFactoryResultMapper.getEasPrimaryIds(orderNumber);
+                    Map<String, Object> easPrimaryMap = new HashMap<>();
+                    easPrimaryMap.put("easPrimaryList",easPrimaryIds);
+                    amsFeign.getMakeOrderDate(easPrimaryMap);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 //判断该订单是不是异地库
                 try {
                         String addressPlace = tmstruckLeaveFactoryResultMapper.getAddressPlace(orderId);

+ 1 - 1
src/main/resources/application-prod.yml

@@ -9,7 +9,7 @@ spring:
     name: dil-tms-truck-dev
   mvc:
     async:
-      request-timeout: 10000
+      request-timeout: 15000
   #Redis相关配置
   redis:
     host: 172.16.33.166

+ 30 - 0
src/main/resources/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.xml

@@ -1453,4 +1453,34 @@
         ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
         WHERE OO.ORDER_ID = #{orderId}
     </select>
+    <select id="getEasPrimaryIds" resultType="java.lang.String" parameterType="string">
+        SELECT DISTINCT
+            ASM.EAS_PRIMARY_ID  "easPrimaryId"
+        FROM
+            AMS_SALE_ORDER ASO
+                LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+                LEFT JOIN RMS_SALE_AREA RSA ON RSA.AREA_ID = RC.AREA_ID
+                LEFT JOIN RMS_SALER RSR ON RSR.SALER_ID = ASO.SALER_ID
+                LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+                LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+                LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+                LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+                LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+                LEFT JOIN OMSTRUCK_ORDER OO ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                AND NVL( OO.ORDER_TYPE, 0 ) IN ( 0, 1 )
+                LEFT JOIN RMS_CAPACITY RCA ON RCA.CAPACITY_ID = OO.CAPACITY_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
+                AND TWR.MATERIAL_ID = RM.MATERIAL_ID
+                LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE
+            ASO.SALE_TYPE = 1
+          AND ASO.DELETED = 0
+          AND ASM.SALE_MATERIAL_ID IS NOT NULL
+          AND TWR.RESULT_NET_WEIGHT IS NOT NULL
+          AND oo.order_number = #{orderNumber}
+    </select>
 </mapper>