|
@ -5062,19 +5062,7 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
//更改货道容量-end
|
|
|
//下架药品
|
|
|
if (org.apache.commons.lang3.StringUtils.isNoneBlank(status)){
|
|
|
//下架时,清空库存
|
|
|
if ("0".equals(status)) {
|
|
|
inventory.setQty("0");
|
|
|
inventoryDO.setQty(0);
|
|
|
inventory.setOrgCode(null);
|
|
|
inventory.setDrugCode(null);
|
|
|
inventory.setDrugId(null);
|
|
|
inventory.setDrugName(null);
|
|
|
inventory.setPrice(null);
|
|
|
//设置额定库存
|
|
|
inventory.setRatedInventory(0);
|
|
|
}
|
|
|
inventory.setShelfStatus(status);
|
|
|
|
|
|
MedicineDrugInventoryRecord inventoryRecord = new MedicineDrugInventoryRecord();
|
|
|
inventoryRecord.setDeviceId(inventory.getIdDevice());
|
|
|
inventoryRecord.setEquNum(inventory.getEquNum());
|
|
@ -5089,6 +5077,21 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
inventoryRecord.setCreateUser(userId);
|
|
|
inventoryRecord.setType("4");
|
|
|
inventoryRecordDao.save(inventoryRecord);
|
|
|
|
|
|
//下架时,清空库存
|
|
|
if ("0".equals(status)) {
|
|
|
inventory.setQty("0");
|
|
|
inventoryDO.setQty(0);
|
|
|
inventory.setOrgCode(null);
|
|
|
inventory.setDrugCode(null);
|
|
|
inventory.setDrugId(null);
|
|
|
inventory.setDrugName(null);
|
|
|
inventory.setPrice(null);
|
|
|
//设置额定库存
|
|
|
inventory.setRatedInventory(0);
|
|
|
}
|
|
|
inventory.setShelfStatus(status);
|
|
|
|
|
|
}
|
|
|
inventory.setUpdateTime(new Date());
|
|
|
|
|
@ -5214,19 +5217,7 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
//更改货道容量-end
|
|
|
//下架药品
|
|
|
if (org.apache.commons.lang3.StringUtils.isNoneBlank(status)){
|
|
|
//下架时,清空库存
|
|
|
if ("0".equals(status)) {
|
|
|
inventory.setQty("0");
|
|
|
inventoryDO.setQty(0);
|
|
|
inventory.setDrugCode(null);
|
|
|
inventory.setOrgCode(null);
|
|
|
inventory.setDrugId(null);
|
|
|
inventory.setDrugName(null);
|
|
|
inventory.setPrice(null);
|
|
|
//设置额定库存
|
|
|
inventory.setRatedInventory(0);
|
|
|
}
|
|
|
inventory.setShelfStatus(status);
|
|
|
|
|
|
MedicineDrugInventoryRecord inventoryRecord = new MedicineDrugInventoryRecord();
|
|
|
inventoryRecord.setDeviceId(inventory.getIdDevice());
|
|
|
inventoryRecord.setEquNum(inventory.getEquNum());
|
|
@ -5241,6 +5232,21 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
inventoryRecord.setCreateUser(userId);
|
|
|
inventoryRecord.setType("4");
|
|
|
inventoryRecordDao.save(inventoryRecord);
|
|
|
|
|
|
//下架时,清空库存
|
|
|
if ("0".equals(status)) {
|
|
|
inventory.setQty("0");
|
|
|
inventoryDO.setQty(0);
|
|
|
inventory.setDrugCode(null);
|
|
|
inventory.setOrgCode(null);
|
|
|
inventory.setDrugId(null);
|
|
|
inventory.setDrugName(null);
|
|
|
inventory.setPrice(null);
|
|
|
//设置额定库存
|
|
|
inventory.setRatedInventory(0);
|
|
|
}
|
|
|
inventory.setShelfStatus(status);
|
|
|
|
|
|
}
|
|
|
inventory.setUpdateTime(new Date());
|
|
|
|