欠款开票

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -364,8 +364,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillApplicationDetailsVo> finBillApplicationVos = baseMapper.selectByContractNo(contractNo);
         if (finBillApplicationVos != null && finBillApplicationVos.size() > 0) {
             FinBillApplicationDetailsVo finBillApplicationVo = finBillApplicationVos.get(0);
+            if (StringUtils.isNotBlank(finBillApplicationVo.getOneBillMoney())){
                 entity.setOneBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney()));
             }
+        }
         FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo();
         BeanUtil.copyProperties(entity, vo);
         List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -199,20 +199,6 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
     @Transactional(rollbackFor = Exception.class)
     public ResultBean<String> saveOrUpdateApplyInBound(ScmApplyInboundDto dto) {
         List<ScmFileDto> scmFiles = dto.getScmFiles();
-        List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
-        if (vehicleList.size() == 0) {
-            return new ResultBean().fail().setMsg("车辆列表不能为空");
-        }
-        for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
-            String vinNo = scmApplyInboundVehicleDto.getVinNo();
-            vinNo = vinNo.trim();
-            vinNo = vinNo.replace(" ","");
-            if (vinNo.length() != 17){
-                if (vinNo.length() != 8){
-                    return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo()+"车架号输入不正确");
-                }
-            }
-        }
         String orgPath = "";
         if (StringUtils.isNotBlank(dto.getOrgPath())) {
             orgPath = dto.getOrgPath();
@@ -262,6 +248,22 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             if (StringUtils.isBlank(dto.getDepartureDate())) {
                 return new ResultBean().fail().setMsg("请填写厂家发车日期");
             }
+            List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
+            if (vehicleList == null) {
+                return new ResultBean().fail().setMsg("车辆列表不能为空");
+            }
+            for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
+                if (StringUtils.isNotBlank(scmApplyInboundVehicleDto.getVinNo())) {
+                    String vinNo = scmApplyInboundVehicleDto.getVinNo();
+                    vinNo = vinNo.trim();
+                    vinNo = vinNo.replace(" ", "");
+                    if (vinNo.length() != 17) {
+                        if (vinNo.length() != 8) {
+                            return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "车架号输入不正确");
+                        }
+                    }
+                }
+            }
             List<String> vinNoList = vehicleList.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList());
             // 采购订单下线日期一旦维护，二次确认，则不能修改   TODO
             // 验证填写的车架号是否重复

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -551,12 +551,16 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         if (StringUtils.isBlank(dto.getInboundDate())) {
             return rb.setMsg("厂家入库日期不能为空");
         }
+        if (StringUtils.isNotBlank(dto.getVin())){
             String vinNo = dto.getVin();
             vinNo = vinNo.trim();
             vinNo = vinNo.replace(" ", "");
-        if (vinNo.length() != 17 || vinNo.length() != 8) {
+            if (vinNo.length() != 17) {
+                if (vinNo.length() != 8){
                     return new ResultBean().fail().setMsg(dto.getVin() + "车架号输入不正确");
                 }
+            }
+        }
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
         SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData();
         String s1 = "";