增加接口2

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

@@ -199,6 +199,13 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                     if (cleanBefore.getVistitType() != 0) {
                         billSampling.setCarNum(cleanBefore.getCarNum());
                     }
+                    if (cleanBefore.getVistitType() == 5) {
+                        billSampling.setResource(cleanBefore.getResource());
+                        billSampling.setFeedImgUrl(cleanBefore.getFeedImgUrl());
+                        billSampling.setRemark(cleanBefore.getRemark());
+                        billSampling.setCleanName(cleanBefore.getCleanName());
+                        billSampling.setCleanId(cleanBefore.getCleanId());
+                    }
                     samplingMapper.insert(billSampling);
                 } else if (Integer.parseInt(split[1]) == 2) {
                     //新增pcr
@@ -206,6 +213,13 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                     if (cleanBefore.getVistitType() != 0) {
                         billClean.setCarNum(cleanBefore.getCarNum());
                     }
+                    if (cleanBefore.getVistitType() == 5) {
+                        billClean.setResource(cleanBefore.getResource());
+                        billClean.setFeedImgUrl(cleanBefore.getFeedImgUrl());
+                        billClean.setRemark(cleanBefore.getRemark());
+                        billClean.setCleanName(cleanBefore.getCleanName());
+                        billClean.setCleanId(cleanBefore.getCleanId());
+                    }
                     pcrMapper.insert(billClean);
                 } else if (Integer.parseInt(split[1]) == 3) {
                     //新增洗澡
@@ -213,6 +227,13 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                     if (cleanBefore.getVistitType() != 0) {
                         billClean.setCarNum(cleanBefore.getCarNum());
                     }
+                    if (cleanBefore.getVistitType() == 5) {
+                        billClean.setResource(cleanBefore.getResource());
+                        billClean.setFeedImgUrl(cleanBefore.getFeedImgUrl());
+                        billClean.setRemark(cleanBefore.getRemark());
+                        billClean.setCleanName(cleanBefore.getCleanName());
+                        billClean.setCleanId(cleanBefore.getCleanId());
+                    }
                     cleanMapper.insert(billClean);
                 } else if (Integer.parseInt(split[1]) == 4) {
                     //新增隔离
@@ -220,12 +241,26 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                     if (cleanBefore.getVistitType() != 0) {
                         pcr.setCarNum(cleanBefore.getCarNum());
                     }
+                    if (cleanBefore.getVistitType() == 5) {
+                        pcr.setResource(cleanBefore.getResource());
+                        pcr.setFeedImgUrl(cleanBefore.getFeedImgUrl());
+                        pcr.setRemark(cleanBefore.getRemark());
+                        pcr.setCleanName(cleanBefore.getCleanName());
+                        pcr.setCleanId(cleanBefore.getCleanId());
+                    }
                     isolateMapper.insert(pcr);
                 } else if (Integer.parseInt(split[1]) == 5) {
                     BillDry billClean = (BillDry) entity;
                     if (cleanBefore.getVistitType() != 0) {
                         billClean.setCarNum(cleanBefore.getCarNum());
                     }
+                    if (cleanBefore.getVistitType() == 5) {
+                        billClean.setResource(cleanBefore.getResource());
+                        billClean.setFeedImgUrl(cleanBefore.getFeedImgUrl());
+                        billClean.setRemark(cleanBefore.getRemark());
+                        billClean.setCleanName(cleanBefore.getCleanName());
+                        billClean.setCleanId(cleanBefore.getCleanId());
+                    }
                     dryMapper.insert(billClean);
                     //新增烘干
                 } else if (Integer.parseInt(split[1]) == 6) {
@@ -234,6 +269,13 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                     if (cleanBefore.getVistitType() != 0) {
                         before.setCarNum(cleanBefore.getCarNum());
                     }
+                    if (cleanBefore.getVistitType() == 5) {
+                        before.setResource(cleanBefore.getResource());
+                        before.setFeedImgUrl(cleanBefore.getFeedImgUrl());
+                        before.setRemark(cleanBefore.getRemark());
+                        before.setCleanName(cleanBefore.getCleanName());
+                        before.setCleanId(cleanBefore.getCleanId());
+                    }
                     billCleanBeforeMapper.insert(before);
                 }else if (Integer.parseInt(split[1]) == 7) {
                     //新增洗澡前拍照
@@ -241,6 +283,13 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                     if (cleanBefore.getVistitType() != 0) {
                         before.setCarNum(cleanBefore.getCarNum());
                     }
+                    if (cleanBefore.getVistitType() == 5) {
+                        before.setResource(cleanBefore.getResource());
+                        before.setFeedImgUrl(cleanBefore.getFeedImgUrl());
+                        before.setRemark(cleanBefore.getRemark());
+                        before.setCleanName(cleanBefore.getCleanName());
+                        before.setCleanId(cleanBefore.getCleanId());
+                    }
                     inventoryMapper.insert(before);
                 }
                 baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + split[1]);
@@ -260,6 +309,13 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
             if (cleanBefore.getVistitType() != 0) {
                 billSampling.setCarNum(cleanBefore.getCarNum());
             }
+            if (cleanBefore.getVistitType() == 5) {
+                billSampling.setResource(cleanBefore.getResource());
+                billSampling.setFeedImgUrl(cleanBefore.getFeedImgUrl());
+                billSampling.setRemark(cleanBefore.getRemark());
+                billSampling.setCleanName(cleanBefore.getCleanName());
+                billSampling.setCleanId(cleanBefore.getCleanId());
+            }
             samplingMapper.insert(billSampling);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 2) {
@@ -268,6 +324,13 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
             if (cleanBefore.getVistitType() != 0) {
                 billClean.setCarNum(cleanBefore.getCarNum());
             }
+            if (cleanBefore.getVistitType() == 5) {
+                billClean.setResource(cleanBefore.getResource());
+                billClean.setFeedImgUrl(cleanBefore.getFeedImgUrl());
+                billClean.setRemark(cleanBefore.getRemark());
+                billClean.setCleanName(cleanBefore.getCleanName());
+                billClean.setCleanId(cleanBefore.getCleanId());
+            }
             pcrMapper.insert(billClean);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 3) {
@@ -276,6 +339,13 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
             if (cleanBefore.getVistitType() != 0) {
                 billClean.setCarNum(cleanBefore.getCarNum());
             }
+            if (cleanBefore.getVistitType() == 5) {
+                billClean.setResource(cleanBefore.getResource());
+                billClean.setFeedImgUrl(cleanBefore.getFeedImgUrl());
+                billClean.setRemark(cleanBefore.getRemark());
+                billClean.setCleanName(cleanBefore.getCleanName());
+                billClean.setCleanId(cleanBefore.getCleanId());
+            }
             cleanMapper.insert(billClean);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 4) {
@@ -284,6 +354,13 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
             if (cleanBefore.getVistitType() != 0) {
                 pcr.setCarNum(cleanBefore.getCarNum());
             }
+            if (cleanBefore.getVistitType() == 5) {
+                pcr.setResource(cleanBefore.getResource());
+                pcr.setFeedImgUrl(cleanBefore.getFeedImgUrl());
+                pcr.setRemark(cleanBefore.getRemark());
+                pcr.setCleanName(cleanBefore.getCleanName());
+                pcr.setCleanId(cleanBefore.getCleanId());
+            }
             isolateMapper.insert(pcr);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 5) {
@@ -291,6 +368,13 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
             if (cleanBefore.getVistitType() != 0) {
                 billClean.setCarNum(cleanBefore.getCarNum());
             }
+            if (cleanBefore.getVistitType() == 5) {
+                billClean.setResource(cleanBefore.getResource());
+                billClean.setFeedImgUrl(cleanBefore.getFeedImgUrl());
+                billClean.setRemark(cleanBefore.getRemark());
+                billClean.setCleanName(cleanBefore.getCleanName());
+                billClean.setCleanId(cleanBefore.getCleanId());
+            }
             dryMapper.insert(billClean);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
             //新增烘干
@@ -300,6 +384,13 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
             if (cleanBefore.getVistitType() != 0) {
                 before.setCarNum(cleanBefore.getCarNum());
             }
+            if (cleanBefore.getVistitType() == 5) {
+                before.setResource(cleanBefore.getResource());
+                before.setFeedImgUrl(cleanBefore.getFeedImgUrl());
+                before.setRemark(cleanBefore.getRemark());
+                before.setCleanName(cleanBefore.getCleanName());
+                before.setCleanId(cleanBefore.getCleanId());
+            }
             billCleanBeforeMapper.insert(before);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }
@@ -309,6 +400,13 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
             if (cleanBefore.getVistitType() != 0) {
                 before.setCarNum(cleanBefore.getCarNum());
             }
