|
|
@ -4776,6 +4776,7 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
MediicinecabinetInventory inventory = inventoryDao.findOne(str[i]);
|
|
|
//更新设备缺货状态的该药品的已变动数量
|
|
|
InventoryDO inventoryDO = new InventoryDO();
|
|
|
inventoryDO.setIdDevice(inventory.getIdDevice());
|
|
|
inventoryDO.setCargoId(inventory.getId());
|
|
|
inventoryDO.setDrugCode(inventory.getDrugCode());
|
|
|
inventoryDO.setOrgCode(inventory.getOrgCode());
|
|
|
@ -4853,6 +4854,7 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
if ("0".equals(status)) {
|
|
|
inventory.setQty("0");
|
|
|
inventoryDO.setQty(0);
|
|
|
inventory.setOrgCode(null);
|
|
|
inventory.setDrugCode(null);
|
|
|
inventory.setDrugId(null);
|
|
|
inventory.setDrugName(null);
|
|
|
@ -4925,6 +4927,7 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
MediicinecabinetInventory inventory = inventoryDao.findOne(id);
|
|
|
//更新设备缺货状态的该药品的已变动数量
|
|
|
InventoryDO inventoryDO = new InventoryDO();
|
|
|
inventoryDO.setIdDevice(inventory.getIdDevice());
|
|
|
inventoryDO.setCargoId(inventory.getId());
|
|
|
inventoryDO.setDrugCode(inventory.getDrugCode());
|
|
|
inventoryDO.setOrgCode(inventory.getOrgCode());
|
|
|
@ -5004,6 +5007,7 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
inventory.setQty("0");
|
|
|
inventoryDO.setQty(0);
|
|
|
inventory.setDrugCode(null);
|
|
|
inventory.setOrgCode(null);
|
|
|
inventory.setDrugId(null);
|
|
|
inventory.setDrugName(null);
|
|
|
inventory.setPrice(null);
|
|
|
@ -5092,7 +5096,7 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
"\tt_mediicinecabinet_inventory t\n" +
|
|
|
"WHERE\n" +
|
|
|
"\tt.id_device = '" + device.getId() + "'\n" +
|
|
|
"\tt.id != '" + inventory.getCargoId() + "'\n" +
|
|
|
"\tAND t.id != '" + inventory.getCargoId() + "'\n" +
|
|
|
"AND (t.state = '1' OR t.state = '21')";
|
|
|
//设备列表
|
|
|
List<Map<String, Object>> list = hibenateUtils.createSQLQuery(tempConditionSql);
|
wangzhinan