|
@ -110,7 +110,7 @@ public class IotDeviceInventoryService extends BaseJpaService<IotDeviceInventory
|
|
String deviceSn = deviceDO.getDeviceSn();
|
|
String deviceSn = deviceDO.getDeviceSn();
|
|
Integer type = deviceInventoryLogDO.getType();//调拨类型(1入库 2设备调拨出库 3核销出库)
|
|
Integer type = deviceInventoryLogDO.getType();//调拨类型(1入库 2设备调拨出库 3核销出库)
|
|
|
|
|
|
if (type.equals("1")) {
|
|
|
|
|
|
if (type == 1) {
|
|
deviceDO.setSaasId(getCode());
|
|
deviceDO.setSaasId(getCode());
|
|
deviceDO.setProductId(jsonObject.getString("productId"));
|
|
deviceDO.setProductId(jsonObject.getString("productId"));
|
|
deviceDO.setName(jsonObject.getString("name"));
|
|
deviceDO.setName(jsonObject.getString("name"));
|
|
@ -120,7 +120,7 @@ public class IotDeviceInventoryService extends BaseJpaService<IotDeviceInventory
|
|
deviceDO.setManufacturerName(jsonObject.getString("manufacturerName"));
|
|
deviceDO.setManufacturerName(jsonObject.getString("manufacturerName"));
|
|
} else {//设备出库,更换相关信息
|
|
} else {//设备出库,更换相关信息
|
|
deviceDO = iotDeviceDao.findByDeviceSn(deviceSn);
|
|
deviceDO = iotDeviceDao.findByDeviceSn(deviceSn);
|
|
if (type.equals("3")) {
|
|
|
|
|
|
if (type == 3) {
|
|
deviceDO.setDel(0);
|
|
deviceDO.setDel(0);
|
|
deviceDO.setStatus("2");
|
|
deviceDO.setStatus("2");
|
|
deviceDO.setInventoryLogId(deviceInventoryLogDO.getId());
|
|
deviceDO.setInventoryLogId(deviceInventoryLogDO.getId());
|