|
|
@ -111,7 +111,6 @@ public class IotDeviceInventoryService extends BaseJpaService<IotDeviceInventory
|
|
|
Integer type = deviceInventoryLogDO.getType();//调拨类型（1入库 2设备调拨出库 3核销出库）
|
|
|
|
|
|
if (type == 1) {
|
|
|
deviceDO = iotDeviceDao.findByDeviceSn(deviceSn);
|
|
|
deviceDO.setSaasId(getCode());
|
|
|
deviceDO.setProductId(jsonObject.getString("productId"));
|
|
|
deviceDO.setName(jsonObject.getString("name"));
|
|
|
@ -119,7 +118,6 @@ public class IotDeviceInventoryService extends BaseJpaService<IotDeviceInventory
|
|
|
deviceDO.setCategoryName(jsonObject.getString("categoryName"));
|
|
|
deviceDO.setManufacturerId(jsonObject.getString("manufacturerId"));
|
|
|
deviceDO.setManufacturerName(jsonObject.getString("manufacturerName"));
|
|
|
deviceDO.setIsGrant(0);//入库代表未发放
|
|
|
} else {//设备出库，更换相关信息
|
|
|
deviceDO = iotDeviceDao.findByDeviceSn(deviceSn);
|
|
|
if (type == 3) {
|
