线路值勤日报，修改班次时，跨线路修改班次车提示报警

徐烜
1 parent 4c0aef88
Showing 6 changed files with 89 additions and 1 deletions
src/main/java/com/bsth/controller/schedule/core/CarConfigInfoController.java
src/main/java/com/bsth/service/schedule/CarConfigInfoService.java
src/main/java/com/bsth/service/schedule/impl/CarConfigInfoServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice-legacy.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/edit.html
@@ -63,6 +63,20 @@ public class CarConfigInfoController extends BController&lt;CarConfigInfo, Long&gt; {
         return rtn;
     }
+    @RequestMapping(value = "/validate_cars_2", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars(@RequestParam Integer xlId, @RequestParam Integer clId) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            carConfigInfoService.validate_cars(xlId, clId);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
     @RequestMapping(value = "/validate_cars_gs", method = RequestMethod.GET)
     public Map<String, Object> validate_cars_gs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
         HttpSession session = request.getSession();
@@ -10,7 +10,10 @@ import java.util.List;
  * Created by xu on 16/5/9.
  */
 public interface CarConfigInfoService extends BService<CarConfigInfo, Long> {
+    // 判定车辆是否配置在其他线路上
     void validate_cars(CarConfigInfo carConfigInfo) throws ScheduleException;
+    // 判定车辆是否配置在其他线路上2
+    void validate_cars(Integer xlId, Integer clId) throws ScheduleException;
     // 判定车辆是否配置在当前线路中
     void validate_cars_config(CarConfigInfo carConfigInfo) throws ScheduleException;
     // 判定车辆所属公司和当前用户的所属公司
@@ -130,6 +130,18 @@ public class CarConfigInfoServiceImpl extends BServiceImpl&lt;CarConfigInfo, Long&gt; 
     }
     @Override
+    public void validate_cars(Integer xlId, Integer clId) throws ScheduleException {
+        Map<String, Object> param = new HashMap<>();
+        param.put("cl.id_eq", clId);
+        List<CarConfigInfo> carConfigInfos = list(param);
+        for (CarConfigInfo carConfigInfo : carConfigInfos) {
+            if (!carConfigInfo.getXl().getId().equals(xlId)) {
+                throw new ScheduleException("车辆不配置在当前线路下，配置在" + carConfigInfo.getXl().getName() + "线路中！");
+            }
+        }
+    }
+
+    @Override
     public void validate_cars_config(CarConfigInfo carConfigInfo) throws ScheduleException {
         Map<String, Object> param = new HashMap<>();
         param.put("xl.id_eq", carConfigInfo.getXl().getId());
@@ -447,6 +447,18 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
                     }
                 )
             },
+            cc_cars_2: { // 车辆不能重复配置2
+                template: {'xlId': -1, 'clId': -1}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/cci/validate_cars_2',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
             cc_cars_gs: { // 车辆是否属于当前用户所属公司
                 template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'cl.id_eq': -1}, // 查询参数模版
                 remote: $resource( // $resource封装对象
@@ -1325,6 +1325,18 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
                     }
                 )
             },
+            cc_cars_2: { // 车辆不能重复配置2
+                template: {'xlId': -1, 'clId': -1}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/cci/validate_cars_2',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
             cc_cars_gs: { // 车辆是否属于当前用户所属公司
                 template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'cl.id_eq': -1}, // 查询参数模版
                 remote: $resource( // $resource封装对象
@@ -65,6 +65,7 @@
                             </div>
                             <!-- 隐藏块，显示验证信息 -->
                             <div class="alert alert-danger well-sm" ng-show="myForm.ddr.$error.required">
+                                <i class="fa fa-times-circle" aria-hidden="true"></i>
                                 调度原因必须选择
                             </div>
                         </div>
@@ -87,6 +88,7 @@
                             </div>
                             <!-- 隐藏块，显示验证信息 -->
                             <div class="alert alert-danger well-sm" ng-show="myForm.cl1.$error.required">
+                                <i class="fa fa-times-circle" aria-hidden="true"></i>
                                 车辆1必须选择
                             </div>
@@ -96,6 +98,7 @@
                                    remotevtype="cc_cars_gs"
                                    remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'cl.id_eq': ctrl.formData.cl1.id} | json}}" />
                             <div class="alert alert-danger well-sm" ng-show="myForm.cl1_h_gs.$error.remote">
+                                <i class="fa fa-times-circle" aria-hidden="true"></i>
                                 {{$remote_msg}}
                             </div>
                             <!-- 分公司权限 -->
@@ -109,6 +112,18 @@
                                 <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
                                 {{ctrl.cl1_h_fgs_warn}}
                             </div>
+
+                            <!-- 车辆配置判定 -->
+                            <input type="hidden" name="cl1_h_xl" ng-model="ctrl.formData.cl1.id"
+                                   remote-Warn
+                                   remotewtype="cc_cars_2"
+                                   remotewparam="{{ {'xlId': ctrl.xlId, 'clId': ctrl.formData.cl1.id} | json}}"
+                                   remotewmsgprop="cl1_h_xl_warn" />
+                            <div class="alert alert-warning well-sm" ng-show="ctrl.cl1_h_xl_warn">
+                                <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+                                {{ctrl.cl1_h_xl_warn}}
+                            </div>
+
                         </div>
                         <div class="form-group">
                             <label class="col-md-5 control-label">车辆2：</label>
