提前结束修改2

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

@@ -114,17 +114,17 @@ public class BaseProcessServiceImpl extends ServiceImpl<BaseProcessMapper, BaseP
         baseProcess.setProcessType(3);
         String currentFlowId = baseProcess.getCurrentFlowId();
 
-
-        String[] strings = baseProcess.getAllLocationId().split(",");
-        String ss2 = "";
-        for (int i = 0; i < strings.length; i++) {
-            strings[i].replaceAll(strings[i], "4");
-            if (i == strings.length - 1) {
-                ss2 = ss2 + strings[i].replaceAll(strings[i], "4");
-            } else {
-                ss2 = strings[i].replaceAll(strings[i], "4") + "," + ss2;
+        int count = 0;
+        char l = '0';
+        for (int i = 0; i < currentFlowId.length(); i++) {
+            if (currentFlowId.charAt(i) == l) {
+                count++;
             }
         }
+        String allLocationId = baseProcess.getAllLocationStatus();
+        int a = 2 + 4 * (count - 1);
+
+        String ss2=allLocationId.substring(0, a) + '4' + allLocationId.substring(a + 1);
         baseProcess.setAllLocationStatus(ss2);
 
         String s = currentFlowId.substring(currentFlowId.length() - 1);
@@ -214,16 +214,30 @@ public class BaseProcessServiceImpl extends ServiceImpl<BaseProcessMapper, BaseP
     public static void main(String[] args) {
         String s = "1,2,0";
 //        System.out.println(s.substring(s.length() - 1));
-        String[] strings = s.split(",");
-        String ss2 = "";
-        for (int i = 0; i < strings.length; i++) {
-            strings[i].replaceAll(strings[i], "4");
-            if (i == strings.length - 1) {
-                ss2 = ss2 + strings[i].replaceAll(strings[i], "4");
-            } else {
-                ss2 = strings[i].replaceAll(strings[i], "4") + "," + ss2;
+//        String[] strings = s.split(",");
+//        String ss2 = "";
+        int a = 2;
+        System.out.println(s.substring(0, a) + '4' + s.substring(a + 1));
+
+//        for (int i = 0; i < strings.length; i++) {
+//            strings[i].replaceAll(strings[i], "4");
+//            if (i == strings.length - 1) {
+//                ss2 = ss2 + strings[i].replaceAll(strings[i], "4");
+//            } else {
+//                ss2 = strings[i].replaceAll(strings[i], "4") + "," + ss2;
+//            }
+//        }
+//        System.out.println(ss2);
+
+
+        String fl="0,1,2";
+        int count = 0;
+        char l = '0';
+        for (int i = 0; i < fl.length(); i++) {
+            if (fl.charAt(i) == '0') {
+                count++;
             }
         }
-        System.out.println(ss2);
+        System.out.println(count);
     }
 }

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

@@ -93,7 +93,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             queryWrapper.eq("vistit_type", type).orderByDesc("sub_date").eq("test_location_id", baseLocation.getId());
 
             if ("0".equals(data)) {
-                queryWrapper.in("bill_status", 0, 1, 2);
+                queryWrapper.in("bill_status", 0, 1, 2,3);
             }
             if ("1".equals(data)) {
                 queryWrapper.eq("bill_status", 0);

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

@@ -383,7 +383,7 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
         Page<BillGoodsInventory> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         queryWrapper.eq("farm_id", farmId).orderByDesc("sub_date");
         if ("0".equals(type)) {
-            queryWrapper.in("bill_status", 0, 1);
+            queryWrapper.in("bill_status", 0, 1,3);
         } else {
             queryWrapper.eq("bill_status", type);
         }

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

@@ -304,7 +304,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("test_location_id", baseLocation.getId()).orderByDesc("sub_date");
         if ("0".equals(type)) {
-            queryWrapper.in("bill_status", 0, 1, 2, 3);
+            queryWrapper.in("bill_status", 0, 1, 2, 3,4);
         }
         if ("1".equals(type)) {
             queryWrapper.eq("bill_status", 0);