wwh před 1 rokem
rodič
revize
f9414d4f51

+ 32 - 0
huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java

@@ -349,6 +349,15 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     }
                 }
 
+
+                if (baseProcess.getDestId() == 1) {
+                    baseProcess.setAllLocationStatus("2,2");
+                }
+
+                if (baseProcess.getDestId() == 4) {
+                    baseProcess.setAllLocationStatus("2,2,2,2");
+                }
+
                 baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                 baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
                 baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
@@ -364,6 +373,18 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 billClean.setCheckDate(sdf.parse(date));
                 billClean.setPassDate(sdf.parse(sdf.format(new Date())));
 
+
+                if (baseProcess.getDestId() == 1) {
+                    baseProcess.setAllLocationStatus("2,3");
+                }
+
+                if (baseProcess.getDestId() == 3) {
+                    baseProcess.setAllLocationStatus("2,2,3");
+                }
+                if (baseProcess.getDestId() == 4) {
+                    baseProcess.setAllLocationStatus("2,2,2,3");
+                }
+
                 if (baseLocation.getId() == 1 && baseProcess.getDestId() > 2) {
                     String status = baseProcess.getAllLocationStatus();
                     String[] split1 = status.split(",");
@@ -431,6 +452,17 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             split1.replace(s2, s2 + 1, "3");
             baseProcess.setAllLocationStatus(split1.toString());
 
+            if (baseProcess.getDestId() == 1) {
+                baseProcess.setAllLocationStatus("2,3");
+            }
+
+            if (baseProcess.getDestId() == 3) {
+                baseProcess.setAllLocationStatus("2,2,3");
+            }
+            if (baseProcess.getDestId() == 4) {
+                baseProcess.setAllLocationStatus("2,2,2,3");
+            }
+
             processMapper.updateById(baseProcess);
             cleanMapper.updateById(billClean);
             return new Result(10000, "修改成功!", true);

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

@@ -1232,6 +1232,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     String substring = status.substring(0, status.length() - 1);
                     baseProcess.setCurrentStatus(substring + "1");
                     baseProcess.setProcessType(1);
+                    baseProcess.setAllLocationStatus("2,2,2");
 
                 } else {
                     baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
@@ -1286,6 +1287,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         billDry.setPhone(billClean.getPhone());
                         billDry.setCarNum(billClean.getCarNum());
                         billDry.setImgStatus(0);
+                        baseProcess.setAllLocationStatus("2,1,0");
                         dryMapper.insert(billDry);
                     }
                 }
@@ -1615,6 +1617,12 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     baseProcess.setAllLocationStatus("2,1,0");
                 }
 
+                if (billClean.getTestLocationId() == 12) {
+                    baseProcess.setAllLocationStatus("2,2");
+                }
+                if (billClean.getTestLocationId() == 13) {
+                    baseProcess.setAllLocationStatus("2,2,2");
+                }
                 if (billClean.getTestLocationId() == 17) {
                     baseProcess.setAllLocationStatus("2,1,0");
                 }