Update

徐烜
1 parent 7347716c
Showing 2 changed files with 35 additions and 3 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/resources/rules/rerun.drl
@@ -2,6 +2,7 @@ package com.bsth.entity.schedule;
  
 import com.bsth.entity.Line;
 import com.bsth.entity.sys.SysUser;
+import com.bsth.service.schedule.rules.rerun.RerunRule_input;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
 import org.apache.commons.lang3.StringUtils;
  
@@ -164,7 +165,20 @@ public class SchedulePlanInfo {
  
     public SchedulePlanInfo() {}
  
-    public void setRerunInfo(CarConfigInfo cc, EmployeeConfigInfo ec) {
+    // 对应班车套跑
+    public void setRerunInfoDybc(RerunRule_input rerunRule_input) {
+        this.cl = rerunRule_input.getCl();
+        this.clZbh = rerunRule_input.getZbh();
+        this.j = rerunRule_input.getJ();
+        this.jGh = rerunRule_input.getJgh();
+        this.jName = rerunRule_input.getJname();
+        this.s = rerunRule_input.getS();
+        this.sGh = rerunRule_input.getSgh();
+        this.sName = rerunRule_input.getSname();
+    }
+
+    // 对应路牌套跑
+    public void setRerunInfoDylp(CarConfigInfo cc, EmployeeConfigInfo ec) {
         // 关联的车辆信息
         this.cl = cc.getCl().getId(); // 车辆id
         this.clZbh = cc.getCl().getInsideCode(); // 自编号/内部编号
@@ -122,7 +122,7 @@ rule &quot;calcu_Dylp_ScheduleResult_output_wrap&quot;
 end
  
 //-------------------- 第三阶段、套跑线路，替换班次的车辆，人员 --------------------//
-rule "calcu_Dylp_rerun_update"
+rule "calcu_Dylp_rerun_update_dylp"
     salience 800
 //    no-loop
     when
@@ -143,10 +143,28 @@ rule &quot;calcu_Dylp_rerun_update&quot;
     then
 //        log.info("TODO：测试 {}", $fcsj);
  
-        $spi.setRerunInfo($dsro.getCc(), $dsro.getEc());
+        $spi.setRerunInfoDylp($dsro.getCc(), $dsro.getEc());
  
 end
  
+rule "calcu_Dylp_rerun_update_dybc"
+    salience 700
+    when
+        $spi: SchedulePlanInfo($xlid: xl, $sd: scheduleDate, $lp: lp, $fcsj: fcsj, $ttinfo: ttInfo)
+        $ri: RerunRule_input(
+            type == "dybc",
+            xl == $xlid.toString(),
+            ttinfo == $ttinfo.toString(),
+            lp == $lp.toString(),
+            fcsj == $fcsj
+        )
+
+    then
+
+        $spi.setRerunInfoDybc($ri);
+
+
+end