+            if (cleanBefore.getVistitType() == 5) {
+                before.setResource(cleanBefore.getResource());
+                before.setFeedImgUrl(cleanBefore.getFeedImgUrl());
+                before.setRemark(cleanBefore.getRemark());
+                before.setCleanName(cleanBefore.getCleanName());
+                before.setCleanId(cleanBefore.getCleanId());
+            }
             inventoryMapper.insert(before);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }

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

@@ -110,11 +110,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page, queryWrapper), cleanMapper.selectCount(queryWrapper2));
         }
         else if ("5".equals(type)) {
-            BaseLocation baseLocation = locationMapper.selectById(TokenSign.getWorkIdByJwtToken(httpServletRequest));
             Page<BillGoodsInventory> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             QueryWrapper<BillGoodsInventory> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId).orderByDesc("sub_date")
-                    .eq("current_location_id", baseLocation.getId());
+            queryWrapper.eq("farm_id", farmId).orderByDesc("sub_date");
 
             if ("0".equals(data)) {
                 queryWrapper.in("status", 0, 1);
@@ -126,10 +124,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 queryWrapper.eq("status", 1);
             }
             QueryWrapper<BillGoodsInventory> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.eq("farm_id", farmId).orderByDesc("sub_date")
-                    .eq("current_location_id", baseLocation.getId()).eq("status", 0);
-
-            return new Result(ResultCode.SUCCESS, inventoryMapper.selectPage(page, queryWrapper), inventoryMapper.selectCount(queryWrapper2));
+            queryWrapper2.eq("farm_id", farmId).orderByDesc("sub_date").eq("status", 0);
+            Page<BillGoodsInventory> inventoryPage = inventoryMapper.selectPage(page, queryWrapper);
+            return new Result(ResultCode.SUCCESS, inventoryPage, inventoryMapper.selectCount(queryWrapper2));
         } else {
             Page<CleanAndDryVo2> cleanAndDryVo2Page = null;
             Page<CleanAndDryVo2> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
@@ -891,6 +888,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             if (billClean.getVistitType() != 0) {
                                 billSampling.setCarNum(billClean.getCarNum());
                             }
+                            if (billClean.getVistitType() == 5) {
+                                billSampling.setResource(billClean.getResource());
+                                billSampling.setFeedImgUrl(billClean.getFeedImgUrl());
+                                billSampling.setRemark(billClean.getRemark());
+                                billSampling.setCleanName(billClean.getCleanName());
+                                billSampling.setCleanId(billClean.getCleanId());
+                            }
                             samplingMapper.insert(billSampling);
                         } else if (Integer.parseInt(splits[1]) == 2) {
                             //新增pcr
@@ -898,6 +902,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             if (billClean.getVistitType() != 0) {
                                 billClean1.setCarNum(billClean.getCarNum());
                             }
+                            if (billClean.getVistitType() == 5) {
+                                billClean1.setResource(billClean.getResource());
+                                billClean1.setFeedImgUrl(billClean.getFeedImgUrl());
+                                billClean1.setRemark(billClean.getRemark());
+                                billClean1.setCleanName(billClean.getCleanName());
+                                billClean1.setCleanId(billClean.getCleanId());
+                            }
                             pcrMapper.insert(billClean1);
                         } else if (Integer.parseInt(splits[1]) == 3) {
                             //新增洗澡
@@ -905,6 +916,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             if (billClean.getVistitType() != 0) {
                                 billClean1.setCarNum(billClean.getCarNum());
                             }
+                            if (billClean.getVistitType() == 5) {
+                                billClean1.setResource(billClean.getResource());
+                                billClean1.setFeedImgUrl(billClean.getFeedImgUrl());
+                                billClean1.setRemark(billClean.getRemark());
+                                billClean1.setCleanName(billClean.getCleanName());
+                                billClean1.setCleanId(billClean.getCleanId());
+                            }
                             cleanMapper.insert(billClean1);
                         } else if (Integer.parseInt(splits[1]) == 4) {
                             //新增隔离
@@ -912,12 +930,26 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             if (billClean.getVistitType() != 0) {
                                 pcr.setCarNum(billClean.getCarNum());
                             }
+                            if (billClean.getVistitType() == 5) {
+                                pcr.setResource(billClean.getResource());
+                                pcr.setFeedImgUrl(billClean.getFeedImgUrl());
+                                pcr.setRemark(billClean.getRemark());
+                                pcr.setCleanName(billClean.getCleanName());
+                                pcr.setCleanId(billClean.getCleanId());
+                            }
                             isolateMapper.insert(pcr);
                         } else if (Integer.parseInt(splits[1]) == 5) {
                             BillDry billClean1 = (BillDry) entity;
                             if (billClean.getVistitType() != 0) {
                                 billClean1.setCarNum(billClean.getCarNum());
                             }
+                            if (billClean.getVistitType() == 5) {
+                                billClean1.setResource(billClean.getResource());
+                                billClean1.setFeedImgUrl(billClean.getFeedImgUrl());
+                                billClean1.setRemark(billClean.getRemark());
+                                billClean1.setCleanName(billClean.getCleanName());
+                                billClean1.setCleanId(billClean.getCleanId());
+                            }
                             dryMapper.insert(billClean1);
                             //新增烘干
                         } else if (Integer.parseInt(splits[1]) == 6) {
@@ -926,6 +958,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             if (billClean.getVistitType() != 0) {
                                 before.setCarNum(billClean.getCarNum());
                             }
+                            if (billClean.getVistitType() == 5) {
+                                before.setResource(billClean.getResource());
+                                before.setFeedImgUrl(billClean.getFeedImgUrl());
+                                before.setRemark(billClean.getRemark());
+                                before.setCleanName(billClean.getCleanName());
+                                before.setCleanId(billClean.getCleanId());
+                            }
                             beforeMapper.insert(before);
                         }else if (Integer.parseInt(splits[1]) == 7) {
                             //新增洗澡前拍照
@@ -933,6 +972,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             if (billClean.getVistitType() != 0) {
                                 before.setCarNum(billClean.getCarNum());
                             }
+                            if (billClean.getVistitType() == 5) {
+                                before.setResource(billClean.getResource());
+                                before.setFeedImgUrl(billClean.getFeedImgUrl());
+                                before.setRemark(billClean.getRemark());
+                                before.setCleanName(billClean.getCleanName());
+                                before.setCleanId(billClean.getCleanId());
+                            }
                             inventoryMapper.insert(before);
                         }
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
@@ -952,6 +998,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     if (billClean.getVistitType() != 0) {
                         billSampling.setCarNum(billClean.getCarNum());
                     }
+                    if (billClean.getVistitType() == 5) {
+                        billSampling.setResource(billClean.getResource());
+                        billSampling.setFeedImgUrl(billClean.getFeedImgUrl());
+                        billSampling.setRemark(billClean.getRemark());
+                        billSampling.setCleanName(billClean.getCleanName());
+                        billSampling.setCleanId(billClean.getCleanId());
+                    }
                     samplingMapper.insert(billSampling);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 2) {
@@ -960,6 +1013,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     if (billClean.getVistitType() != 0) {
                         billClean1.setCarNum(billClean.getCarNum());
                     }
+                    if (billClean.getVistitType() == 5) {
+                        billClean1.setResource(billClean.getResource());
+                        billClean1.setFeedImgUrl(billClean.getFeedImgUrl());
+                        billClean1.setRemark(billClean.getRemark());
+                        billClean1.setCleanName(billClean.getCleanName());
+                        billClean1.setCleanId(billClean.getCleanId());
+                    }
                     pcrMapper.insert(billClean1);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 3) {
@@ -968,6 +1028,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     if (billClean.getVistitType() != 0) {
                         billClean2.setCarNum(billClean.getCarNum());
                     }
+                    if (billClean.getVistitType() == 5) {
+                        billClean2.setResource(billClean.getResource());
+                        billClean2.setFeedImgUrl(billClean.getFeedImgUrl());
+                        billClean2.setRemark(billClean.getRemark());
+                        billClean2.setCleanName(billClean.getCleanName());
+                        billClean2.setCleanId(billClean.getCleanId());
+                    }
                     cleanMapper.insert(billClean2);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 4) {
@@ -976,6 +1043,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     if (billClean.getVistitType() != 0) {
                         pcr.setCarNum(billClean.getCarNum());
                     }
+                    if (billClean.getVistitType() == 5) {
+                        pcr.setResource(billClean.getResource());
+                        pcr.setFeedImgUrl(billClean.getFeedImgUrl());
+                        pcr.setRemark(billClean.getRemark());
+                        pcr.setCleanName(billClean.getCleanName());
+                        pcr.setCleanId(billClean.getCleanId());
+                    }
                     isolateMapper.insert(pcr);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 5) {
@@ -983,6 +1057,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     if (billClean.getVistitType() != 0) {
                         billClean2.setCarNum(billClean.getCarNum());
                     }
+                    if (billClean.getVistitType() == 5) {
+                        billClean2.setResource(billClean.getResource());
+                        billClean2.setFeedImgUrl(billClean.getFeedImgUrl());
+                        billClean2.setRemark(billClean.getRemark());
+                        billClean2.setCleanName(billClean.getCleanName());
+                        billClean2.setCleanId(billClean.getCleanId());
+                    }
                     dryMapper.insert(billClean2);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                     //新增烘干
@@ -992,6 +1073,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     if (billClean.getVistitType() != 0) {
                         before.setCarNum(billClean.getCarNum());
                     }
+                    if (billClean.getVistitType() == 5) {
+                        before.setResource(billClean.getResource());
+                        before.setFeedImgUrl(billClean.getFeedImgUrl());
+                        before.setRemark(billClean.getRemark());
+                        before.setCleanName(billClean.getCleanName());
+                        before.setCleanId(billClean.getCleanId());
+                    }
                     beforeMapper.insert(before);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 7) {
@@ -1000,6 +1088,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     if (billClean.getVistitType() != 0) {
                         before.setCarNum(billClean.getCarNum());
                     }
+                    if (billClean.getVistitType() == 5) {
+                        before.setResource(billClean.getResource());
+                        before.setFeedImgUrl(billClean.getFeedImgUrl());
+                        before.setRemark(billClean.getRemark());
+                        before.setCleanName(billClean.getCleanName());
+                        before.setCleanId(billClean.getCleanId());
+                    }
                     inventoryMapper.insert(before);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }
