|
@@ -47,6 +47,10 @@ public class SalesOrderController {
|
|
|
@Resource
|
|
|
private TaskService taskService;
|
|
|
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取列表数据 ps:分页参数(-1,-1)获取全部数据
|
|
|
+ * */
|
|
|
@RequestMapping("/list")
|
|
|
public HttpRespMsg list(String inchargerId,Integer orderType, String orderName,
|
|
|
String orderCode,Integer customId,String businessName,
|
|
@@ -54,6 +58,10 @@ public class SalesOrderController {
|
|
|
return salesOrderService.getList(inchargerId,orderType,orderName,orderCode,customId,businessName,receivedStatus,startDate,endDate,productCode,pageIndex,pageSize,isDelete);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 新增编辑订单数据
|
|
|
+ * */
|
|
|
@RequestMapping("/addOrUpdate")
|
|
|
public HttpRespMsg addOrUpdate(SalesOrder order){
|
|
|
HttpRespMsg msg=new HttpRespMsg();
|
|
@@ -89,6 +97,23 @@ public class SalesOrderController {
|
|
|
return msg;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 转移订单 负责人
|
|
|
+ * */
|
|
|
+ @RequestMapping("/transfer")
|
|
|
+ public HttpRespMsg transfer(Integer id,String userId){
|
|
|
+ HttpRespMsg msg=new HttpRespMsg();
|
|
|
+ SalesOrder byId = salesOrderService.getById(id);
|
|
|
+ byId.setInchargerId(userId);
|
|
|
+ if(!salesOrderService.updateById(byId)){
|
|
|
+ msg.setError("验证失败");
|
|
|
+ }
|
|
|
+ return msg;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 删除订单(假删除 isDelete标记 0-->1)
|
|
|
+ * */
|
|
|
@RequestMapping("/delete")
|
|
|
public HttpRespMsg delete(String ids){
|
|
|
HttpRespMsg msg=new HttpRespMsg();
|
|
@@ -108,6 +133,10 @@ public class SalesOrderController {
|
|
|
return msg;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 恢复订单(假删除 isDelete标记 1-->0)
|
|
|
+ * */
|
|
|
@RequestMapping("/recover")
|
|
|
public HttpRespMsg recover(String ids){
|
|
|
HttpRespMsg msg=new HttpRespMsg();
|
|
@@ -127,16 +156,26 @@ public class SalesOrderController {
|
|
|
return msg;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 导入订单
|
|
|
+ * */
|
|
|
@RequestMapping("/importData")
|
|
|
public HttpRespMsg importData(MultipartFile multipartFile){
|
|
|
return salesOrderService.importData(multipartFile);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 导出订单
|
|
|
+ * */
|
|
|
@RequestMapping("/exportData")
|
|
|
public HttpRespMsg exportData(String userId, String orderName,String orderCode, String productCode) throws Exception {
|
|
|
return salesOrderService.exportData(userId,orderName,orderCode,productCode);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 订单相关的产品数据
|
|
|
+ * */
|
|
|
@RequestMapping("/productWithOrder")
|
|
|
public HttpRespMsg productWithOrder(Integer id){
|
|
|
HttpRespMsg msg=new HttpRespMsg();
|
|
@@ -170,6 +209,10 @@ public class SalesOrderController {
|
|
|
return msg;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 订单相关的任务数据
|
|
|
+ * */
|
|
|
@RequestMapping("/taskWithOrder")
|
|
|
public HttpRespMsg taskWithOrder(Integer id){
|
|
|
HttpRespMsg msg=new HttpRespMsg();
|