接口修改

huimv-receive/src/main/java/com/huimv/receive/controller/BillPersonnelAdmissionController.java

@@ -87,8 +87,8 @@ public class BillPersonnelAdmissionController {
                                    @RequestParam("farmId") String farmId,
                                    @RequestParam("resource") String resource,
                                    @RequestParam("feedImgUrl") MultipartFile feedImgUrl,
-                                   @RequestParam("cleanId") Integer cleanId,
-                                   @RequestParam("cleanName") String cleanName,
+                                   @RequestParam(value = "cleanId", required = false) Integer cleanId,
+                                   @RequestParam(value = "cleanName", required = false) String cleanName,
                                    @RequestParam("remark") String remark) throws IOException {
         return billPersonnelAdmissionService.addAdmissionFeed(httpServletRequest, admissionType,
                 vistitType, userName, phone, workName, papersType, papersCode, imgUrl, img, vistitDate, vistitReson, destId

huimv-receive/src/main/java/com/huimv/receive/controller/LoginController.java

@@ -107,7 +107,7 @@ public class LoginController {
             accessToken.setCreated(new Date());
             accessToken.setAccountName(accountName);
             accessToken.setFarmId(accountEntity.getFarmIds());
-            String token = TokenSign.sign(accountName, id, accountEntity.getFarmIds(), null, null);
+            String token = TokenSign.sign(accountName, id, accountEntity.getLastFarmId().toString(), null, null);
             accessToken.setToken(token);
 
             accessToken.setId(id);

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

@@ -8,12 +8,14 @@ import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.entity.BaseVisiting;
 import com.huimv.receive.entity.BaseWashoutPoint;
+import com.huimv.receive.entity.SysAccountMultilevel;
 import com.huimv.receive.entity.dto.GetFlowListDto;
 import com.huimv.receive.entity.dto.GetWashoutPointDto;
 import com.huimv.receive.entity.dto.WashListDto;
 import com.huimv.receive.entity.vo.DestVo;
 import com.huimv.receive.mapper.BaseVisitingMapper;
 import com.huimv.receive.mapper.BaseWashoutPointMapper;
+import com.huimv.receive.mapper.SysAccountMultilevelMapper;
 import com.huimv.receive.service.IBaseWashoutPointService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +42,8 @@ public class BaseWashoutPointServiceImpl extends ServiceImpl<BaseWashoutPointMap
     private BaseWashoutPointMapper washoutPointMapper;
     @Autowired
     private BaseVisitingMapper visitingMapper;
+    @Autowired
+    private SysAccountMultilevelMapper accountMultilevelMapper;
 
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -77,7 +81,9 @@ public class BaseWashoutPointServiceImpl extends ServiceImpl<BaseWashoutPointMap
 
     @Override
     public Result add(HttpServletRequest httpServletRequest, List<GetWashoutPointDto> washoutPointDtos) {
-        String farmIds = TokenSign.getFarmIds(httpServletRequest);
+        Integer id = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        SysAccountMultilevel multilevel = accountMultilevelMapper.selectById(id);
+        String farmIds = multilevel.getLastFarmId().toString();
         //访问类型集合
         QueryWrapper<BaseWashoutPoint> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_ids",farmIds);

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

@@ -206,8 +206,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                         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) {
@@ -220,8 +218,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                         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) {
@@ -234,8 +230,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                         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) {
@@ -248,8 +242,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                         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) {
@@ -261,8 +253,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                         billClean.setResource(cleanBefore.getResource());
                         billClean.setFeedImgUrl(cleanBefore.getFeedImgUrl());
                         billClean.setRemark(cleanBefore.getRemark());
-                        billClean.setCleanName(cleanBefore.getCleanName());
-                        billClean.setCleanId(cleanBefore.getCleanId());
                     }
                     dryMapper.insert(billClean);
                     //新增烘干
@@ -276,8 +266,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                         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) {
@@ -290,8 +278,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                         before.setResource(cleanBefore.getResource());
                         before.setFeedImgUrl(cleanBefore.getFeedImgUrl());
                         before.setRemark(cleanBefore.getRemark());
-                        before.setCleanName(cleanBefore.getCleanName());
-                        before.setCleanId(cleanBefore.getCleanId());
                     }
                     inventoryMapper.insert(before);
                 }
@@ -316,8 +302,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                 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);
@@ -331,8 +315,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                 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);
@@ -346,8 +328,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                 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);
@@ -361,8 +341,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                 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);
@@ -375,8 +353,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                 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);
@@ -391,8 +367,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                 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);
@@ -407,8 +381,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                 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

