guoyong 4 лет назад
Родитель
Сommit
b76863311d

+ 7 - 7
src/main/java/com/aoyang/tms/common/WorkOrderEnum.java

@@ -13,18 +13,18 @@ public enum WorkOrderEnum {
     //前往装车点
     GOTO_ZHUANGCHE_SPOT(10, "前往装车点"),
 
-    //前往装卸车点
-    GOTO_XIECHE_SPOT(10, "前往卸车点"),
-
-    //装卸车等待
+    //装车等待
     ZHUANGCHE_WAIT(20, "装车等待"),
 
-    //卸车等待
-    XIECHE_WAIT(20, "卸车等待"),
-
     //装车成果报备中
     ZHUANGCHE_RESULT_SUBMIT(30, "成果报备"),
 
+    //前往卸车点
+    GOTO_XIECHE_SPOT(10, "前往卸车点"),
+
+    //卸车等待
+    XIECHE_WAIT(20, "卸车等待"),
+
     //卸车成果报备
     XIECHE_RESULT_SUBMIT(30, "成果报备"),
 

+ 8 - 0
src/main/java/com/aoyang/tms/service/CommonService.java

@@ -31,6 +31,14 @@ public interface CommonService {
      */
     Truck findTruck(Long truckId);
 
+    /**
+     * 获取物流公司下卡车数或者物流公司部门下卡车数
+     *
+     * @param
+     * @return
+     */
+    Integer findOrgTruckNumber(Long orgId,Long deptId);
+
 
     /**
      * 判断操作是否成功,如获取、保存、更新等操作

+ 10 - 0
src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -47,6 +47,16 @@ public class CommonServiceImpl implements CommonService {
     }
 
     @Override
+    public Integer findOrgTruckNumber(Long orgId, Long deptId) {
+        Truck truck = new Truck();
+        truck.setOrgId(orgId);
+        if (deptId != null) {
+            truck.setDeptId(deptId);
+        }
+        return null;
+    }
+
+    @Override
     public boolean verifyResult(Result result) {
         return false;
     }