小程序修改2

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -1181,7 +1181,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
 
                 //拉猪车结束
-                if (billClean.getTestLocationId() == 16) {
+                if (billClean.getTestLocationId() == 15) {
                     baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                     baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
                     baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
@@ -1190,7 +1190,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     baseProcess.setCurrentStatus(substring + "1");
                     baseProcess.setProcessType(1);
 
-                    baseProcess.setAllLocationStatus("2,2");
+                    baseProcess.setAllLocationStatus("2,2,2");
                 } else {
                     baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                     baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
@@ -1311,6 +1311,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 String substring = status.substring(0, status.length() - 1);
                 baseProcess.setCurrentStatus(substring + "1");
                 baseProcess.setProcessType(1);
+                if (billClean.getTestLocationId() == 15 || billClean.getDestId() == 16) {
+                    baseProcess.setAllLocationStatus("2,2,0");
+                }
                 processMapper.updateById(baseProcess);
                 cleanMapper.updateById(billClean);
                 return new Result(10000, "修改成功！", true);