@@ -947,8 +947,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 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) {
@@ -961,8 +959,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 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) {
@@ -975,8 +971,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 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) {
@@ -989,8 +983,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 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) {
@@ -1002,8 +994,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 billClean1.setResource(billClean.getResource());
                                 billClean1.setFeedImgUrl(billClean.getFeedImgUrl());
                                 billClean1.setRemark(billClean.getRemark());
-                                billClean1.setCleanName(billClean.getCleanName());
-                                billClean1.setCleanId(billClean.getCleanId());
                             }
                             dryMapper.insert(billClean1);
                             //新增烘干
@@ -1017,8 +1007,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 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) {
@@ -1031,8 +1019,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 before.setResource(billClean.getResource());
                                 before.setFeedImgUrl(billClean.getFeedImgUrl());
                                 before.setRemark(billClean.getRemark());
-                                before.setCleanName(billClean.getCleanName());
-                                before.setCleanId(billClean.getCleanId());
                             }
                             inventoryMapper.insert(before);
                         }
@@ -1057,8 +1043,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         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);
@@ -1072,8 +1056,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         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);
@@ -1087,8 +1069,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         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);
@@ -1102,8 +1082,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         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);
@@ -1116,8 +1094,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         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);
@@ -1132,8 +1108,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         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);
@@ -1147,8 +1121,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         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);
@@ -1267,8 +1239,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                     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) {
@@ -1281,8 +1251,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                     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) {
@@ -1295,8 +1263,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                     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) {
@@ -1309,8 +1275,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                     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) {
@@ -1322,8 +1286,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                     billClean1.setResource(billClean.getResource());
                                     billClean1.setFeedImgUrl(billClean.getFeedImgUrl());
                                     billClean1.setRemark(billClean.getRemark());
-                                    billClean1.setCleanName(billClean.getCleanName());
-                                    billClean1.setCleanId(billClean.getCleanId());
                                 }
                                 dryMapper.insert(billClean1);
                                 //新增烘干
@@ -1337,8 +1299,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                     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) {
@@ -1351,8 +1311,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                     before.setResource(billClean.getResource());
                                     before.setFeedImgUrl(billClean.getFeedImgUrl());
                                     before.setRemark(billClean.getRemark());
-                                    before.setCleanName(billClean.getCleanName());
-                                    before.setCleanId(billClean.getCleanId());
                                 }
                                 inventoryMapper.insert(before);
                             }
@@ -1377,8 +1335,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             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);
@@ -1392,8 +1348,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             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);
@@ -1407,8 +1361,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             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);
@@ -1422,8 +1374,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             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);
@@ -1436,8 +1386,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             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);
@@ -1452,8 +1400,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             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);
@@ -1467,8 +1413,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             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

@@ -159,8 +159,6 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                         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) {
@@ -173,8 +171,6 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                         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) {
@@ -187,8 +183,6 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                         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) {
@@ -201,8 +195,6 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                         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) {
@@ -214,8 +206,6 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                         billClean.setResource(goodsInventory.getResource());
                         billClean.setFeedImgUrl(goodsInventory.getFeedImgUrl());
                         billClean.setRemark(goodsInventory.getRemark());
-                        billClean.setCleanName(goodsInventory.getCleanName());
-                        billClean.setCleanId(goodsInventory.getCleanId());
                     }
                     dryMapper.insert(billClean);
                     //新增烘干
