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

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

@@ -787,7 +787,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                    "AND cast(`qty` AS UNSIGNED) < `num`";
            int count = jdbcTemplate.queryForObject(sql, Integer.class);
            if (count == 0) {
                inventory.setState("1");
                mediicinedevice.setStatus("1");
            }
            if (Integer.parseInt(inventory.getQty()) < Integer.parseInt(inventory.getNum())) {
                //0缺货，1不缺货
@@ -818,6 +818,20 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            order.setSellState("1");
            orderDao.save(order);
        }
        sql = "SELECT\n" +
                "\tcount(DISTINCT(id))\n" +
                "FROM\n" +
                "\tt_medicine_shipment_log\n" +
                "WHERE\n" +
                "\torder_id = '" + orderId + "'\n" +
                "AND (`status` = 1\n" +
                "OR `status` = 3)";
        count = jdbcTemplate.queryForObject(sql, Integer.class);
        if (count > 0) {
            Mediicineorder order = orderDao.findOne(orderId);
            order.setSellState("1");
            orderDao.save(order);
        }
        //end
        result.put("msg", ConstantUtils.SUCCESS);

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

@@ -302,6 +302,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
        }
        String sql = "SELECT\n" +
                "bu.name AS replenishErName,\n" +
                "tmd.equ_name AS replenishEquName,\n" +
                "t.id AS id,\n" +
                "t.community AS community,\n" +
                "t.doc_time AS docTime,\n" +
@@ -320,7 +321,7 @@ 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 left join base_user bu on t.replenish_er = bu.id where 1=1\n";
                "    t_mediicine_stockup AS t left join base_user bu on t.replenish_er = bu.id left join t_mediicine_device tmd on t.replenish_equ = tmd.id 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)){

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

@@ -650,6 +650,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        //对cargoIds重排
        String[] cargoIdsArray = cargoIds.split(",");
        String deviceID = "";
        if (isMerge) {
            Boolean isFirst = true;