@@ -1110,6 +1205,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 if (billClean.getVistitType() != 0) {
                                     billSampling.setCarNum(billClean.getCarNum());
                                 }
+                                if (billClean.getVistitType() == 5) {
+                                    billSampling.setResource(billClean.getResource());
+                                    billSampling.setFeedImgUrl(billClean.getFeedImgUrl());
+                                    billSampling.setRemark(billClean.getRemark());
+                                    billSampling.setCleanName(billClean.getCleanName());
+                                    billSampling.setCleanId(billClean.getCleanId());
+                                }
                                 samplingMapper.insert(billSampling);
                             } else if (Integer.parseInt(splits[1]) == 2) {
                                 //新增pcr
@@ -1117,6 +1219,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 if (billClean.getVistitType() != 0) {
                                     billClean1.setCarNum(billClean.getCarNum());
                                 }
+                                if (billClean.getVistitType() == 5) {
+                                    billClean1.setResource(billClean.getResource());
+                                    billClean1.setFeedImgUrl(billClean.getFeedImgUrl());
+                                    billClean1.setRemark(billClean.getRemark());
+                                    billClean1.setCleanName(billClean.getCleanName());
+                                    billClean1.setCleanId(billClean.getCleanId());
+                                }
                                 pcrMapper.insert(billClean1);
                             } else if (Integer.parseInt(splits[1]) == 3) {
                                 //新增洗澡
@@ -1124,6 +1233,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 if (billClean.getVistitType() != 0) {
                                     billClean1.setCarNum(billClean.getCarNum());
                                 }
+                                if (billClean.getVistitType() == 5) {
+                                    billClean1.setResource(billClean.getResource());
+                                    billClean1.setFeedImgUrl(billClean.getFeedImgUrl());
+                                    billClean1.setRemark(billClean.getRemark());
+                                    billClean1.setCleanName(billClean.getCleanName());
+                                    billClean1.setCleanId(billClean.getCleanId());
+                                }
                                 cleanMapper.insert(billClean1);
                             } else if (Integer.parseInt(splits[1]) == 4) {
                                 //新增隔离
@@ -1131,12 +1247,26 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 if (billClean.getVistitType() != 0) {
                                     pcr.setCarNum(billClean.getCarNum());
                                 }
+                                if (billClean.getVistitType() == 5) {
+                                    pcr.setResource(billClean.getResource());
+                                    pcr.setFeedImgUrl(billClean.getFeedImgUrl());
+                                    pcr.setRemark(billClean.getRemark());
+                                    pcr.setCleanName(billClean.getCleanName());
+                                    pcr.setCleanId(billClean.getCleanId());
+                                }
                                 isolateMapper.insert(pcr);
                             } else if (Integer.parseInt(splits[1]) == 5) {
                                 BillDry billClean1 = (BillDry) entity;
                                 if (billClean.getVistitType() != 0) {
                                     billClean1.setCarNum(billClean.getCarNum());
                                 }
+                                if (billClean.getVistitType() == 5) {
+                                    billClean1.setResource(billClean.getResource());
+                                    billClean1.setFeedImgUrl(billClean.getFeedImgUrl());
+                                    billClean1.setRemark(billClean.getRemark());
+                                    billClean1.setCleanName(billClean.getCleanName());
+                                    billClean1.setCleanId(billClean.getCleanId());
+                                }
                                 dryMapper.insert(billClean1);
                                 //新增烘干
                             } else if (Integer.parseInt(splits[1]) == 6) {
@@ -1145,6 +1275,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 if (billClean.getVistitType() != 0) {
                                     before.setCarNum(billClean.getCarNum());
                                 }
+                                if (billClean.getVistitType() == 5) {
+                                    before.setResource(billClean.getResource());
+                                    before.setFeedImgUrl(billClean.getFeedImgUrl());
+                                    before.setRemark(billClean.getRemark());
+                                    before.setCleanName(billClean.getCleanName());
+                                    before.setCleanId(billClean.getCleanId());
+                                }
                                 beforeMapper.insert(before);
                             }else if (Integer.parseInt(splits[1]) == 7) {
                                 //新增洗澡前拍照
@@ -1152,6 +1289,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 if (billClean.getVistitType() != 0) {
                                     before.setCarNum(billClean.getCarNum());
                                 }
+                                if (billClean.getVistitType() == 5) {
+                                    before.setResource(billClean.getResource());
+                                    before.setFeedImgUrl(billClean.getFeedImgUrl());
+                                    before.setRemark(billClean.getRemark());
+                                    before.setCleanName(billClean.getCleanName());
+                                    before.setCleanId(billClean.getCleanId());
+                                }
                                 inventoryMapper.insert(before);
                             }
                             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
@@ -1171,6 +1315,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         if (billClean.getVistitType() != 0) {
                             billSampling.setCarNum(billClean.getCarNum());
                         }
+                        if (billClean.getVistitType() == 5) {
+                            billSampling.setResource(billClean.getResource());
+                            billSampling.setFeedImgUrl(billClean.getFeedImgUrl());
+                            billSampling.setRemark(billClean.getRemark());
+                            billSampling.setCleanName(billClean.getCleanName());
+                            billSampling.setCleanId(billClean.getCleanId());
+                        }
                         samplingMapper.insert(billSampling);
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                     }else if (nextId == 2) {
@@ -1179,6 +1330,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         if (billClean.getVistitType() != 0) {
                             billClean1.setCarNum(billClean.getCarNum());
                         }
+                        if (billClean.getVistitType() == 5) {
+                            billClean1.setResource(billClean.getResource());
+                            billClean1.setFeedImgUrl(billClean.getFeedImgUrl());
+                            billClean1.setRemark(billClean.getRemark());
+                            billClean1.setCleanName(billClean.getCleanName());
+                            billClean1.setCleanId(billClean.getCleanId());
+                        }
                         pcrMapper.insert(billClean1);
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                     }else if (nextId == 3) {
@@ -1187,6 +1345,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         if (billClean.getVistitType() != 0) {
                             billClean2.setCarNum(billClean.getCarNum());
                         }
+                        if (billClean.getVistitType() == 5) {
+                            billClean2.setResource(billClean.getResource());
+                            billClean2.setFeedImgUrl(billClean.getFeedImgUrl());
+                            billClean2.setRemark(billClean.getRemark());
+                            billClean2.setCleanName(billClean.getCleanName());
+                            billClean2.setCleanId(billClean.getCleanId());
+                        }
                         cleanMapper.insert(billClean2);
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                     }else if (nextId == 4) {
@@ -1195,6 +1360,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         if (billClean.getVistitType() != 0) {
                             pcr.setCarNum(billClean.getCarNum());
                         }
+                        if (billClean.getVistitType() == 5) {
+                            pcr.setResource(billClean.getResource());
+                            pcr.setFeedImgUrl(billClean.getFeedImgUrl());
+                            pcr.setRemark(billClean.getRemark());
+                            pcr.setCleanName(billClean.getCleanName());
+                            pcr.setCleanId(billClean.getCleanId());
+                        }
                         isolateMapper.insert(pcr);
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                     }else if (nextId == 5) {
@@ -1202,6 +1374,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         if (billClean.getVistitType() != 0) {
                             billClean2.setCarNum(billClean.getCarNum());
                         }
+                        if (billClean.getVistitType() == 5) {
+                            billClean2.setResource(billClean.getResource());
+                            billClean2.setFeedImgUrl(billClean.getFeedImgUrl());
+                            billClean2.setRemark(billClean.getRemark());
+                            billClean2.setCleanName(billClean.getCleanName());
+                            billClean2.setCleanId(billClean.getCleanId());
+                        }
                         dryMapper.insert(billClean2);
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                         //新增烘干
@@ -1211,6 +1390,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         if (billClean.getVistitType() != 0) {
                             before.setCarNum(billClean.getCarNum());
                         }
+                        if (billClean.getVistitType() == 5) {
+                            before.setResource(billClean.getResource());
+                            before.setFeedImgUrl(billClean.getFeedImgUrl());
+                            before.setRemark(billClean.getRemark());
+                            before.setCleanName(billClean.getCleanName());
+                            before.setCleanId(billClean.getCleanId());
+                        }
                         beforeMapper.insert(before);
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                     }else if (nextId == 7) {
@@ -1219,6 +1405,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         if (billClean.getVistitType() != 0) {
                             before.setCarNum(billClean.getCarNum());
                         }
+                        if (billClean.getVistitType() == 5) {
+                            before.setResource(billClean.getResource());
+                            before.setFeedImgUrl(billClean.getFeedImgUrl());
+                            before.setRemark(billClean.getRemark());
+                            before.setCleanName(billClean.getCleanName());
+                            before.setCleanId(billClean.getCleanId());
+                        }
                         inventoryMapper.insert(before);
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                     }

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