@@ -229,8 +219,6 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                         before.setResource(goodsInventory.getResource());
                         before.setFeedImgUrl(goodsInventory.getFeedImgUrl());
                         before.setRemark(goodsInventory.getRemark());
-                        before.setCleanName(goodsInventory.getCleanName());
-                        before.setCleanId(goodsInventory.getCleanId());
                     }
                     billCleanBeforeMapper.insert(before);
                 }
@@ -244,8 +232,6 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                         before.setResource(goodsInventory.getResource());
                         before.setFeedImgUrl(goodsInventory.getFeedImgUrl());
                         before.setRemark(goodsInventory.getRemark());
-                        before.setCleanName(goodsInventory.getCleanName());
-                        before.setCleanId(goodsInventory.getCleanId());
                     }
                     inventoryMapper.insert(before);
                 }
@@ -270,8 +256,6 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                 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);
@@ -285,8 +269,6 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                 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);
@@ -300,8 +282,6 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                 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);
@@ -315,8 +295,6 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                 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);
@@ -329,8 +307,6 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                 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);
@@ -345,8 +321,6 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                 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);
@@ -361,8 +335,6 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                 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

@@ -451,8 +451,6 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                                 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) {
@@ -465,8 +463,6 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                                 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) {
@@ -479,8 +475,6 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                                 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) {
@@ -493,8 +487,6 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                                 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) {
@@ -506,8 +498,6 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                                 billClean.setResource(billPcr.getResource());
                                 billClean.setFeedImgUrl(billPcr.getFeedImgUrl());
                                 billClean.setRemark(billPcr.getRemark());
-                                billClean.setCleanName(billPcr.getCleanName());
-                                billClean.setCleanId(billPcr.getCleanId());
                             }
                             dryMapper.insert(billClean);
                             //新增烘干
@@ -521,8 +511,6 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                                 before.setResource(billPcr.getResource());
                                 before.setFeedImgUrl(billPcr.getFeedImgUrl());
                                 before.setRemark(billPcr.getRemark());
-                                before.setCleanName(billPcr.getCleanName());
-                                before.setCleanId(billPcr.getCleanId());
                             }
                             beforeMapper.insert(before);
                         }
@@ -536,8 +524,6 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                                 before.setResource(billPcr.getResource());
                                 before.setFeedImgUrl(billPcr.getFeedImgUrl());
                                 before.setRemark(billPcr.getRemark());
-                                before.setCleanName(billPcr.getCleanName());
-                                before.setCleanId(billPcr.getCleanId());
                             }
                             inventoryMapper.insert(before);
                         }
@@ -562,8 +548,6 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         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);
@@ -577,8 +561,6 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         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);
@@ -592,8 +574,6 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         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);
@@ -607,8 +587,6 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         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);
@@ -621,8 +599,6 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         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);
@@ -637,8 +613,6 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         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);
@@ -653,8 +627,6 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         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

@@ -1607,8 +1607,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         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) {
@@ -1621,8 +1619,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         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) {
@@ -1635,8 +1631,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         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) {
@@ -1649,8 +1643,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         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) {
@@ -1662,8 +1654,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         billClean.setResource(billIsolate.getResource());
                         billClean.setFeedImgUrl(billIsolate.getFeedImgUrl());
                         billClean.setRemark(billIsolate.getRemark());
-                        billClean.setCleanName(billIsolate.getCleanName());
-                        billClean.setCleanId(billIsolate.getCleanId());
                     }
                     dryMapper.insert(billClean);
                     //新增烘干
@@ -1677,8 +1667,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         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) {
@@ -1691,8 +1679,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         before.setResource(billIsolate.getResource());
                         before.setFeedImgUrl(billIsolate.getFeedImgUrl());
                         before.setRemark(billIsolate.getRemark());
-                        before.setCleanName(billIsolate.getCleanName());
-                        before.setCleanId(billIsolate.getCleanId());
                     }
                     inventoryMapper.insert(before);
                 }
