xinzeng

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinedevice.java

@@ -170,10 +170,78 @@ public class Mediicinedevice extends UuidIdentityEntityWithOperator implements S
     */
    private String wayer;
    /**
     * 目标湿度
     */
    private String humidity;
    /**
     * 目标温度
     */
    private String temperature;
    /**
     * 湿度控制
     */
    private String humiditycontrol;
    /**
     * 温度控制
     */
    private String temperaturecontrol;
    /**
     * 是否加热
     */
    private String heat;
    /**
     * 预警温度
     */
    private String warningTemperature;
    /**
     * 预警湿度
     */
    private String waringHumidity;
    public String getHumiditycontrol() {
        return humiditycontrol;
    }
    public void setHumiditycontrol(String humiditycontrol) {
        this.humiditycontrol = humiditycontrol;
    }
    public String getTemperaturecontrol() {
        return temperaturecontrol;
    }
    public void setTemperaturecontrol(String temperaturecontrol) {
        this.temperaturecontrol = temperaturecontrol;
    }
    public String getHeat() {
        return heat;
    }
    public void setHeat(String heat) {
        this.heat = heat;
    }
    public String getWarningTemperature() {
        return warningTemperature;
    }
    public void setWarningTemperature(String warningTemperature) {
        this.warningTemperature = warningTemperature;
    }
    public String getWaringHumidity() {
        return waringHumidity;
    }
    public void setWaringHumidity(String waringHumidity) {
        this.waringHumidity = waringHumidity;
    }
    public Mediicinedevice() {
    }

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

@@ -11,6 +11,8 @@ import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.*;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.hospital.DmHospitalDO;
import com.yihu.jw.hospital.HospitalDao;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
@@ -44,6 +46,9 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    @Autowired
    private MediicinecabinetInventoryDao inventoryDao;
    @Autowired
    HospitalDao hospitalDao;
    @Autowired
    private MediicineDeviceDao deviceDao;
@@ -950,7 +955,14 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                }
            }
        }
        DmHospitalDO dmHospitalDO = hospitalDao.findOne(Integer.parseInt(mediicineorder.getBelongCommunity()));
        jsonObject.put("community", dmHospitalDO == null ? "" : dmHospitalDO.getName());
        jsonObject.put("phone", "123456");
        jsonObject.put("num", mediicineorder.getPrescribeNum());
        jsonObject.put("date", DateUtil.dateToStr(new Date(), "yyyy-MM-dd"));
        jsonObject.put("time", DateUtil.dateToStr(new Date(), "HH:mm:ss"));
        jsonObject.put("remark", "若未取到货物，请您扫描小票二维码申请退款。\n谢谢慢走，祝您生活愉快！");
        jsonObject.put("qrCodeContent", "谢谢慢走，祝您生活愉快！");
        jsonObject.put("list", shipmentLogs);
        jsonObject.put("status", 1);
        result.put("response", ConstantUtils.SUCCESS);

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

@@ -122,12 +122,11 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                //到底要存什么,deviceId device表中equNum
                inventory.setIdDevice(mediicinedevice.getId());
                inventory.setEquNum(deviceId);
                inventory.setState("0");
                inventory.setState("1");
                inventory.setCargoCapacity(mediicinedevice.getCargoCapacity());
                inventory.setShelfStatus("0");
                inventoryDao.save(inventory);
            }
        }
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",mediicinedevice);
@@ -532,7 +531,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    //mergeAndSplitCargo
    /**
     * 合并和分离过道
     * 合并和分离货道
     * @param cargoIds
     * @param isMerge
     * @return
@@ -544,54 +543,29 @@ 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);
                    } 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);
                }
            }
@@ -601,6 +575,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    }
    /**
     * 分页查询设备信息getDeviceListByPage
     * @param content