|
@ -910,6 +910,27 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
List<MedicineWarrayRule> rules = medicineWarrayRuleDao.findMedicineWarrayRulesByEquNumAndDel(inventory.getEquNum(), 1);
|
|
|
//不缺货
|
|
|
mediicinedevice.setStatus("1");
|
|
|
//bug:13663
|
|
|
if (rules == null || rules.size() == 0) {
|
|
|
for (Map<String, Object> stringObjectMap : collect) {
|
|
|
if (isExit) {
|
|
|
if (inventoryDO.getDrugCode() != null && inventoryDO.getOrgCode() != null) {
|
|
|
if (inventoryDO.getDrugCode().equals(stringObjectMap.get("drugCode")) && inventoryDO.getOrgCode().equals(stringObjectMap.get("orgCode"))) {
|
|
|
stringObjectMap.put("qty", (int) Double.parseDouble(stringObjectMap.get("qty") + "") + inventoryDO.getQty());
|
|
|
stringObjectMap.put("ratedInventory", (int) Double.parseDouble(stringObjectMap.get("ratedInventory") + "") + inventoryDO.getRatedInventory());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
Integer tempQty = (int) Double.parseDouble(stringObjectMap.get("qty") + "");
|
|
|
if (tempQty == 0) {
|
|
|
mediicinedevice.setStatus("0");
|
|
|
} else {
|
|
|
mediicinedevice.setStatus("1");
|
|
|
}
|
|
|
}
|
|
|
deviceDao.save(mediicinedevice);
|
|
|
}
|
|
|
//bug:end
|
|
|
quit:for (MedicineWarrayRule rule : rules) {
|
|
|
for (Map<String, Object> stringObjectMap : collect) {
|
|
|
if (isExit) {
|