@@ -1717,8 +1703,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 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);
@@ -1732,8 +1716,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 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);
@@ -1747,8 +1729,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 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);
@@ -1762,8 +1742,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 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);
@@ -1775,8 +1753,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 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);
@@ -1791,8 +1767,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 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);
@@ -1806,8 +1780,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 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

@@ -209,8 +209,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                         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) {
@@ -223,8 +221,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                         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) {
@@ -237,8 +233,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                         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) {
@@ -251,8 +245,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                         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) {
@@ -264,8 +256,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                         billClean.setResource(sampling.getResource());
                         billClean.setFeedImgUrl(sampling.getFeedImgUrl());
                         billClean.setRemark(sampling.getRemark());
-                        billClean.setCleanName(sampling.getCleanName());
-                        billClean.setCleanId(sampling.getCleanId());
                     }
                     dryMapper.insert(billClean);
                     //新增烘干
@@ -279,8 +269,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                         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) {
@@ -293,8 +281,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                         before.setResource(sampling.getResource());
                         before.setFeedImgUrl(sampling.getFeedImgUrl());
                         before.setRemark(sampling.getRemark());
-                        before.setCleanName(sampling.getCleanName());
-                        before.setCleanId(sampling.getCleanId());
                     }
                     inventoryMapper.insert(before);
                 }
@@ -319,8 +305,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                 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);
@@ -334,8 +318,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                 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);
@@ -348,8 +330,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                 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);
@@ -363,8 +343,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                 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);
@@ -377,8 +355,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                 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);
@@ -393,8 +369,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                 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);
@@ -409,8 +383,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                 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

@@ -121,8 +121,6 @@ public class SafeTimer {
                                 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) {
@@ -135,8 +133,6 @@ public class SafeTimer {
                                 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) {
@@ -149,8 +145,6 @@ public class SafeTimer {
                                 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) {
@@ -163,8 +157,6 @@ public class SafeTimer {
                                 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) {
@@ -176,8 +168,6 @@ public class SafeTimer {
                                 billClean.setResource(billIsolate.getResource());
                                 billClean.setFeedImgUrl(billIsolate.getFeedImgUrl());
                                 billClean.setRemark(billIsolate.getRemark());
-                                billClean.setCleanName(billIsolate.getCleanName());
-                                billClean.setCleanId(billIsolate.getCleanId());
                             }
                             dryService.save(billClean);
                             //新增烘干
@@ -191,8 +181,6 @@ public class SafeTimer {
                                 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) {
@@ -205,8 +193,6 @@ public class SafeTimer {
                                 before.setResource(billIsolate.getResource());
                                 before.setFeedImgUrl(billIsolate.getFeedImgUrl());
                                 before.setRemark(billIsolate.getRemark());
-                                before.setCleanName(billIsolate.getCleanName());
-                                before.setCleanId(billIsolate.getCleanId());
                             }
                             inventoryService.save(before);
                         }
@@ -231,8 +217,6 @@ public class SafeTimer {
                         billSampling.setResource(billIsolate.getResource());
                         billSampling.setFeedImgUrl(billIsolate.getFeedImgUrl());
                         billSampling.setRemark(billIsolate.getRemark());
-                        billSampling.setCleanName(billIsolate.getCleanName());
-                        billSampling.setCleanId(billIsolate.getCleanId());
                     }
 
                     samplingService.save(billSampling);
@@ -247,8 +231,6 @@ public class SafeTimer {
                         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);
@@ -262,8 +244,6 @@ public class SafeTimer {
                         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);
@@ -276,8 +256,6 @@ public class SafeTimer {
                         pcr.setResource(billIsolate.getResource());
                         pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
                         pcr.setRemark(billIsolate.getRemark());
-                        pcr.setCleanName(billIsolate.getCleanName());
-                        pcr.setCleanId(billIsolate.getCleanId());
                     }
 
                     isolateService.save(pcr);
@@ -291,8 +269,6 @@ public class SafeTimer {
                         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);
@@ -307,8 +283,6 @@ public class SafeTimer {
                         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);
@@ -322,8 +296,6 @@ public class SafeTimer {
                         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);