|
@ -71,7 +71,8 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
|
|
|
//需要补货的设备
|
|
|
Mediicinedevice mediicinedevice = deviceDao.findOne(obj.getDeviceId());
|
|
|
Mediicinestockout mediicinestockout = new Mediicinestockout();
|
|
|
mediicinestockout.setReceiveState("1");
|
|
|
//领取状态,0未申领,1已领取
|
|
|
mediicinestockout.setReceiveState("0");
|
|
|
mediicinestockout.setRemark(obj.getRemark());
|
|
|
mediicinestockout.setReplenishEr(obj.getReplenishEr());
|
|
|
mediicinestockout.setReplenishEqu(mediicinedevice.getId());
|
|
@ -294,7 +295,16 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
|
|
|
Logger.getAnonymousLogger().info("finalCountSql="+countSql);
|
|
|
int count = jdbcTemplate.queryForObject(countSql,Integer.class);
|
|
|
for (Map<String,Object> map:list){
|
|
|
|
|
|
if (map.get("receiveState") != null) {
|
|
|
if (!StringUtils.isEmpty(map.get("receiveState").toString())) {
|
|
|
if ("0".equals(map.get("receiveState").toString())) {
|
|
|
map.put("receiveStateName", "未申领");
|
|
|
}
|
|
|
if ("1".equals(map.get("receiveState").toString())) {
|
|
|
map.put("receiveStateName", "已领取");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
result.put("count", count);
|
|
|
result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
|