Merge branch 'medicare' of liubing/wlyy2.0 into medicare

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

@@ -131,7 +131,7 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    private Date prescribeTime;
    /**
     * 出货状态  -4订单超过规定取药时间 -3药品无药 -2作废 -1线下药房 0待发药 1已发药
     * 出货状态  -5出药失败待人工处理,-4订单超过规定取药时间 -3药品无药 -2作废 -1线下药房 0待发药 1已发药
     */
    private String sellState;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicineDeviceDao.java

@@ -29,6 +29,9 @@ public interface MediicineDeviceDao extends PagingAndSortingRepository<Mediicine
    @Query(value = "select b.* from adv_launch as a left join t_mediicine_device as b on a.dev_id=b.id where b.equ_num=?1",nativeQuery = true)
    Mediicinedevice findByEquNum(String machineCode);
    @Query(value = "select b.* from t_mediicine_device as b  where b.equ_num=?1",nativeQuery = true)
    Mediicinedevice findByEquNum2(String machineCode);
    @Query(value = "select b.* from adv_launch as a  left join t_mediicine_device as b on a.dev_id=b.id where a.adv_id=?1",nativeQuery = true)
    List<Mediicinedevice> findByAdvIdInfo(String advId);

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

@@ -904,6 +904,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        Logger.getAnonymousLogger().info("更新出货单出货状态----"+ "订单号为：" +medicineShipmentLog.getOrderId() + "----下的出货单号为："+medicineShipmentLog.getId()+ "----更新了出货状态----"+status+"----附加信息为----"+msg);
        shipmentLogDao.save(medicineShipmentLog);
        Mediicineorder mediicineorder = orderDao.findOne(medicineShipmentLog.getOrderId());
        //表示已出货
        if ("2".equals(status)) {
            //更新药柜库存
@@ -920,7 +921,6 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            updateDeviceState(inventory.getId(), inventoryDO);
            inventoryDao.save(inventory);
            //绑定订单跟出货设备的关系，
            Mediicineorder mediicineorder = orderDao.findOne(medicineShipmentLog.getOrderId());
            mediicineorder.setShippingEqu(medicineShipmentLog.getEquNum());
            mediicineorder.setShippingTime(new Date());
            mediicineorder.setShippingType(shippingType);
@@ -928,7 +928,10 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            //更新设备缺货状态
//            updateDeviceState(medicineShipmentLog);
        }
        if ("3".equals(status)){//出药过程失败，封锁订单
            mediicineorder.setSellState("-5");
            orderDao.save(mediicineorder);
        }
        result.put("msg", ConstantUtils.SUCCESS);
        result.put("response", ConstantUtils.SUCCESS);
        return result;
@@ -1523,7 +1526,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                                        mediicineorderdetail.setSocialSecurityCardNum(cardNo);
                                        orderdetailDao.save(mediicineorderdetail);
                                    }
                                }else {
                                }else if ("-4".equals(mediicineorder.getSellState())){//订单还能获取到切状态为过期，改为待取药状态
                                    mediicineorder.setSellState("0");
                                    orderDao.save(mediicineorder);
                                }

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

@@ -490,7 +490,7 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
//        String conditionSql = "";
        conditionSql += " and t.type LIKE '%网络%'";
        conditionSql += " and t.type in ('网络在线','网络离线')  ";
        if (!StringUtils.isEmpty(equNum)){
            conditionSql += " and t.equ_num = '" + equNum + "'";
@@ -628,7 +628,7 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
//        String conditionSql = "";
        conditionSql += " and (t.type LIKE '%故障%' OR t.TYPE LIKE '%出货异常%')";
        conditionSql += " and t.type in ('其它故障','货道故障','出货异常') ";
        if (!StringUtils.isEmpty(equNum)){
            conditionSql += " and t.equ_num = '" + equNum + "'";

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

@@ -77,7 +77,7 @@ public class MedicinedevicePrintMessageService extends BaseJpaService<Medicinede
                devicePrintMessage.setPicture(printMessage.getPicture());
                return printMessageDao.save(devicePrintMessage);
            }else {
                Mediicinedevice device = mediicineDeviceDao.findByEquNum(printMessage.getDeviceId());
                Mediicinedevice device = mediicineDeviceDao.findByEquNum2(printMessage.getDeviceId());
                if (null==device){
                    throw new Exception("该打印设备设置找不到！");
                }