luobang 3 years ago
parent
commit
6b8678cd55

+ 2 - 0
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -1714,4 +1714,6 @@ public class AMScontroller{
     ) {
         return amsFeign.getSporadicOfOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,sporadicId);
     }
+
+
 }

+ 5 - 1
src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -629,7 +629,11 @@ public class UniversalController extends BaseRESTfulController {
            failed();
        }
        return success(carrier);
+    }
 
-
+    @ApiOperation(value = "查询待分解计划数量")
+    @PostMapping("/getPlanCount")
+    public Integer getPlanCount(){
+        return universalMapper.getPlanCount();
     }
 }

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

@@ -1549,4 +1549,5 @@ public interface AmsFeign {
                                                         @RequestParam Integer pageNum,
                                                         @RequestParam Integer pageSize,
                                                         @RequestParam Integer sporadicId);
+
 }

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

@@ -139,4 +139,6 @@ public interface UniversalMapper {
 
     Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
 
+    Integer getPlanCount();
+
 }

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

@@ -23,7 +23,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:

+ 10 - 0
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -749,4 +749,14 @@
         where r_carrier.CARRIER_SSO_ID = #{carrierSsoId}
 
     </select>
+    <select id="getPlanCount" resultType="java.lang.Integer">
+        SELECT
+            COUNT( * )
+        FROM
+            ( SELECT AIR2.REQUIREMENT_ID FROM AMSTRUCK_INWARD_REQUIREMENT AIR2 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP ON AIR2.REQUIREMENT_ID = ARP.REQUIREMENT_ID WHERE ARP.PLAN_ID IS NULL ) AIRP
+                LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR ON AIR.REQUIREMENT_ID = AIRP.REQUIREMENT_ID
+        WHERE
+            AIR.REQUIREMENT_STATUS = 2
+          AND AIR.DELETED = 0
+    </select>
 </mapper>