|
|
@ -124,12 +124,13 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
//到底要存什么,deviceId device表中equNum
|
|
|
inventory.setIdDevice(mediicinedevice.getId());
|
|
|
inventory.setEquNum(deviceId);
|
|
|
inventory.setState("0");
|
|
|
//1标识单列货道，21表示合并货道主货道，20表示合并货道的次货道
|
|
|
inventory.setState("1");
|
|
|
inventory.setMerge(String.valueOf(i1+1));
|
|
|
inventory.setCargoCapacity(mediicinedevice.getCargoCapacity());
|
|
|
inventory.setShelfStatus("0");
|
|
|
inventoryDao.save(inventory);
|
|
|
}
|
|
|
|
|
|
}
|
|
|
result.put("response",ConstantUtils.SUCCESS);
|
|
|
result.put("msg",mediicinedevice);
|
|
|
@ -559,7 +560,7 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
//mergeAndSplitCargo
|
|
|
|
|
|
/**
|
|
|
* 合并和分离过道
|
|
|
* 合并和分离货道
|
|
|
* @param cargoIds
|
|
|
* @param isMerge
|
|
|
* @return
|
|
|
@ -571,54 +572,30 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
result.put("response", ConstantUtils.FAIL);
|
|
|
return result.toJSONString();
|
|
|
}
|
|
|
for (String deviceId : cargoIds.split(",")) {
|
|
|
if(!StringUtils.isEmpty(deviceId)){
|
|
|
Mediicinedevice mediicinedevice = deviceDao.findOne(deviceId);
|
|
|
//删除补货员
|
|
|
{
|
|
|
List<Map<String, Object>> list = null;
|
|
|
list = hibenateUtils.createSQLQuery("SELECT * FROM t_mediicine_device_user where del = 1 AND device_id = '" + deviceId + "'");
|
|
|
if (list != null && list.size() > 0) {
|
|
|
for (Map<String, Object> stringObjectMap : list) {
|
|
|
if (!StringUtils.isEmpty(stringObjectMap.get("id").toString())) {
|
|
|
MediicineDeviceUser mediicineDeviceUser = deviceUserDao.findOne(stringObjectMap.get("id").toString());
|
|
|
if (mediicineDeviceUser != null) {
|
|
|
mediicineDeviceUser.setDel("0");
|
|
|
deviceUserDao.save(mediicineDeviceUser);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
if (isMerge) {
|
|
|
Boolean isFirst = true;
|
|
|
for (String deviceId : cargoIds.split(",")) {
|
|
|
if(!StringUtils.isEmpty(deviceId)){
|
|
|
if (isFirst) {
|
|
|
MediicinecabinetInventory inventory = inventoryDao.findOne(deviceId);
|
|
|
inventory.setMerge(cargoIds);
|
|
|
inventory.setState("21");
|
|
|
inventoryDao.save(inventory);
|
|
|
isFirst = false;
|
|
|
} else {
|
|
|
MediicinecabinetInventory inventory = inventoryDao.findOne(deviceId);
|
|
|
inventory.setMerge(cargoIds);
|
|
|
inventory.setState("20");
|
|
|
inventoryDao.save(inventory);
|
|
|
}
|
|
|
}
|
|
|
//删除社区，社区中心名称
|
|
|
mediicinedevice.setBelongCommunity(null);
|
|
|
mediicinedevice.setCommunity(null);
|
|
|
mediicinedevice.setStatus("0");
|
|
|
mediicinedevice.setSaleStatus("2");
|
|
|
mediicinedevice.setAisles(String.valueOf(Integer.parseInt(mediicinedevice.getLayer()) *
|
|
|
Integer.parseInt(mediicinedevice.getWayer())));
|
|
|
mediicinedevice.setCargoCapacity("5");
|
|
|
mediicinedevice.setCapacity(String.valueOf(Integer.parseInt(mediicinedevice.getAisles()) *
|
|
|
Integer.parseInt(mediicinedevice.getCargoCapacity())));
|
|
|
mediicinedevice.setDeliveryAddress(null);
|
|
|
mediicinedevice.setDetailAddress(null);
|
|
|
mediicinedevice.setEquArea(null);
|
|
|
this.save(mediicinedevice);
|
|
|
//更新库存
|
|
|
List<MediicinecabinetInventory> list = inventoryDao.findMediicinecabinetInventoryByDeviceId(deviceId);
|
|
|
for (MediicinecabinetInventory inventory : list) {
|
|
|
inventory.setPic(null);
|
|
|
inventory.setShelfStatus("0");
|
|
|
inventory.setQty("0");
|
|
|
inventory.setDrugCode(null);
|
|
|
inventory.setDrugId(null);
|
|
|
inventory.setDrugName(null);
|
|
|
inventory.setPrice(null);
|
|
|
inventory.setSku(null);
|
|
|
inventory.setDrugSku(null);
|
|
|
inventory.setNum("0");
|
|
|
inventory.setLongtime(null);
|
|
|
inventory.setOrgCode(null);
|
|
|
}
|
|
|
} else {
|
|
|
for (String deviceId : cargoIds.split(",")) {
|
|
|
if(!StringUtils.isEmpty(deviceId)){
|
|
|
MediicinecabinetInventory inventory = inventoryDao.findOne(deviceId);
|
|
|
inventory.setMerge(inventory.getWayerNo());
|
|
|
inventory.setState("1");
|
|
|
inventoryDao.save(inventory);
|
|
|
}
|
|
|
}
|
|
|
@ -628,6 +605,7 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 分页查询设备信息getDeviceListByPage
|
|
|
* @param content
|
chenjiasheng