@@ -134,6 +134,13 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                     if (goodsInventory.getVistitType() != 0) {
                         billSampling.setCarNum(goodsInventory.getCarNum());
                     }
+                    if (goodsInventory.getVistitType() == 5) {
+                        billSampling.setResource(goodsInventory.getResource());
+                        billSampling.setFeedImgUrl(goodsInventory.getFeedImgUrl());
+                        billSampling.setRemark(goodsInventory.getRemark());
+                        billSampling.setCleanName(goodsInventory.getCleanName());
+                        billSampling.setCleanId(goodsInventory.getCleanId());
+                    }
                     billSamplingMapper.insert(billSampling);
                 } else if (Integer.parseInt(split[1]) == 2) {
                     //新增pcr
@@ -141,6 +148,13 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                     if (goodsInventory.getVistitType() != 0) {
                         billClean.setCarNum(goodsInventory.getCarNum());
                     }
+                    if (goodsInventory.getVistitType() == 5) {
+                        billClean.setResource(goodsInventory.getResource());
+                        billClean.setFeedImgUrl(goodsInventory.getFeedImgUrl());
+                        billClean.setRemark(goodsInventory.getRemark());
+                        billClean.setCleanName(goodsInventory.getCleanName());
+                        billClean.setCleanId(goodsInventory.getCleanId());
+                    }
                     pcrMapper.insert(billClean);
                 } else if (Integer.parseInt(split[1]) == 3) {
                     //新增洗澡
@@ -148,6 +162,13 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                     if (goodsInventory.getVistitType() != 0) {
                         billClean.setCarNum(goodsInventory.getCarNum());
                     }
+                    if (goodsInventory.getVistitType() == 5) {
+                        billClean.setResource(goodsInventory.getResource());
+                        billClean.setFeedImgUrl(goodsInventory.getFeedImgUrl());
+                        billClean.setRemark(goodsInventory.getRemark());
+                        billClean.setCleanName(goodsInventory.getCleanName());
+                        billClean.setCleanId(goodsInventory.getCleanId());
+                    }
                     cleanMapper.insert(billClean);
                 } else if (Integer.parseInt(split[1]) == 4) {
                     //新增隔离
@@ -155,12 +176,26 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                     if (goodsInventory.getVistitType() != 0) {
                         pcr.setCarNum(goodsInventory.getCarNum());
                     }
+                    if (goodsInventory.getVistitType() == 5) {
+                        pcr.setResource(goodsInventory.getResource());
+                        pcr.setFeedImgUrl(goodsInventory.getFeedImgUrl());
+                        pcr.setRemark(goodsInventory.getRemark());
+                        pcr.setCleanName(goodsInventory.getCleanName());
+                        pcr.setCleanId(goodsInventory.getCleanId());
+                    }
                     isolateMapper.insert(pcr);
                 } else if (Integer.parseInt(split[1]) == 5) {
                     BillDry billClean = (BillDry) entity;
                     if (goodsInventory.getVistitType() != 0) {
                         billClean.setCarNum(goodsInventory.getCarNum());
                     }
+                    if (goodsInventory.getVistitType() == 5) {
+                        billClean.setResource(goodsInventory.getResource());
+                        billClean.setFeedImgUrl(goodsInventory.getFeedImgUrl());
+                        billClean.setRemark(goodsInventory.getRemark());
+                        billClean.setCleanName(goodsInventory.getCleanName());
+                        billClean.setCleanId(goodsInventory.getCleanId());
+                    }
                     dryMapper.insert(billClean);
                     //新增烘干
                 } else if (Integer.parseInt(split[1]) == 6) {
@@ -169,6 +204,13 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                     if (goodsInventory.getVistitType() != 0) {
                         before.setCarNum(goodsInventory.getCarNum());
                     }
+                    if (goodsInventory.getVistitType() == 5) {
+                        before.setResource(goodsInventory.getResource());
+                        before.setFeedImgUrl(goodsInventory.getFeedImgUrl());
+                        before.setRemark(goodsInventory.getRemark());
+                        before.setCleanName(goodsInventory.getCleanName());
+                        before.setCleanId(goodsInventory.getCleanId());
+                    }
                     billCleanBeforeMapper.insert(before);
                 }
                 else if (Integer.parseInt(split[1]) == 7) {
@@ -177,6 +219,13 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                     if (goodsInventory.getVistitType() != 0) {
                         before.setCarNum(goodsInventory.getCarNum());
                     }
+                    if (goodsInventory.getVistitType() == 5) {
+                        before.setResource(goodsInventory.getResource());
+                        before.setFeedImgUrl(goodsInventory.getFeedImgUrl());
+                        before.setRemark(goodsInventory.getRemark());
+                        before.setCleanName(goodsInventory.getCleanName());
+                        before.setCleanId(goodsInventory.getCleanId());
+                    }
                     inventoryMapper.insert(before);
                 }
                 baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + split[1]);
@@ -196,6 +245,13 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
             if (goodsInventory.getVistitType() != 0) {
                 billSampling.setCarNum(goodsInventory.getCarNum());
             }
+            if (goodsInventory.getVistitType() == 5) {
+                billSampling.setResource(goodsInventory.getResource());
+                billSampling.setFeedImgUrl(goodsInventory.getFeedImgUrl());
+                billSampling.setRemark(goodsInventory.getRemark());
+                billSampling.setCleanName(goodsInventory.getCleanName());
+                billSampling.setCleanId(goodsInventory.getCleanId());
+            }
             billSamplingMapper.insert(billSampling);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 2) {
@@ -204,6 +260,13 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
             if (goodsInventory.getVistitType() != 0) {
                 billClean.setCarNum(goodsInventory.getCarNum());
             }
+            if (goodsInventory.getVistitType() == 5) {
+                billClean.setResource(goodsInventory.getResource());
+                billClean.setFeedImgUrl(goodsInventory.getFeedImgUrl());
+                billClean.setRemark(goodsInventory.getRemark());
+                billClean.setCleanName(goodsInventory.getCleanName());
+                billClean.setCleanId(goodsInventory.getCleanId());
+            }
             pcrMapper.insert(billClean);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 3) {
@@ -212,6 +275,13 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
             if (goodsInventory.getVistitType() != 0) {
                 billClean.setCarNum(goodsInventory.getCarNum());
             }
+            if (goodsInventory.getVistitType() == 5) {
+                billClean.setResource(goodsInventory.getResource());
+                billClean.setFeedImgUrl(goodsInventory.getFeedImgUrl());
+                billClean.setRemark(goodsInventory.getRemark());
+                billClean.setCleanName(goodsInventory.getCleanName());
+                billClean.setCleanId(goodsInventory.getCleanId());
+            }
             cleanMapper.insert(billClean);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 4) {
@@ -220,6 +290,13 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
             if (goodsInventory.getVistitType() != 0) {
                 pcr.setCarNum(goodsInventory.getCarNum());
             }
+            if (goodsInventory.getVistitType() == 5) {
+                pcr.setResource(goodsInventory.getResource());
+                pcr.setFeedImgUrl(goodsInventory.getFeedImgUrl());
+                pcr.setRemark(goodsInventory.getRemark());
+                pcr.setCleanName(goodsInventory.getCleanName());
+                pcr.setCleanId(goodsInventory.getCleanId());
+            }
             isolateMapper.insert(pcr);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 5) {
@@ -227,6 +304,13 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
             if (goodsInventory.getVistitType() != 0) {
                 billClean.setCarNum(goodsInventory.getCarNum());
             }
+            if (goodsInventory.getVistitType() == 5) {
+                billClean.setResource(goodsInventory.getResource());
+                billClean.setFeedImgUrl(goodsInventory.getFeedImgUrl());
+                billClean.setRemark(goodsInventory.getRemark());
+                billClean.setCleanName(goodsInventory.getCleanName());
+                billClean.setCleanId(goodsInventory.getCleanId());
+            }
             dryMapper.insert(billClean);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
             //新增烘干
@@ -236,6 +320,13 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
             if (goodsInventory.getVistitType() != 0) {
                 before.setCarNum(goodsInventory.getCarNum());
             }
+            if (goodsInventory.getVistitType() == 5) {
+                before.setResource(goodsInventory.getResource());
+                before.setFeedImgUrl(goodsInventory.getFeedImgUrl());
+                before.setRemark(goodsInventory.getRemark());
+                before.setCleanName(goodsInventory.getCleanName());
+                before.setCleanId(goodsInventory.getCleanId());
+            }
             billCleanBeforeMapper.insert(before);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }
