船舶导入调整

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxShipOffshoreServiceImpl.java

@@ -119,16 +119,18 @@ public class ZhcxShipOffshoreServiceImpl extends ServiceImpl<ZhcxShipOffshoreDao
             }
             if(StringUtils.isNotBlank(machineno)){
                 ZhcxProjectDeviceNumberDo no = machineMap.get(prjcode + machineno);
-                if (no == null && StringUtils.isNotBlank(zhcxShipOffshoreVo.getProjectid())){
-                    LambdaQueryWrapper<ZhcxProjectDeviceNumberDo> wrapper = new LambdaQueryWrapper<>();
-                    wrapper.eq(ZhcxProjectDeviceNumberDo::getDeviceNumber,machineno);
-                    wrapper.eq(ZhcxProjectDeviceNumberDo::getPid,zhcxShipOffshoreVo.getProjectid());
-                    ZhcxProjectDeviceNumberDo one = zhcxProjectDeviceNumberService.getOne(wrapper);
-                    if (one == null) {
-                        errmsg.append("第").append(i+1).append("行机号不存在系统中，请确认;<br>");
-                    }else{
-                        machineMap.put(prjcode+machineno,one);
-                        zhcxShipOffshoreVo.setMachineid(one.getId());
+                if (no == null ){
+                    if (StringUtils.isNotBlank(zhcxShipOffshoreVo.getProjectid())) {
+                        LambdaQueryWrapper<ZhcxProjectDeviceNumberDo> wrapper = new LambdaQueryWrapper<>();
+                        wrapper.eq(ZhcxProjectDeviceNumberDo::getDeviceNumber,machineno);
+                        wrapper.eq(ZhcxProjectDeviceNumberDo::getPid,zhcxShipOffshoreVo.getProjectid());
+                        ZhcxProjectDeviceNumberDo one = zhcxProjectDeviceNumberService.getOne(wrapper);
+                        if (one == null) {
+                            errmsg.append("第").append(i+1).append("行机号不存在系统中，请确认;<br>");
+                        }else{
+                            machineMap.put(prjcode+machineno,one);
+                            zhcxShipOffshoreVo.setMachineid(one.getId());
+                        }
                     }
                 }else{
                     zhcxShipOffshoreVo.setMachineid(no.getId());