xinzeng

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@@ -123,6 +123,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                inventory.setIdDevice(mediicinedevice.getId());
                inventory.setEquNum(deviceId);
                inventory.setState("1");
                inventory.setMerge(String.valueOf(i1+1));
                inventory.setCargoCapacity(mediicinedevice.getCargoCapacity());
                inventory.setShelfStatus("0");
                inventoryDao.save(inventory);
@@ -552,6 +553,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                        inventory.setMerge(cargoIds);
                        inventory.setState("21");
                        inventoryDao.save(inventory);
                        isFirst = false;
                    } else {
                        MediicinecabinetInventory inventory = inventoryDao.findOne(deviceId);
                        inventory.setMerge(cargoIds);