@@ -245,6 +336,13 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
             if (goodsInventory.getVistitType() != 0) {
                 before.setCarNum(goodsInventory.getCarNum());
             }
+            if (goodsInventory.getVistitType() == 5) {
+                before.setResource(goodsInventory.getResource());
+                before.setFeedImgUrl(goodsInventory.getFeedImgUrl());
+                before.setRemark(goodsInventory.getRemark());
+                before.setCleanName(goodsInventory.getCleanName());
+                before.setCleanId(goodsInventory.getCleanId());
+            }
             inventoryMapper.insert(before);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }

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

@@ -444,6 +444,13 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                             if (billPcr.getVistitType() != 0) {
                                 billSampling.setCarNum(billPcr.getCarNum());
                             }
+                            if (billPcr.getVistitType() == 5) {
+                                billSampling.setResource(billPcr.getResource());
+                                billSampling.setFeedImgUrl(billPcr.getFeedImgUrl());
+                                billSampling.setRemark(billPcr.getRemark());
+                                billSampling.setCleanName(billPcr.getCleanName());
+                                billSampling.setCleanId(billPcr.getCleanId());
+                            }
                             samplingMapper.insert(billSampling);
                         } else if (Integer.parseInt(split[1]) == 2) {
                             //新增pcr
@@ -451,6 +458,13 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                             if (billPcr.getVistitType() != 0) {
                                 billClean.setCarNum(billPcr.getCarNum());
                             }
+                            if (billPcr.getVistitType() == 5) {
+                                billClean.setResource(billPcr.getResource());
+                                billClean.setFeedImgUrl(billPcr.getFeedImgUrl());
+                                billClean.setRemark(billPcr.getRemark());
+                                billClean.setCleanName(billPcr.getCleanName());
+                                billClean.setCleanId(billPcr.getCleanId());
+                            }
                             pcrMapper.insert(billClean);
                         } else if (Integer.parseInt(split[1]) == 3) {
                             //新增洗澡
@@ -458,6 +472,13 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                             if (billPcr.getVistitType() != 0) {
                                 billClean.setCarNum(billPcr.getCarNum());
                             }
+                            if (billPcr.getVistitType() == 5) {
+                                billClean.setResource(billPcr.getResource());
+                                billClean.setFeedImgUrl(billPcr.getFeedImgUrl());
+                                billClean.setRemark(billPcr.getRemark());
+                                billClean.setCleanName(billPcr.getCleanName());
+                                billClean.setCleanId(billPcr.getCleanId());
+                            }
                             cleanMapper.insert(billClean);
                         } else if (Integer.parseInt(split[1]) == 4) {
                             //新增隔离
@@ -465,12 +486,26 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                             if (billPcr.getVistitType() != 0) {
                                 pcr.setCarNum(billPcr.getCarNum());
                             }
+                            if (billPcr.getVistitType() == 5) {
+                                pcr.setResource(billPcr.getResource());
+                                pcr.setFeedImgUrl(billPcr.getFeedImgUrl());
+                                pcr.setRemark(billPcr.getRemark());
+                                pcr.setCleanName(billPcr.getCleanName());
+                                pcr.setCleanId(billPcr.getCleanId());
+                            }
                             isolateMapper.insert(pcr);
                         } else if (Integer.parseInt(split[1]) == 5) {
                             BillDry billClean = (BillDry) entity;
                             if (billPcr.getVistitType() != 0) {
                                 billClean.setCarNum(billPcr.getCarNum());
                             }
+                            if (billPcr.getVistitType() == 5) {
+                                billClean.setResource(billPcr.getResource());
+                                billClean.setFeedImgUrl(billPcr.getFeedImgUrl());
+                                billClean.setRemark(billPcr.getRemark());
+                                billClean.setCleanName(billPcr.getCleanName());
+                                billClean.setCleanId(billPcr.getCleanId());
+                            }
                             dryMapper.insert(billClean);
                             //新增烘干
                         } else if (Integer.parseInt(split[1]) == 6) {
@@ -479,6 +514,13 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                             if (billPcr.getVistitType() != 0) {
                                 before.setCarNum(billPcr.getCarNum());
                             }
+                            if (billPcr.getVistitType() == 5) {
+                                before.setResource(billPcr.getResource());
+                                before.setFeedImgUrl(billPcr.getFeedImgUrl());
+                                before.setRemark(billPcr.getRemark());
+                                before.setCleanName(billPcr.getCleanName());
+                                before.setCleanId(billPcr.getCleanId());
+                            }
                             beforeMapper.insert(before);
                         }
                         else if (Integer.parseInt(split[1]) == 7) {
@@ -487,6 +529,13 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                             if (billPcr.getVistitType() != 0) {
                                 before.setCarNum(billPcr.getCarNum());
                             }
+                            if (billPcr.getVistitType() == 5) {
+                                before.setResource(billPcr.getResource());
+                                before.setFeedImgUrl(billPcr.getFeedImgUrl());
+                                before.setRemark(billPcr.getRemark());
+                                before.setCleanName(billPcr.getCleanName());
+                                before.setCleanId(billPcr.getCleanId());
+                            }
                             inventoryMapper.insert(before);
                         }
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + split[1]);
@@ -506,6 +555,13 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     if (billPcr.getVistitType() != 0) {
                         billSampling.setCarNum(billPcr.getCarNum());
                     }
+                    if (billPcr.getVistitType() == 5) {
+                        billSampling.setResource(billPcr.getResource());
+                        billSampling.setFeedImgUrl(billPcr.getFeedImgUrl());
+                        billSampling.setRemark(billPcr.getRemark());
+                        billSampling.setCleanName(billPcr.getCleanName());
+                        billSampling.setCleanId(billPcr.getCleanId());
+                    }
                     samplingMapper.insert(billSampling);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 } else if (nextId == 2) {
@@ -514,6 +570,13 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     if (billPcr.getVistitType() != 0) {
                         billClean.setCarNum(billPcr.getCarNum());
                     }
+                    if (billPcr.getVistitType() == 5) {
+                        billClean.setResource(billPcr.getResource());
+                        billClean.setFeedImgUrl(billPcr.getFeedImgUrl());
+                        billClean.setRemark(billPcr.getRemark());
+                        billClean.setCleanName(billPcr.getCleanName());
+                        billClean.setCleanId(billPcr.getCleanId());
+                    }
                     pcrMapper.insert(billClean);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 } else if (nextId == 3) {
@@ -522,6 +585,13 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     if (billPcr.getVistitType() != 0) {
                         billClean.setCarNum(billPcr.getCarNum());
                     }
+                    if (billPcr.getVistitType() == 5) {
+                        billClean.setResource(billPcr.getResource());
+                        billClean.setFeedImgUrl(billPcr.getFeedImgUrl());
+                        billClean.setRemark(billPcr.getRemark());
+                        billClean.setCleanName(billPcr.getCleanName());
+                        billClean.setCleanId(billPcr.getCleanId());
+                    }
                     cleanMapper.insert(billClean);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 } else if (nextId == 4) {
@@ -530,6 +600,13 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     if (billPcr.getVistitType() != 0) {
                         pcr.setCarNum(billPcr.getCarNum());
                     }
+                    if (billPcr.getVistitType() == 5) {
+                        pcr.setResource(billPcr.getResource());
+                        pcr.setFeedImgUrl(billPcr.getFeedImgUrl());
+                        pcr.setRemark(billPcr.getRemark());
+                        pcr.setCleanName(billPcr.getCleanName());
+                        pcr.setCleanId(billPcr.getCleanId());
+                    }
                     isolateMapper.insert(pcr);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 } else if (nextId == 5) {
@@ -537,6 +614,13 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     if (billPcr.getVistitType() != 0) {
                         billClean.setCarNum(billPcr.getCarNum());
                     }
+                    if (billPcr.getVistitType() == 5) {
+                        billClean.setResource(billPcr.getResource());
+                        billClean.setFeedImgUrl(billPcr.getFeedImgUrl());
+                        billClean.setRemark(billPcr.getRemark());
+                        billClean.setCleanName(billPcr.getCleanName());
+                        billClean.setCleanId(billPcr.getCleanId());
+                    }
                     dryMapper.insert(billClean);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                     //新增烘干
@@ -546,6 +630,13 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     if (billPcr.getVistitType() != 0) {
                         before.setCarNum(billPcr.getCarNum());
                     }
+                    if (billPcr.getVistitType() == 5) {
+                        before.setResource(billPcr.getResource());
+                        before.setFeedImgUrl(billPcr.getFeedImgUrl());
+                        before.setRemark(billPcr.getRemark());
+                        before.setCleanName(billPcr.getCleanName());
+                        before.setCleanId(billPcr.getCleanId());
+                    }
                     beforeMapper.insert(before);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }
