物资车入场申请

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

@@ -505,6 +505,21 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())){
                         billSampling.setCarNum(billPersonnelAdmission.getCarNum());
                     }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getResource())){
+                        billSampling.setResource(billPersonnelAdmission.getResource());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getFeedImgUrl())){
+                        billSampling.setFeedImgUrl(billPersonnelAdmission.getFeedImgUrl());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getRemark())){
+                        billSampling.setRemark(billPersonnelAdmission.getRemark());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCleanId())){
+                        billSampling.setCleanId(billPersonnelAdmission.getCleanId());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCleanName())){
+                        billSampling.setCleanName(billPersonnelAdmission.getCleanName());
+                    }
                     billSamplingMapper.insert(billSampling);
                 }else if (Integer.valueOf(nextFlowId) == 2){
                     BillPcr billPcr = (BillPcr) flowUtil.getEntity(Integer.valueOf(nextFlowId),
@@ -524,6 +539,21 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())){
                         billPcr.setCarNum(billPersonnelAdmission.getCarNum());
                     }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getResource())){
+                        billPcr.setResource(billPersonnelAdmission.getResource());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getFeedImgUrl())){
+                        billPcr.setFeedImgUrl(billPersonnelAdmission.getFeedImgUrl());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getRemark())){
+                        billPcr.setRemark(billPersonnelAdmission.getRemark());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCleanId())){
+                        billPcr.setCleanId(billPersonnelAdmission.getCleanId());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCleanName())){
+                        billPcr.setCleanName(billPersonnelAdmission.getCleanName());
+                    }
                     pcrMapper.insert(billPcr);
                 }else if (Integer.valueOf(nextFlowId) == 3){
                     BillClean billClean = (BillClean) flowUtil.getEntity(Integer.valueOf(nextFlowId),
@@ -543,6 +573,21 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())){
                         billClean.setCarNum(billPersonnelAdmission.getCarNum());
                     }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getResource())){
+                        billClean.setResource(billPersonnelAdmission.getResource());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getFeedImgUrl())){
+                        billClean.setFeedImgUrl(billPersonnelAdmission.getFeedImgUrl());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getRemark())){
+                        billClean.setRemark(billPersonnelAdmission.getRemark());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCleanId())){
+                        billClean.setCleanId(billPersonnelAdmission.getCleanId());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCleanName())){
+                        billClean.setCleanName(billPersonnelAdmission.getCleanName());
+                    }
                     cleanMapper.insert(billClean);
                 }else if (Integer.valueOf(nextFlowId) == 4){
                     BillIsolate billIsolate = (BillIsolate) flowUtil.getEntity(Integer.valueOf(nextFlowId),
@@ -559,6 +604,24 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                             baseProcess.getId(),
                             billPersonnelAdmission.getDepartureName(),
                             billPersonnelAdmission.getDepartureId());
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())){
+                        billIsolate.setCarNum(billPersonnelAdmission.getCarNum());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getResource())){
+                        billIsolate.setResource(billPersonnelAdmission.getResource());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getFeedImgUrl())){
+                        billIsolate.setFeedImgUrl(billPersonnelAdmission.getFeedImgUrl());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getRemark())){
+                        billIsolate.setRemark(billPersonnelAdmission.getRemark());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCleanId())){
+                        billIsolate.setCleanId(billPersonnelAdmission.getCleanId());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCleanName())){
+                        billIsolate.setCleanName(billPersonnelAdmission.getCleanName());
+                    }
                     billIsolateMapper.insert(billIsolate);
                 }else if (Integer.valueOf(nextFlowId) == 5){
                     BillDry billDry = (BillDry) flowUtil.getEntity(Integer.valueOf(nextFlowId),
@@ -575,8 +638,26 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                             baseProcess.getId(),
                             billPersonnelAdmission.getDepartureName(),
                             billPersonnelAdmission.getDepartureId());
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())){
+                        billDry.setCarNum(billPersonnelAdmission.getCarNum());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getResource())){
+                        billDry.setResource(billPersonnelAdmission.getResource());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getFeedImgUrl())){
+                        billDry.setFeedImgUrl(billPersonnelAdmission.getFeedImgUrl());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getRemark())){
+                        billDry.setRemark(billPersonnelAdmission.getRemark());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCleanId())){
+                        billDry.setCleanId(billPersonnelAdmission.getCleanId());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCleanName())){
+                        billDry.setCleanName(billPersonnelAdmission.getCleanName());
+                    }
                     dryMapper.insert(billDry);
-                }else {
+                }else if (Integer.valueOf(nextFlowId) == 6){
                     BillCleanBefore billCleanBefore = (BillCleanBefore) flowUtil.getEntity(Integer.valueOf(nextFlowId),
                             billPersonnelAdmission.getVistitType(),
                             billPersonnelAdmission.getDestName(),
@@ -594,7 +675,56 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())){
                         billCleanBefore.setCarNum(billPersonnelAdmission.getCarNum());
                     }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getResource())){
+                        billCleanBefore.setResource(billPersonnelAdmission.getResource());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getFeedImgUrl())){
+                        billCleanBefore.setFeedImgUrl(billPersonnelAdmission.getFeedImgUrl());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getRemark())){
+                        billCleanBefore.setRemark(billPersonnelAdmission.getRemark());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCleanId())){
+                        billCleanBefore.setCleanId(billPersonnelAdmission.getCleanId());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCleanName())){
+                        billCleanBefore.setCleanName(billPersonnelAdmission.getCleanName());
+                    }
                     billCleanBeforeMapper.insert(billCleanBefore);
+                }else {
+                    BillGoodsInventory billCleanBefore = (BillGoodsInventory) flowUtil.getEntity(Integer.valueOf(nextFlowId),
+                            billPersonnelAdmission.getVistitType(),
+                            billPersonnelAdmission.getDestName(),
+                            billPersonnelAdmission.getDestId(),
+                            billPersonnelAdmission.getAdmissionUserId(),
+                            billPersonnelAdmission.getAdmissionUserName(),
+                            billPersonnelAdmission.getPhone(),
+                            billPersonnelAdmission.getVistitDate(),
+                            baseLocation.getId(),
+                            baseLocation.getLocationName(),
+                            billPersonnelAdmission.getFarmId(),
+                            baseProcess.getId(),
+                            billPersonnelAdmission.getDepartureName(),
+                            billPersonnelAdmission.getDepartureId());
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())){
+                        billCleanBefore.setCarNum(billPersonnelAdmission.getCarNum());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getResource())){
+                        billCleanBefore.setResource(billPersonnelAdmission.getResource());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getFeedImgUrl())){
+                        billCleanBefore.setFeedImgUrl(billPersonnelAdmission.getFeedImgUrl());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getRemark())){
+                        billCleanBefore.setRemark(billPersonnelAdmission.getRemark());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCleanId())){
+                        billCleanBefore.setCleanId(billPersonnelAdmission.getCleanId());
+                    }
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCleanName())){
+                        billCleanBefore.setCleanName(billPersonnelAdmission.getCleanName());
+                    }
+                    billGoodsInventoryMapper.insert(billCleanBefore);
                 }
             } else {
                 baseProcess.setCurrentStatus("1");