@@ -133,6 +148,7 @@
                                    remotevtype="cc_cars_gs"
                                    remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'cl.id_eq': ctrl.formData.cl2.id} | json}}" />
                             <div class="alert alert-danger well-sm" ng-show="myForm.cl2_h_gs.$error.remote">
+                                <i class="fa fa-times-circle" aria-hidden="true"></i>
                                 {{$remote_msg}}
                             </div>
                             <!-- 分公司权限 -->
@@ -147,6 +163,17 @@
                                 {{ctrl.cl2_h_fgs_warn}}
                             </div>
+                            <!-- 车辆配置判定 -->
+                            <input type="hidden" name="cl2_h_xl" ng-model="ctrl.formData.cl2.id"
+                                   remote-Warn
+                                   remotewtype="cc_cars_2"
+                                   remotewparam="{{ {'xlId': ctrl.xlId, 'clId': ctrl.formData.cl2.id} | json}}"
+                                   remotewmsgprop="cl2_h_xl_warn" />
+                            <div class="alert alert-warning well-sm" ng-show="ctrl.cl2_h_xl_warn">
+                                <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+                                {{ctrl.cl2_h_xl_warn}}
+                            </div>
+
                         </div>
                         <div class="form-group has-success has-feedback">
@@ -168,6 +195,7 @@
                             </div>
                             <!-- 隐藏块，显示验证信息 -->
                             <div class="alert alert-danger well-sm" ng-show="myForm.j1.$error.required">
+                                <i class="fa fa-times-circle" aria-hidden="true"></i>
                                 驾驶员必须选择
                             </div>
@@ -177,6 +205,7 @@
                                    remotevtype="ec_jsy_gs"
                                    remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'jsy.id_eq': ctrl.formData.j1.id} | json}}" />
                             <div class="alert alert-danger well-sm" ng-show="myForm.j1_h_gs.$error.remote">
+                                <i class="fa fa-times-circle" aria-hidden="true"></i>
                                 {{$remote_msg}}
                             </div>
                             <!-- 分公司权限 -->
@@ -216,6 +245,7 @@
                                    remotevtype="ec_spy_gs"
                                    remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s1.id} | json}}" />
                             <div class="alert alert-danger well-sm" ng-show="myForm.s1_h_gs.$error.remote">
+                                <i class="fa fa-times-circle" aria-hidden="true"></i>
                                 {{$remote_msg}}
                             </div>
                             <!-- 分公司权限 -->
@@ -254,6 +284,7 @@
                                    remotevtype="ec_jsy_gs"
                                    remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'jsy.id_eq': ctrl.formData.j2.id} | json}}" />
                             <div class="alert alert-danger well-sm" ng-show="myForm.j2_h_gs.$error.remote">
+                                <i class="fa fa-times-circle" aria-hidden="true"></i>
                                 {{$remote_msg}}
                             </div>
                             <!-- 分公司权限 -->
@@ -293,6 +324,7 @@
                                    remotevtype="ec_spy_gs"
                                    remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s2.id} | json}}" />
                             <div class="alert alert-danger well-sm" ng-show="myForm.s2_h_gs.$error.remote">
+                                <i class="fa fa-times-circle" aria-hidden="true"></i>
                                 {{$remote_msg}}
                             </div>
                             <!-- 分公司权限 -->
@@ -332,6 +364,7 @@
                                    remotevtype="ec_jsy_gs"
                                    remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'jsy.id_eq': ctrl.formData.j3.id} | json}}" />
                             <div class="alert alert-danger well-sm" ng-show="myForm.j3_h_gs.$error.remote">
+                                <i class="fa fa-times-circle" aria-hidden="true"></i>
                                 {{$remote_msg}}
                             </div>
                             <!-- 分公司权限 -->
@@ -371,6 +404,7 @@
                                    remotevtype="ec_spy_gs"
                                    remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s3.id} | json}}" />
                             <div class="alert alert-danger well-sm" ng-show="myForm.s3_h_gs.$error.remote">
+                                <i class="fa fa-times-circle" aria-hidden="true"></i>
                                 {{$remote_msg}}
                             </div>
                             <!-- 分公司权限 -->
@@ -399,6 +433,7 @@
                             </div>
                             <!-- 隐藏块，显示验证信息 -->
                             <div class="alert alert-danger well-sm" ng-show="myForm.ddrdesc.$error.maxlength">
+                                <i class="fa fa-times-circle" aria-hidden="true"></i>
                                 最大100个字
                             </div>
                         </div>
@@ -443,7 +478,7 @@
                     <div class="col-md-offset-3 col-md-4">
                         <button type="submit" class="btn green"
                                 ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
-                        <a type="button" class="btn default" ui-sref="schedulePlanReportExtManage" ><i class="fa fa-times"></i> 取消</a>
+                        <a type="button" class="btn default" ui-sref="schedulePlanReportExtManage" ><i class="fa fa-times-circle"></i> 取消</a>
                     </div>
                 </div>
             </div>