@@ -555,6 +646,13 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     if (billPcr.getVistitType() != 0) {
                         before.setCarNum(billPcr.getCarNum());
                     }
+                    if (billPcr.getVistitType() == 5) {
+                        before.setResource(billPcr.getResource());
+                        before.setFeedImgUrl(billPcr.getFeedImgUrl());
+                        before.setRemark(billPcr.getRemark());
+                        before.setCleanName(billPcr.getCleanName());
+                        before.setCleanId(billPcr.getCleanId());
+                    }
                     inventoryMapper.insert(before);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }

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

@@ -1600,6 +1600,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     if (billIsolate.getVistitType() != 0) {
                         billSampling.setCarNum(billIsolate.getCarNum());
                     }
+                    if (billIsolate.getVistitType() == 5) {
+                        billSampling.setResource(billIsolate.getResource());
+                        billSampling.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                        billSampling.setRemark(billIsolate.getRemark());
+                        billSampling.setCleanName(billIsolate.getCleanName());
+                        billSampling.setCleanId(billIsolate.getCleanId());
+                    }
                     samplingMapper.insert(billSampling);
                 } else if (Integer.parseInt(splits[1]) == 2) {
                     //新增pcr
@@ -1607,6 +1614,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     if (billIsolate.getVistitType() != 0) {
                         billClean.setCarNum(billIsolate.getCarNum());
                     }
+                    if (billIsolate.getVistitType() == 5) {
+                        billClean.setResource(billIsolate.getResource());
+                        billClean.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                        billClean.setRemark(billIsolate.getRemark());
+                        billClean.setCleanName(billIsolate.getCleanName());
+                        billClean.setCleanId(billIsolate.getCleanId());
+                    }
                     pcrMapper.insert(billClean);
                 } else if (Integer.parseInt(splits[1]) == 3) {
                     //新增洗澡
@@ -1614,6 +1628,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     if (billIsolate.getVistitType() != 0) {
                         billClean.setCarNum(billIsolate.getCarNum());
                     }
+                    if (billIsolate.getVistitType() == 5) {
+                        billClean.setResource(billIsolate.getResource());
+                        billClean.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                        billClean.setRemark(billIsolate.getRemark());
+                        billClean.setCleanName(billIsolate.getCleanName());
+                        billClean.setCleanId(billIsolate.getCleanId());
+                    }
                     cleanMapper.insert(billClean);
                 } else if (Integer.parseInt(splits[1]) == 4) {
                     //新增隔离
@@ -1621,12 +1642,26 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     if (billIsolate.getVistitType() != 0) {
                         pcr.setCarNum(billIsolate.getCarNum());
                     }
+                    if (billIsolate.getVistitType() == 5) {
+                        pcr.setResource(billIsolate.getResource());
+                        pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                        pcr.setRemark(billIsolate.getRemark());
+                        pcr.setCleanName(billIsolate.getCleanName());
+                        pcr.setCleanId(billIsolate.getCleanId());
+                    }
                     isolateMapper.insert(pcr);
                 } else if (Integer.parseInt(splits[1]) == 5) {
                     BillDry billClean = (BillDry) entity;
                     if (billIsolate.getVistitType() != 0) {
                         billClean.setCarNum(billIsolate.getCarNum());
                     }
+                    if (billIsolate.getVistitType() == 5) {
+                        billClean.setResource(billIsolate.getResource());
+                        billClean.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                        billClean.setRemark(billIsolate.getRemark());
+                        billClean.setCleanName(billIsolate.getCleanName());
+                        billClean.setCleanId(billIsolate.getCleanId());
+                    }
                     dryMapper.insert(billClean);
                     //新增烘干
                 } else if (Integer.parseInt(splits[1]) == 6) {
@@ -1635,6 +1670,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     if (billIsolate.getVistitType() != 0) {
                         before.setCarNum(billIsolate.getCarNum());
                     }
+                    if (billIsolate.getVistitType() == 5) {
+                        before.setResource(billIsolate.getResource());
+                        before.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                        before.setRemark(billIsolate.getRemark());
+                        before.setCleanName(billIsolate.getCleanName());
+                        before.setCleanId(billIsolate.getCleanId());
+                    }
                     beforeMapper.insert(before);
                 }else if (Integer.parseInt(splits[1]) == 7) {
                     //新增洗澡前拍照
@@ -1642,6 +1684,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     if (billIsolate.getVistitType() != 0) {
                         before.setCarNum(billIsolate.getCarNum());
                     }
+                    if (billIsolate.getVistitType() == 5) {
+                        before.setResource(billIsolate.getResource());
+                        before.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                        before.setRemark(billIsolate.getRemark());
+                        before.setCleanName(billIsolate.getCleanName());
+                        before.setCleanId(billIsolate.getCleanId());
+                    }
                     inventoryMapper.insert(before);
                 }
                 baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
@@ -1661,6 +1710,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             if (billIsolate.getVistitType() != 0) {
                 billSampling.setCarNum(billIsolate.getCarNum());
             }
+            if (billIsolate.getVistitType() == 5) {
+                billSampling.setResource(billIsolate.getResource());
+                billSampling.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                billSampling.setRemark(billIsolate.getRemark());
+                billSampling.setCleanName(billIsolate.getCleanName());
+                billSampling.setCleanId(billIsolate.getCleanId());
+            }
             samplingMapper.insert(billSampling);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 2) {
@@ -1669,6 +1725,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             if (billIsolate.getVistitType() != 0) {
                 pcr.setCarNum(billIsolate.getCarNum());
             }
+            if (billIsolate.getVistitType() == 5) {
+                pcr.setResource(billIsolate.getResource());
+                pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                pcr.setRemark(billIsolate.getRemark());
+                pcr.setCleanName(billIsolate.getCleanName());
+                pcr.setCleanId(billIsolate.getCleanId());
+            }
             pcrMapper.insert(pcr);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 3) {
@@ -1677,6 +1740,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             if (billIsolate.getVistitType() != 0) {
                 pcr.setCarNum(billIsolate.getCarNum());
             }
+            if (billIsolate.getVistitType() == 5) {
+                pcr.setResource(billIsolate.getResource());
+                pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                pcr.setRemark(billIsolate.getRemark());
+                pcr.setCleanName(billIsolate.getCleanName());
+                pcr.setCleanId(billIsolate.getCleanId());
+            }
             cleanMapper.insert(pcr);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 4) {
@@ -1685,12 +1755,25 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             if (billIsolate.getVistitType() != 0) {
                 pcr.setCarNum(billIsolate.getCarNum());
             }
+            if (billIsolate.getVistitType() == 5) {
+                pcr.setResource(billIsolate.getResource());
+                pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                pcr.setRemark(billIsolate.getRemark());
+                pcr.setCleanName(billIsolate.getCleanName());
+                pcr.setCleanId(billIsolate.getCleanId());
+            }
             isolateMapper.insert(pcr);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 5) {
             BillDry pcr = (BillDry) newObject;
             if (billIsolate.getVistitType() != 0) {
                 pcr.setCarNum(billIsolate.getCarNum());
+            } if (billIsolate.getVistitType() == 5) {
+                pcr.setResource(billIsolate.getResource());
+                pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                pcr.setRemark(billIsolate.getRemark());
+                pcr.setCleanName(billIsolate.getCleanName());
+                pcr.setCleanId(billIsolate.getCleanId());
             }
             dryMapper.insert(pcr);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
@@ -1701,6 +1784,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             if (billIsolate.getVistitType() != 0) {
                 before.setCarNum(billIsolate.getCarNum());
             }
+            if (billIsolate.getVistitType() == 5) {
+                before.setResource(billIsolate.getResource());
+                before.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                before.setRemark(billIsolate.getRemark());
+                before.setCleanName(billIsolate.getCleanName());
+                before.setCleanId(billIsolate.getCleanId());
+            }
             beforeMapper.insert(before);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 7) {
@@ -1709,6 +1799,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             if (billIsolate.getVistitType() != 0) {
                 before.setCarNum(billIsolate.getCarNum());
             }
+            if (billIsolate.getVistitType() == 5) {
+                before.setResource(billIsolate.getResource());
+                before.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                before.setRemark(billIsolate.getRemark());
+                before.setCleanName(billIsolate.getCleanName());
+                before.setCleanId(billIsolate.getCleanId());
+            }
             inventoryMapper.insert(before);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }

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

