出货，也进行，货道排序

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

@@ -753,6 +753,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        if (!StringUtils.isEmpty(msg)) {
            medicineShipmentLog.setDescription(msg);
        }
        Logger.getAnonymousLogger().info("更新出货单出货状态----"+ "订单号为：" +medicineShipmentLog.getOrderId() + "----下的出货单号为："+medicineShipmentLog.getId()+ "----更新了出货状态----"+status+"----附加信息为----"+msg);
        shipmentLogDao.save(medicineShipmentLog);
        //表示已出货
@@ -790,9 +792,11 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            mediicineorder.setShippingTime(new Date());
            orderDao.save(mediicineorder);
        }
        //查询更新订单信息start
        //订单id
        String orderId = medicineShipmentLog.getOrderId();
        String sql = "SELECT\n" +
                "\tcount(DISTINCT(id))\n" +
                "FROM\n" +
@@ -814,6 +818,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        return result;
    }
    public JSONObject checkOrderComplete(String orderId) {
        JSONObject result = new JSONObject();
        if (orderId == null || StringUtils.isEmpty(orderId)) {
@@ -821,6 +827,13 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        String tempSql = "select IFNULL((select count(distinct(id)) from t_medicine_shipment_log where order_id = '"+orderId+"'), 0)";
        int count = jdbcTemplate.queryForObject(tempSql, Integer.class);
        if (count == 0) {
            result.put("msg", "订单未生成出货单");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        String sql = "SELECT\n" +
                "\tcount(DISTINCT(id))\n" +
                "FROM\n" +
@@ -829,7 +842,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                "\torder_id = '" + orderId + "'\n" +
                "AND (`status` = 1\n" +
                "OR `status` = 3)";
        int count = jdbcTemplate.queryForObject(sql, Integer.class);
        count = jdbcTemplate.queryForObject(sql, Integer.class);
        if (count == 0) {
            Mediicineorder order = orderDao.findOne(orderId);
            order.setSellState("1");