销售订单管理修改

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java

@@ -53,68 +53,73 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("v1/smssalesbill")
 public class SmsSalesBillRest {
 
-	@Autowired
-	private SmsSalesBillService smsSalesBillService;
+    @Autowired
+    private SmsSalesBillService smsSalesBillService;
 
 
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<SmsSalesBillVo>> listPage(@RequestBody PagerQuery<SmsSalesBillQuery> pq){
-		return smsSalesBillService.listPage(pq);
-	}
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SmsSalesBillVo>> listPage(@RequestBody PagerQuery<SmsSalesBillQuery> pq) {
+        return smsSalesBillService.listPage(pq);
+    }
 
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody SmsSalesBillDto dto){
-		return smsSalesBillService.saveOrUpdateDto(dto);
-	}
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SmsSalesBillDto dto) {
+        return smsSalesBillService.saveOrUpdateDto(dto);
+    }
 
+    @ApiOperation("提交")
+    @PostMapping("/submit")
+    public ResultBean submit(@RequestBody SmsSalesBillDto dto) {
+        return smsSalesBillService.submit(dto);
+    }
 
-	@ApiOperation("根据sid批量删除")
+    @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		return smsSalesBillService.deleteBySids(sids);
-	}
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        return smsSalesBillService.deleteBySids(sids);
+    }
 
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<SmsSalesBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		return smsSalesBillService.fetchDetailsVoBySid(sid);
-	}
-
-	@ApiOperation("销售订单审核列表")
-	@PostMapping("/reviewListPage")
-	public ResultBean<PagerVo<OrderReviewVo>> reviewListPage(@RequestBody PagerQuery<OrderReviewQuery> pq){
-		return smsSalesBillService.reviewListPage(pq);
-	}
-
-	@ApiOperation("销售订单审核详情")
-	@GetMapping("/reviewDetails")
-	public ResultBean<ReviewDetailsVo> reviewDetails(@RequestParam("sid") String sid){
-		return smsSalesBillService.reviewDetails(sid);
-	}
-
-	@ApiOperation("收货地址保存")
-	@PostMapping("/saveShipper")
-	public ResultBean saveShipper(@RequestBody ReviewDetailsVo dto){
-		return smsSalesBillService.saveShipper(dto);
-	}
-
-	@ApiOperation("发票信息保存")
-	@PostMapping("/saveInvoice")
-	public ResultBean saveInvoice(@RequestBody ReviewDetailsVo dto){
-		return smsSalesBillService.saveInvoice(dto);
-	}
-
-	@ApiOperation("分页列表单条保存")
-	@PostMapping("/saveOneListData")
-	public ResultBean saveOneListData(@RequestBody OrderReviewVo dto){
-		return smsSalesBillService.saveOneListData(dto);
-	}
-
-	@ApiOperation("审核确认")
-	@PostMapping("/reviewConfirm")
-	public ResultBean reviewConfirm(@RequestBody ReviewConfirmDto dto){
-		return smsSalesBillService.reviewConfirm(dto);
-	}
+    public ResultBean<SmsSalesBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        return smsSalesBillService.fetchDetailsVoBySid(sid);
+    }
+
+    @ApiOperation("销售订单审核列表")
+    @PostMapping("/reviewListPage")
+    public ResultBean<PagerVo<OrderReviewVo>> reviewListPage(@RequestBody PagerQuery<OrderReviewQuery> pq) {
+        return smsSalesBillService.reviewListPage(pq);
+    }
+
+    @ApiOperation("销售订单审核详情")
+    @GetMapping("/reviewDetails")
+    public ResultBean<ReviewDetailsVo> reviewDetails(@RequestParam("sid") String sid) {
+        return smsSalesBillService.reviewDetails(sid);
+    }
+
+    @ApiOperation("收货地址保存")
+    @PostMapping("/saveShipper")
+    public ResultBean saveShipper(@RequestBody ReviewDetailsVo dto) {
+        return smsSalesBillService.saveShipper(dto);
+    }
+
+    @ApiOperation("发票信息保存")
+    @PostMapping("/saveInvoice")
+    public ResultBean saveInvoice(@RequestBody ReviewDetailsVo dto) {
+        return smsSalesBillService.saveInvoice(dto);
+    }
+
+    @ApiOperation("分页列表单条保存")
+    @PostMapping("/saveOneListData")
+    public ResultBean saveOneListData(@RequestBody OrderReviewVo dto) {
+        return smsSalesBillService.saveOneListData(dto);
+    }
+
+    @ApiOperation("审核确认")
+    @PostMapping("/reviewConfirm")
+    public ResultBean reviewConfirm(@RequestBody ReviewConfirmDto dto) {
+        return smsSalesBillService.reviewConfirm(dto);
+    }
 }

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillQuery.java

@@ -72,5 +72,6 @@ public class SmsSalesBillQuery implements Query {
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-
+    @ApiModelProperty("审核状态")
+    private String state; // 审核状态
 }

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java

@@ -133,4 +133,8 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
     public ResultBean reviewConfirm(ReviewConfirmDto dto) {
         return smsSalesBillFeign.reviewConfirm(dto);
     }
+
+    public ResultBean submit(SmsSalesBillDto dto) {
+        return smsSalesBillFeign.submit(dto);
+    }
 }

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillVo.java

@@ -75,6 +75,7 @@ public class SmsSalesBillVo implements Vo {
     private String deliveryAddress; // 省/市/县/详细地址
     @ApiModelProperty("备注")
     private String remarks; // 备注
-
+    @ApiModelProperty("审核状态")
+    private String state; // 审核状态
 
 }

oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java

@@ -60,4 +60,8 @@ public interface SmsSalesBillFeign {
     @ApiOperation("审核确认")
     @PostMapping("/reviewConfirm")
     public ResultBean reviewConfirm(@RequestBody ReviewConfirmDto dto);
+
+    @ApiOperation("提交")
+    @PostMapping("/submit")
+    public ResultBean submit(@RequestBody SmsSalesBillDto dto);
 }

oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeignFallback.java

@@ -63,4 +63,9 @@ public class SmsSalesBillFeignFallback implements SmsSalesBillFeign {
     public ResultBean reviewConfirm(ReviewConfirmDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean submit(SmsSalesBillDto dto) {
+        return null;
+    }
 }