@@ -202,6 +202,13 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                     if (sampling.getVistitType() != 0) {
                         billSampling.setCarNum(sampling.getCarNum());
                     }
+                    if (sampling.getVistitType() == 5) {
+                        billSampling.setResource(sampling.getResource());
+                        billSampling.setFeedImgUrl(sampling.getFeedImgUrl());
+                        billSampling.setRemark(sampling.getRemark());
+                        billSampling.setCleanName(sampling.getCleanName());
+                        billSampling.setCleanId(sampling.getCleanId());
+                    }
                     billSamplingMapper.insert(billSampling);
                 } else if (Integer.parseInt(split[1]) == 2) {
                     //新增pcr
@@ -209,6 +216,13 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                     if (sampling.getVistitType() != 0) {
                         billClean.setCarNum(sampling.getCarNum());
                     }
+                    if (sampling.getVistitType() == 5) {
+                        billClean.setResource(sampling.getResource());
+                        billClean.setFeedImgUrl(sampling.getFeedImgUrl());
+                        billClean.setRemark(sampling.getRemark());
+                        billClean.setCleanName(sampling.getCleanName());
+                        billClean.setCleanId(sampling.getCleanId());
+                    }
                     pcrMapper.insert(billClean);
                 } else if (Integer.parseInt(split[1]) == 3) {
                     //新增洗澡
@@ -216,6 +230,13 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                     if (sampling.getVistitType() != 0) {
                         billClean.setCarNum(sampling.getCarNum());
                     }
+                    if (sampling.getVistitType() == 5) {
+                        billClean.setResource(sampling.getResource());
+                        billClean.setFeedImgUrl(sampling.getFeedImgUrl());
+                        billClean.setRemark(sampling.getRemark());
+                        billClean.setCleanName(sampling.getCleanName());
+                        billClean.setCleanId(sampling.getCleanId());
+                    }
                     cleanMapper.insert(billClean);
                 } else if (Integer.parseInt(split[1]) == 4) {
                     //新增隔离
@@ -223,12 +244,26 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                     if (sampling.getVistitType() != 0) {
                         pcr.setCarNum(sampling.getCarNum());
                     }
+                    if (sampling.getVistitType() == 5) {
+                        pcr.setResource(sampling.getResource());
+                        pcr.setFeedImgUrl(sampling.getFeedImgUrl());
+                        pcr.setRemark(sampling.getRemark());
+                        pcr.setCleanName(sampling.getCleanName());
+                        pcr.setCleanId(sampling.getCleanId());
+                    }
                     isolateMapper.insert(pcr);
                 } else if (Integer.parseInt(split[1]) == 5) {
                     BillDry billClean = (BillDry) entity;
                     if (sampling.getVistitType() != 0) {
                         billClean.setCarNum(sampling.getCarNum());
                     }
+                    if (sampling.getVistitType() == 5) {
+                        billClean.setResource(sampling.getResource());
+                        billClean.setFeedImgUrl(sampling.getFeedImgUrl());
+                        billClean.setRemark(sampling.getRemark());
+                        billClean.setCleanName(sampling.getCleanName());
+                        billClean.setCleanId(sampling.getCleanId());
+                    }
                     dryMapper.insert(billClean);
                     //新增烘干
                 } else if (Integer.parseInt(split[1]) == 6) {
@@ -237,6 +272,13 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                     if (sampling.getVistitType() != 0) {
                         before.setCarNum(sampling.getCarNum());
                     }
+                    if (sampling.getVistitType() == 5) {
+                        before.setResource(sampling.getResource());
+                        before.setFeedImgUrl(sampling.getFeedImgUrl());
+                        before.setRemark(sampling.getRemark());
+                        before.setCleanName(sampling.getCleanName());
+                        before.setCleanId(sampling.getCleanId());
+                    }
                     billCleanBeforeMapper.insert(before);
                 }else if (Integer.parseInt(split[1]) == 7) {
                     //新增洗澡前拍照
@@ -244,6 +286,13 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                     if (sampling.getVistitType() != 0) {
                         before.setCarNum(sampling.getCarNum());
                     }
+                    if (sampling.getVistitType() == 5) {
+                        before.setResource(sampling.getResource());
+                        before.setFeedImgUrl(sampling.getFeedImgUrl());
+                        before.setRemark(sampling.getRemark());
+                        before.setCleanName(sampling.getCleanName());
+                        before.setCleanId(sampling.getCleanId());
+                    }
                     inventoryMapper.insert(before);
                 }
                 baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + split[1]);
@@ -263,6 +312,13 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
             if (sampling.getVistitType() != 0) {
                 billSampling.setCarNum(sampling.getCarNum());
             }
+            if (sampling.getVistitType() == 5) {
+                billSampling.setResource(sampling.getResource());
+                billSampling.setFeedImgUrl(sampling.getFeedImgUrl());
+                billSampling.setRemark(sampling.getRemark());
+                billSampling.setCleanName(sampling.getCleanName());
+                billSampling.setCleanId(sampling.getCleanId());
+            }
             billSamplingMapper.insert(billSampling);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 2) {
@@ -271,6 +327,13 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
             if (sampling.getVistitType() != 0) {
                 billClean.setCarNum(sampling.getCarNum());
             }
+            if (sampling.getVistitType() == 5) {
+                billClean.setResource(sampling.getResource());
+                billClean.setFeedImgUrl(sampling.getFeedImgUrl());
+                billClean.setRemark(sampling.getRemark());
+                billClean.setCleanName(sampling.getCleanName());
+                billClean.setCleanId(sampling.getCleanId());
+            }
             pcrMapper.insert(billClean);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 3) {
@@ -278,6 +341,12 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
             BillClean billClean = (BillClean) newObject;
             if (sampling.getVistitType() != 0) {
                 billClean.setCarNum(sampling.getCarNum());
+            }if (sampling.getVistitType() == 5) {
+                billClean.setResource(sampling.getResource());
+                billClean.setFeedImgUrl(sampling.getFeedImgUrl());
+                billClean.setRemark(sampling.getRemark());
+                billClean.setCleanName(sampling.getCleanName());
+                billClean.setCleanId(sampling.getCleanId());
             }
             cleanMapper.insert(billClean);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
@@ -287,6 +356,13 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
             if (sampling.getVistitType() != 0) {
                 pcr.setCarNum(sampling.getCarNum());
             }
+            if (sampling.getVistitType() == 5) {
+                pcr.setResource(sampling.getResource());
+                pcr.setFeedImgUrl(sampling.getFeedImgUrl());
+                pcr.setRemark(sampling.getRemark());
+                pcr.setCleanName(sampling.getCleanName());
+                pcr.setCleanId(sampling.getCleanId());
+            }
             isolateMapper.insert(pcr);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 5) {
@@ -294,6 +370,13 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
             if (sampling.getVistitType() != 0) {
                 billClean.setCarNum(sampling.getCarNum());
             }
+            if (sampling.getVistitType() == 5) {
+                billClean.setResource(sampling.getResource());
+                billClean.setFeedImgUrl(sampling.getFeedImgUrl());
+                billClean.setRemark(sampling.getRemark());
+                billClean.setCleanName(sampling.getCleanName());
+                billClean.setCleanId(sampling.getCleanId());
+            }
             dryMapper.insert(billClean);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
             //新增烘干
@@ -303,6 +386,13 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
             if (sampling.getVistitType() != 0) {
                 before.setCarNum(sampling.getCarNum());
             }
+            if (sampling.getVistitType() == 5) {
+                before.setResource(sampling.getResource());
+                before.setFeedImgUrl(sampling.getFeedImgUrl());
+                before.setRemark(sampling.getRemark());
+                before.setCleanName(sampling.getCleanName());
+                before.setCleanId(sampling.getCleanId());
+            }
             billCleanBeforeMapper.insert(before);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }
@@ -312,6 +402,13 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
             if (sampling.getVistitType() != 0) {
                 before.setCarNum(sampling.getCarNum());
             }
+            if (sampling.getVistitType() == 5) {
+                before.setResource(sampling.getResource());
+                before.setFeedImgUrl(sampling.getFeedImgUrl());
+                before.setRemark(sampling.getRemark());
+                before.setCleanName(sampling.getCleanName());
+                before.setCleanId(sampling.getCleanId());
+            }
             inventoryMapper.insert(before);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }

huimv-receive/src/main/java/com/huimv/receive/timer/SafeTimer.java

