|
@@ -342,6 +342,38 @@ public class AwaitSendController {
|
|
rj = ResponseJson.getSUCCESS();
|
|
rj = ResponseJson.getSUCCESS();
|
|
return rj;
|
|
return rj;
|
|
}
|
|
}
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 按照条件打单
|
|
|
|
+ * @param request
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ @ResponseBody
|
|
|
|
+ @RequiresPermissions("order:listAwaitSendOrder")
|
|
|
|
+ @RequestMapping("/getOrder")
|
|
|
|
+ public ResponseJson getOrder(HttpServletRequest request, SalesOrder salesOrder,
|
|
|
|
+ @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
|
|
|
|
+ @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
|
|
|
|
+ @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) {
|
|
|
|
+ ResponseJson rj = ResponseJson.getFAILURE();
|
|
|
|
+ salesOrder.setSalesShippingStatus(11); //salesShippingStatus
|
|
|
|
+ List<SalesOrder> salesOrderList = salesOrderService.listSalesOrder(salesOrder);
|
|
|
|
+ StringBuffer ids = new StringBuffer();
|
|
|
|
+ for (int i =0 ;i<salesOrderList.size();i++){
|
|
|
|
+ if(i == 0){
|
|
|
|
+ ids.append("orderId=" + salesOrderList.get(i).getSalesId());
|
|
|
|
+ }else{
|
|
|
|
+ ids.append("&orderId="+salesOrderList.get(i).getSalesId());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if(ids.length() < 1){
|
|
|
|
+ return rj;
|
|
|
|
+ }else{
|
|
|
|
+ rj = ResponseJson.getSUCCESS();
|
|
|
|
+ rj.addResponseKeyValue("ids",ids);
|
|
|
|
+ return rj;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|