bug修复

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDeviceDeliveryServiceImpl.java

@@ -944,12 +944,26 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
         if (existDeviceDelivery.getStatus().name().equals(devicePlaceParam.getTransferStatus().name())) {
             //入库
             if (devicePlaceParam.getTransferStatus().equals(DeviceUseStatusEnum.IN)) {
+                //更新原始记录
+                this.update(new UpdateWrapper<TBDeviceDelivery>().lambda().set(TBDeviceDelivery::getUpdateId, userId)
+                        .set(TBDeviceDelivery::getUpdateTime, System.currentTimeMillis())
+                        .set(TBDeviceDelivery::getRemark, devicePlaceParam.getRemark())
+                        .set(TBDeviceDelivery::getMailType, devicePlaceParam.getTransferMode())
+                        .eq(TBDeviceDelivery::getId, existDeviceDelivery.getId()));
+                //更新入库记录
+                TBDeviceDelivery inDeviceDelivery = baseMapper.selectOne(
+                        new QueryWrapper<TBDeviceDelivery>().lambda().eq(TBDeviceDelivery::getCrmNo, existDeviceDelivery.getCrmNo())
+                                .eq(TBDeviceDelivery::getSerialNo, existDeviceDelivery.getSerialNo())
+                                .eq(TBDeviceDelivery::getDeliveryType, InOutTypeEnum.IN));
+                if (inDeviceDelivery == null) {
+                    throw ExceptionResultEnum.ERROR.exception(
+                            String.format("入库记录不存在,派单号:[%s],设备序列号:[%s]", existDeviceDelivery.getCrmNo(),
+                                    existDeviceDelivery.getSerialNo()));
+                }
                 this.update(
                         new UpdateWrapper<TBDeviceDelivery>().lambda().set(TBDeviceDelivery::getExpressNo, devicePlaceParam.getExpressNo())
                                 .set(TBDeviceDelivery::getUpdateId, userId).set(TBDeviceDelivery::getUpdateTime, System.currentTimeMillis())
-                                .set(TBDeviceDelivery::getRemark, devicePlaceParam.getRemark())
-                                .set(TBDeviceDelivery::getMailType, devicePlaceParam.getTransferMode())
-                                .eq(TBDeviceDelivery::getId, existDeviceDelivery.getId()));
+                                .eq(TBDeviceDelivery::getId, inDeviceDelivery.getId()));
             }
             //中转
             if (devicePlaceParam.getTransferStatus().equals(DeviceUseStatusEnum.TRANSFER)) {