@@ -117,6 +117,13 @@ public class SafeTimer {
                             if (billIsolate.getVistitType() != 0) {
                                 billSampling.setCarNum(billIsolate.getCarNum());
                             }
+                            if (billIsolate.getVistitType() == 5) {
+                                billSampling.setResource(billIsolate.getResource());
+                                billSampling.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                                billSampling.setRemark(billIsolate.getRemark());
+                                billSampling.setCleanName(billIsolate.getCleanName());
+                                billSampling.setCleanId(billIsolate.getCleanId());
+                            }
                             samplingService.save(billSampling);
                         } else if (Integer.parseInt(splits[1]) == 2) {
                             //新增pcr
@@ -124,6 +131,13 @@ public class SafeTimer {
                             if (billIsolate.getVistitType() != 0) {
                                 billClean.setCarNum(billIsolate.getCarNum());
                             }
+                            if (billIsolate.getVistitType() == 5) {
+                                billClean.setResource(billIsolate.getResource());
+                                billClean.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                                billClean.setRemark(billIsolate.getRemark());
+                                billClean.setCleanName(billIsolate.getCleanName());
+                                billClean.setCleanId(billIsolate.getCleanId());
+                            }
                             pcrService.save(billClean);
                         } else if (Integer.parseInt(splits[1]) == 3) {
                             //新增洗澡
@@ -131,6 +145,13 @@ public class SafeTimer {
                             if (billIsolate.getVistitType() != 0) {
                                 billClean.setCarNum(billIsolate.getCarNum());
                             }
+                            if (billIsolate.getVistitType() == 5) {
+                                billClean.setResource(billIsolate.getResource());
+                                billClean.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                                billClean.setRemark(billIsolate.getRemark());
+                                billClean.setCleanName(billIsolate.getCleanName());
+                                billClean.setCleanId(billIsolate.getCleanId());
+                            }
                             cleanService.save(billClean);
                         } else if (Integer.parseInt(splits[1]) == 4) {
                             //新增隔离
@@ -138,12 +159,26 @@ public class SafeTimer {
                             if (billIsolate.getVistitType() != 0) {
                                 pcr.setCarNum(billIsolate.getCarNum());
                             }
+                            if (billIsolate.getVistitType() == 5) {
+                                pcr.setResource(billIsolate.getResource());
+                                pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                                pcr.setRemark(billIsolate.getRemark());
+                                pcr.setCleanName(billIsolate.getCleanName());
+                                pcr.setCleanId(billIsolate.getCleanId());
+                            }
                             isolateService.save(pcr);
                         } else if (Integer.parseInt(splits[1]) == 5) {
                             BillDry billClean = (BillDry) entity;
                             if (billIsolate.getVistitType() != 0) {
                                 billClean.setCarNum(billIsolate.getCarNum());
                             }
+                            if (billIsolate.getVistitType() == 5) {
+                                billClean.setResource(billIsolate.getResource());
+                                billClean.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                                billClean.setRemark(billIsolate.getRemark());
+                                billClean.setCleanName(billIsolate.getCleanName());
+                                billClean.setCleanId(billIsolate.getCleanId());
+                            }
                             dryService.save(billClean);
                             //新增烘干
                         } else if (Integer.parseInt(splits[1]) == 6) {
@@ -152,6 +187,13 @@ public class SafeTimer {
                             if (billIsolate.getVistitType() != 0) {
                                 before.setCarNum(billIsolate.getCarNum());
                             }
+                            if (billIsolate.getVistitType() == 5) {
+                                before.setResource(billIsolate.getResource());
+                                before.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                                before.setRemark(billIsolate.getRemark());
+                                before.setCleanName(billIsolate.getCleanName());
+                                before.setCleanId(billIsolate.getCleanId());
+                            }
                             beforeService.save(before);
                         } else if (Integer.parseInt(splits[1]) == 7) {
                             //新增洗澡前拍照
@@ -159,6 +201,13 @@ public class SafeTimer {
                             if (billIsolate.getVistitType() != 0) {
                                 before.setCarNum(billIsolate.getCarNum());
                             }
+                            if (billIsolate.getVistitType() == 5) {
+                                before.setResource(billIsolate.getResource());
+                                before.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                                before.setRemark(billIsolate.getRemark());
+                                before.setCleanName(billIsolate.getCleanName());
+                                before.setCleanId(billIsolate.getCleanId());
+                            }
                             inventoryService.save(before);
                         }
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
@@ -178,6 +227,14 @@ public class SafeTimer {
                     if (billIsolate.getVistitType() != 0) {
                         billSampling.setCarNum(billIsolate.getCarNum());
                     }
+                    if (billIsolate.getVistitType() == 5) {
+                        billSampling.setResource(billIsolate.getResource());
+                        billSampling.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                        billSampling.setRemark(billIsolate.getRemark());
+                        billSampling.setCleanName(billIsolate.getCleanName());
+                        billSampling.setCleanId(billIsolate.getCleanId());
+                    }
+
                     samplingService.save(billSampling);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 2) {
@@ -186,6 +243,13 @@ public class SafeTimer {
                     if (billIsolate.getVistitType() != 0) {
                         pcr.setCarNum(billIsolate.getCarNum());
                     }
+                    if (billIsolate.getVistitType() == 5) {
+                        pcr.setResource(billIsolate.getResource());
+                        pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                        pcr.setRemark(billIsolate.getRemark());
+                        pcr.setCleanName(billIsolate.getCleanName());
+                        pcr.setCleanId(billIsolate.getCleanId());
+                    }
                     pcrService.save(pcr);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 3) {
@@ -194,6 +258,13 @@ public class SafeTimer {
                     if (billIsolate.getVistitType() != 0) {
                         pcr.setCarNum(billIsolate.getCarNum());
                     }
+                    if (billIsolate.getVistitType() == 5) {
+                        pcr.setResource(billIsolate.getResource());
+                        pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                        pcr.setRemark(billIsolate.getRemark());
+                        pcr.setCleanName(billIsolate.getCleanName());
+                        pcr.setCleanId(billIsolate.getCleanId());
+                    }
                     cleanService.save(pcr);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 4) {
@@ -201,7 +272,14 @@ public class SafeTimer {
                     BillIsolate pcr = (BillIsolate) newObject;
                     if (billIsolate.getVistitType() != 0) {
                         pcr.setCarNum(billIsolate.getCarNum());
+                    }  if (billIsolate.getVistitType() == 5) {
+                        pcr.setResource(billIsolate.getResource());
+                        pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                        pcr.setRemark(billIsolate.getRemark());
+                        pcr.setCleanName(billIsolate.getCleanName());
+                        pcr.setCleanId(billIsolate.getCleanId());
                     }
+
                     isolateService.save(pcr);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 5) {
@@ -209,6 +287,13 @@ public class SafeTimer {
                     if (billIsolate.getVistitType() != 0) {
                         pcr.setCarNum(billIsolate.getCarNum());
                     }
+                    if (billIsolate.getVistitType() == 5) {
+                        pcr.setResource(billIsolate.getResource());
+                        pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                        pcr.setRemark(billIsolate.getRemark());
+                        pcr.setCleanName(billIsolate.getCleanName());
+                        pcr.setCleanId(billIsolate.getCleanId());
+                    }
                     dryService.save(pcr);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                     //新增烘干
@@ -218,6 +303,13 @@ public class SafeTimer {
                     if (billIsolate.getVistitType() != 0) {
                         before.setCarNum(billIsolate.getCarNum());
                     }
+                    if (billIsolate.getVistitType() == 5) {
+                        before.setResource(billIsolate.getResource());
+                        before.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                        before.setRemark(billIsolate.getRemark());
+                        before.setCleanName(billIsolate.getCleanName());
+                        before.setCleanId(billIsolate.getCleanId());
+                    }
                     beforeService.save(before);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 7) {
@@ -226,6 +318,13 @@ public class SafeTimer {
                     if (billIsolate.getVistitType() != 0) {
                         before.setCarNum(billIsolate.getCarNum());
                     }
+                    if (billIsolate.getVistitType() == 5) {
+                        before.setResource(billIsolate.getResource());
+                        before.setFeedImgUrl(billIsolate.getFeedImgUrl());
+                        before.setRemark(billIsolate.getRemark());
+                        before.setCleanName(billIsolate.getCleanName());
+                        before.setCleanId(billIsolate.getCleanId());
+                    }
                     inventoryService.save(before);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }

huimv-receive/src/main/resources/com/huimv/receive/mapper/BillCleanMapper.xml

@@ -70,6 +70,12 @@
         <foreach collection="status" item="statu" separator="," open="(" close=")">
             #{statu}
         </foreach>
+        union all
+        select *,3 AS 'type' from bill_goods_inventory where farm_id=#{farmId}
+        and status in
+        <foreach collection="status" item="statu" separator="," open="(" close=")">
+            #{statu}
+        </foreach>
         ORDER BY sub_date DESC
     </select>