生物安全车辆修改15

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillCleanServiceImpl.java

@@ -591,7 +591,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             if (baseProcess.getProcessType() == 2 || baseProcess.getProcessType() == 1) {
                 return new Result(10001, "修改失败！该申请已提前结束或者被拒绝", false);
             } else {
-                if (billClean.getDestId() > billClean.getTestLocationId()) { //不是目的地
+                if (billClean.getDestId() > billClean.getTestLocationId() || billClean.getDestId() == 7) { //不是目的地
+
                     if ("1".equals(result)) {
                         billClean.setBillStatus(1);
                         billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
@@ -639,6 +640,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             clean.setTestLocation(baseLocation.getNextLocation());
                             cleanMapper.insert(clean);
                         }
+
                         if (billClean.getTestLocationId() == 7) {
                             //生成烘干申请
                             BillDry billPcr = new BillDry();

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillPcrServiceImpl.java

@@ -135,7 +135,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         if (baseProcess.getProcessType() == 2 || baseProcess.getProcessType() == 1) {
             return new Result(10001, "修改失败！该申请已提前结束或者被拒绝", false);
         } else {
-            if (billPcr.getDestId() > billPcr.getTestLocationId()) { //说明当前不是目的地
+            if (billPcr.getDestId() > billPcr.getTestLocationId()||billPcr.getTestLocationId()==9||billPcr.getTestLocationId()==10||billPcr.getTestLocationId()==11) { //说明当前不是目的地
                 if ("1".equals(result)) {
                     billPcr.setBillStatus(1);
                     billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));