出货，也进行，货道排序

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -143,6 +143,7 @@ public class BaseRequestMapping {
        public static final String getOrderDetailListById  = "/getOrderDetailListById";
        public static final String getOrderDetailById  = "/getOrderDetailById";
        public static final String checkOrder  = "/checkOrder";
        public static final String checkOrderComplete  = "/checkOrderComplete";
        public static final String checkOrderAndReturn  = "/checkOrderAndReturn";
        public static final String checkOrderAndReturnOrderList  = "/checkOrderAndReturnOrderList";
        public static final String getOrderOutList  = "/getOrderOutList";

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/open/nologin/ServiceNoLoginEndPoint.java

@@ -74,6 +74,18 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
        return success(jsonObject.getJSONObject("msg"));
    }
    @GetMapping(value = BaseRequestMapping.BaseOrder.checkOrderComplete)
    @ApiOperation(value = "检查订单是否完成" , notes="检查订单是否完成")
    public Envelop checkOrderComplete(
            @ApiParam(name = "orderId", value = "设备id", required = true)
            @RequestParam(value = "orderId") String orderId
    ) {
        JSONObject jsonObject =  orderservice.checkOrderComplete(orderId);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"));
    }
    @GetMapping(value = BaseRequestMapping.BaseOrder.checkOrderAndReturn)
    @ApiOperation(value = "检查订单并且返回列表" , notes="检查订单")

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

@@ -814,6 +814,35 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        return result;
    }
    public JSONObject checkOrderComplete(String orderId) {
        JSONObject result = new JSONObject();
        if (orderId == null || StringUtils.isEmpty(orderId)) {
            result.put("msg", "parameter orderId is null or empty");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        String 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)";
        int count = jdbcTemplate.queryForObject(sql, Integer.class);
        if (count == 0) {
            Mediicineorder order = orderDao.findOne(orderId);
            order.setSellState("1");
            orderDao.save(order);
            result.put("msg", "order was completed");
            result.put("response", ConstantUtils.SUCCESS);
            return result;
        }
        result.put("response", ConstantUtils.FAIL);
        result.put("msg", "订单未完成，请联系管理员！");
        return result;
    }
    /**
     * 检查订单&返回订单出货单列表           deviceId ---->equNum