Merge branch 'dev' of chaoren1/wlyy2.0 into medicare

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

@@ -26,7 +26,7 @@ public class Mediicinestockup extends UuidIdentityEntityWithOperator implements
    private String replenishEr;
    /**
     * state
     * state, 1已生成，2未生成，3已删除
     */
    private String state;

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineUpEndpoint.java

@@ -70,8 +70,8 @@ public class MedicineUpEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        stockupService.delete(ids.split(","));
        return success("删除成功");
//        stockupService.delete(ids);
        return success(stockupService.deleteUp(ids).getString("msg"));
    }
    @PostMapping(value = BaseRequestMapping.BaseUp.UPDATE)

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

@@ -773,12 +773,25 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                    medicineShipmentLog.getWayerNo().split(",")[0]);
//            inventory.setQty(String.valueOf((Integer.parseInt(inventory.getQty()) - 1)<0 ? 0 :(Integer.parseInt(inventory.getQty()) - 1)));
            inventory.setQty((Integer.parseInt(inventory.getQty()) - 1<0 ? "0" :String.valueOf((Integer.parseInt(inventory.getQty()) - 1))));
            //判断设备是否还缺货不咯
            //库存中
            Mediicinedevice mediicinedevice = deviceDao.findOne(inventory.getIdDevice());
            String sql = "SELECT\n" +
                    "\tcount(DISTINCT(`id`))\n" +
                    "FROM\n" +
                    "\tt_mediicinecabinet_inventory\n" +
                    "WHERE\n" +
                    "\t`id_device` = '" + medicineShipmentLog.getDeviceId() + "'\n" +
                    "AND cast(`qty` AS UNSIGNED) < `num`";
            int count = jdbcTemplate.queryForObject(sql, Integer.class);
            if (count == 0) {
                inventory.setState("1");
            }
            if (Integer.parseInt(inventory.getQty()) < Integer.parseInt(inventory.getNum())) {
                Mediicinedevice mediicinedevice = deviceDao.findOne(inventory.getIdDevice());
                //0缺货，1不缺货
                mediicinedevice.setStatus("0");
                deviceDao.save(mediicinedevice);
            }
            deviceDao.save(mediicinedevice);
            inventoryDao.save(inventory);
            //绑定订单跟出货设备的关系，
            Mediicineorder mediicineorder = orderDao.findOne(medicineShipmentLog.getOrderId());
@@ -1273,7 +1286,6 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        }
        List<Map<String , Object>> orderList = new ArrayList<>();
        //遍历所有订单
        Boolean shifoucunzaikeyiquyaode = false;
        for (Mediicineorder order : orders) {
            Map<String, Object> map = new HashMap<>();
            DmHospitalDO dmHospitalDO = hospitalDao.findByCode(order.getBelongCommunity());
@@ -1358,10 +1370,10 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                        "\t\t0\n" +
                        "\t)";
                int count = jdbcTemplate.queryForObject(secondSql, Integer.class);
                //默认有药
                //标记详情是否有药
                mediicineorderdetail.setOrderState("1");
                if (count == 0) {
                    //无药
                    //详情无药
                    mediicineorderdetail.setOrderState("0");
                    map.put("orderStatus", "0");
                }

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

@@ -86,6 +86,17 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        Mediicinestockup mediicinestockup = upDao.findOne(obj.getUpId());
        if (!"2".equals(mediicinestockup.getState())) {
            if ("1".equals(mediicinestockup.getState())) {
                result.put("msg", "备货单已生成出货单！");
            }
            if ("3".equals(mediicinestockup.getState())) {
                result.put("msg", "备货单已删除！");
            }
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        //需要补货的设备
        Mediicinedevice mediicinedevice = deviceDao.findOne(obj.getDeviceId());
        Mediicinestockout mediicinestockout = new Mediicinestockout();

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

@@ -94,7 +94,8 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
            //待补品类，
            mediicinestockup.setReplenishCate(String.valueOf(upDO.getDrugs().size()));
            mediicinestockup.setReplenishEqu(upDO.getDeviceId());
            mediicinestockup.setState("1");
            //备货单状态， 1已生成， 2未生成， 3 删除
            mediicinestockup.setState("2");
            mediicinestockup.setReplenishInventory(String.valueOf(upDO.getDrugs().stream().mapToInt(DrugDO::getQty).sum()));
            mediicinestockup.setCreateUser(userId);
            mediicinestockup.setCreateUserName(user.getName());
@@ -167,6 +168,34 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
        return result.toJSONString();
    }
    /**
     * 删除
     * @param ids
     * @return
     */
    public JSONObject deleteUp(String ids) {
        JSONObject result = new JSONObject();
        if (ids == null || StringUtils.isEmpty(ids)) {
            result.put("msg", "ids is null or empty");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        for (String s : ids.split(",")) {
            if (!StringUtils.isEmpty(s)) {
                Mediicinestockup mediicinestockup =  upDao.findOne(s);
                if (mediicinestockup != null) {
                    mediicinestockup.setState("3");
                    upDao.save(mediicinestockup);
                }
            }
        }
        result.put("msg", "删除成功");
        result.put("response", ConstantUtils.SUCCESS);
        return result;
    }
    /**
     * 修改备货单
     * @param jsonData
@@ -290,8 +319,8 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
                "t.update_user AS updateUser,\n" +
                "t.update_user_name AS updateUserName\n" +
                "FROM\n" +
                "    t_mediicine_stockup AS t where 1=1";
                "    t_mediicine_stockup AS t where 1=1\n";
        conditionSql += " AND t.`state` != '3'\n";
        //单据时间
        if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
            conditionSql += " AND  t.doc_time >= '" + startTime +"'" +
@@ -318,7 +347,15 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> map:list){
            if ("1".equals(map.get("state").toString())) {
                map.put("stateName", "已生成");
            }
            if ("2".equals(map.get("state").toString())) {
                map.put("stateName", "未生成");
            }
            if ("3".equals(map.get("state").toString())) {
                map.put("stateName", "删除");
            }
        }
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));

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

@@ -723,6 +723,25 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        return result.toJSONString();
    }
//    public String updateDeviceInventoryNum(String cargoIds, String cargoState){
//        JSONObject result = new JSONObject();
//        if(StringUtils.isEmpty(cargoIds)){
//            result.put("msg","cargoIds is null");
//            result.put("response", ConstantUtils.FAIL);
//            return result.toJSONString();
//        }
//        for (String cargoId : cargoIds.split(",")) {
//            if(!StringUtils.isEmpty(cargoId)){
//                MediicinecabinetInventory inventory = inventoryDao.findOne(cargoId);
//                inventory.setCargoState(cargoState);
//                inventoryDao.save(inventory);
//            }
//        }
//        result.put("response",ConstantUtils.SUCCESS);
//        return result.toJSONString();
//    }
    /**
     * 分页查询设备信息getDeviceListByPage
     * @param content