From b7a6cccd1191cc1e171dba3a47a7713b5e20697c Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 28 Nov 2024 17:35:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBillSettelApplyQuery.java | 1 + .../AsBillSettelApplyRest.java | 19 +++++++++++++++++++ .../AsBillSettelApplyService.java | 4 ++++ 3 files changed, 24 insertions(+) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyQuery.java index 0ac5d1e96e..1bb1b19fee 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyQuery.java @@ -64,5 +64,6 @@ public class AsBillSettelApplyQuery implements Query { private String sourceBillNo; private String useOrgName; private String userSid; + private String sourceBillType; //0维修工单/1销售单 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyRest.java index 488624e3c0..f5110c320b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyRest.java @@ -110,6 +110,25 @@ public class AsBillSettelApplyRest { return rb.success().setData(vo); } + @ApiOperation("销售单初始化") + @GetMapping("/salesbillInit") + public ResultBean salesbillInit(@RequestParam("sid") String sid, + @RequestParam("userSid") String userSid, + @RequestParam("orgPath") String orgPath + ){ + ResultBean rb = ResultBean.fireFail(); + AsBillSettelApplyDetailsVo vo = asBillSettelApplyService.salesbillInit(sid,userSid,orgPath); + return rb.success().setData(vo); + } + + @ApiOperation("销售单保存") + @PostMapping("/salesSave") + public ResultBean salesSave(@RequestBody AsBillSettelApplyDetailsVo dto){ + ResultBean rb = ResultBean.fireFail(); + asBillSettelApplyService.saveOrUpdateDto(dto); + return rb.success(); + } + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java index f6255cf847..d3d95d9559 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java @@ -2392,4 +2392,8 @@ public class AsBillSettelApplyService extends MybatisBaseService