From 216ecf75c513b1270801ea11d0710bce5cb5f2be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Thu, 20 Nov 2025 09:40:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/templtp/TemplateInstanceController.java | 9 ++++++--- .../base/controller/admin/templtp/TmplItmController.java | 6 ++++++ .../base/controller/admin/templtp/TmplTpController.java | 1 + .../controller/admin/templtp/TmplTpFldController.java | 6 +++--- .../admin/purchaseorder/PurchaseOrderController.java | 7 +++++++ .../admin/salesorder/SalesOrderController.java | 7 +++++++ 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java index 543602e3..b3fffa8d 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java @@ -147,7 +147,7 @@ public class TemplateInstanceController extends AbstractFileUploadController { //模版实例发布 @PostMapping("/publish-batch") @Operation(summary = "模版实例发布") - @PreAuthorize("@ss.hasPermission('base:template-instance:publish')") + @PreAuthorize("@ss.hasPermission('base:template-instance:update')") public CommonResult publishTemplateInstance(@Valid @RequestBody List publishReqVOS) { templateInstanceService.publishTemplateInstance(publishReqVOS); return success(true); @@ -172,7 +172,7 @@ public class TemplateInstanceController extends AbstractFileUploadController { //停用和启用接口 @PostMapping("/disable-enable") @Operation(summary = "实例停用和启用接口", description = "实例停用和启用接口") - @PreAuthorize("@ss.hasPermission('base:template-instance:disable-enable')") + @PreAuthorize("@ss.hasPermission('base:template-instance:update')") public CommonResult setDisableOrEnable(@Valid @RequestBody DisableEnableReqVO reqVO) { templateInstanceService.setDisableOrEnable(reqVO); return success(true); @@ -181,6 +181,7 @@ public class TemplateInstanceController extends AbstractFileUploadController { //根据id获取实例版本号 @GetMapping("/get-version") @Operation(summary = "根据id获取实例版本号") + @PreAuthorize("@ss.hasPermission('base:template-instance:query')") public CommonResult> getVersion(@Valid @NotEmpty(message = "模版实例id不能为空") @RequestParam("id") String id) { return success(templateInstanceService.getVersion(id)); } @@ -188,7 +189,7 @@ public class TemplateInstanceController extends AbstractFileUploadController { //创建版本 @PostMapping("/create-version") @Operation(summary = "创建版本") - @PreAuthorize("@ss.hasPermission('base:template-instance:create-version')") + @PreAuthorize("@ss.hasPermission('base:template-instance:create')") public CommonResult createVersion(@Valid @NotEmpty(message = "模版实例id不能为空") String id) { return success(templateInstanceService.createVersion(id)); } @@ -196,6 +197,7 @@ public class TemplateInstanceController extends AbstractFileUploadController { //通过模版编码查看历史版本 @GetMapping("/list-by-template-cdg") @Operation(summary = "通过模版编码(cdg)查看历史版本", description = "通过模版编码查看历史版本,已按照发布时间和创建时间降序排序") + @PreAuthorize("@ss.hasPermission('base:template-instance:query')") public CommonResult> listByTemplateCode(@RequestParam("cdg") @Valid @NotEmpty(message = "模版编号不能为空") String templateCode) { return success(templateInstanceService.listByCdg(templateCode)); } @@ -203,6 +205,7 @@ public class TemplateInstanceController extends AbstractFileUploadController { //通过实例id获取字段和条款详情 @GetMapping("/field-and-clause-detail") @Operation(summary = "通过实例id获取字段和条款详情") + @PreAuthorize("@ss.hasPermission('base:template-instance:query')") public CommonResult getFieldAndClauseDetail(@Valid @NotEmpty(message = "模版实例id不能为空") @RequestParam("id") String id) { return success(templateInstanceService.getFieldAndClauseDetail(id)); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplItmController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplItmController.java index 288b802e..41516be2 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplItmController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplItmController.java @@ -37,6 +37,7 @@ public class TmplItmController { @PostMapping("/create") @Operation(summary = "创建模板条款") + @PreAuthorize("@ss.hasPermission('base:tmpl-ltm:create')") public CommonResult createTmplItm(@Valid @RequestBody TmplItmSaveReqVO createReqVO) { TmplItmRespVO tmplItm = tmplItmService.createTmplItm(createReqVO); return success(tmplItm); @@ -44,6 +45,7 @@ public class TmplItmController { @PutMapping("/update") @Operation(summary = "更新模板条款") + @PreAuthorize("@ss.hasPermission('base:tmpl-ltm:update')") public CommonResult updateTmplItm(@Valid @RequestBody TmplItmSaveReqVO updateReqVO) { tmplItmService.updateTmplItm(updateReqVO); return success(true); @@ -51,17 +53,20 @@ public class TmplItmController { @DeleteMapping("/delete") @Operation(summary = "删除模板条款", description = "") + @PreAuthorize("@ss.hasPermission('base:tmpl-ltm:delete')") public CommonResult deleteTmplItm(@RequestBody BatchDeleteReqVO req) { return success(tmplItmService.deleteTmplItm(req.getIds())); } @GetMapping("/id") @Operation(summary = "根据id获得模板条款") + @PreAuthorize("@ss.hasPermission('base:tmpl-ltm:query')") public CommonResult getTmplItm(@RequestBody String id) { return success(BeanUtils.toBean(tmplItmService.getById(id), TmplItmRespVO.class)); } @GetMapping("/list") + @Operation(summary = "获得模板条款") public CommonResult> listTmplItm(Map params) { // 创建查询条件构造器 QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -86,6 +91,7 @@ public class TmplItmController { @GetMapping("/page") @Operation(summary = "分页获得模板条款") + @PreAuthorize("@ss.hasPermission('base:tmpl-ltm:query')") public CommonResult> pageTmplItm(@Validated TmpItmPageReqVO pageReqVO) { PageResult pageResult = tmplItmService.pageTmplItm(pageReqVO); return success(BeanUtils.toBean(pageResult, TmplItmRespVO.class)); diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplTpController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplTpController.java index a09c4411..e62c682b 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplTpController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplTpController.java @@ -124,6 +124,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu //获取分类树 @GetMapping("/tree") @Operation(summary = "获得分类树--上级") + @PreAuthorize("@ss.hasPermission('base:tmpl-tp:query')") public CommonResult> getTree(@RequestParam(value = "num",required = false) String num,@RequestParam(value = "name",required = false) String name) { List tree = tmplTpService.buildTree(num,name); return success(tree); diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplTpFldController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplTpFldController.java index 503b14c5..d7032dea 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplTpFldController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplTpFldController.java @@ -34,7 +34,7 @@ public class TmplTpFldController { private final TmplTpFldService tmplTpFldService; @PostMapping("/create") @Operation(summary = "创建模板字段") -// @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:create')") + @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:create')") public CommonResult createTmplFld(@Valid @RequestBody TmplTpFldSaveReqVO tmplTpFldSaveReqVO) { return success(tmplTpFldService.createTmplFld(tmplTpFldSaveReqVO)); } @@ -55,14 +55,14 @@ public class TmplTpFldController { } @GetMapping("/page") @Operation(summary = "获得模板字段列表") - @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:list')") + @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:query')") public CommonResult> getTmplTpList( @Valid TmplFldPageReqVO pageReqVO) { PageResult pageResult = tmplTpFldService.tmplTpFldPage(pageReqVO); return success(BeanUtils.toBean(pageResult, TmplFldRespVO.class)); } @GetMapping("/class-fld") @Operation(summary = "获得类固定模板字段列表", description = "clazz为VO类类名") - @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:list')") + @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:query')") public CommonResult>> getTmplTpListByClass(String clazz) { return success(tmplTpFldService.getTmplTpListByClass(clazz)); } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java index a2de655b..47f37e3d 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java @@ -159,6 +159,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { //通过订单号查询订单信息 @PostMapping("/get-order-by-order-no") @Operation(summary = "通过订单号查询订单信息", description = "通过订单号查询订单信息") + @PreAuthorize("@ss.hasPermission('bse:purchase-order:query')") public CommonResult> getOrderByOrderNo(@RequestBody @Validated @NotEmpty(message = "采购订单不能为空") List orderNos) { return success(purchaseOrderService.getOrderByOrderNo(orderNos)); } @@ -166,6 +167,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { //根据订单id修改订单状态 @PutMapping("/update-order-status") @Operation(summary = "批量修改订单状态", description = "sts取值于字典名称'采购订单状态',字典类型'PRCH_ORD_STS' 可以根据订单号和订单id修改") + @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") public CommonResult updateOrderStatus(@RequestBody @Validated OrderStsReqVO req) { purchaseOrderService.updateOrderStatusByIdOrOrderNo(req); return success(true); @@ -174,6 +176,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { //查询物料接口 @GetMapping("/material") @Operation(summary = "查询物料接口") + @PreAuthorize("@ss.hasPermission('bse:purchase-order:query')") public CommonResult getMaterialList(@RequestParam @Schema(description = "采购订单号") @Validated @@ -185,12 +188,14 @@ public class PurchaseOrderController implements BusinessControllerMarker { //关联订单 @PostMapping("/link-order") @Operation(summary = "关联订单") + @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") public CommonResult linkOrder(@RequestBody @Validated LinkOrderReqVO req) { return success(purchaseOrderService.linkOrder(req)); } @PostMapping("/order-pass-reject") @Operation(summary = "订单审核") + @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") public CommonResult orderPassReject(@RequestBody PurchaseorderReqVO reqVO) { return success(purchaseOrderService.orderPassReject(reqVO)); } @@ -198,6 +203,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { //根据订单id和方式获取上或下游订单 @PostMapping("/order-by-order-id-and-type") @Operation(summary = "根据订单id和方式获取上或下游订单") + @PreAuthorize("@ss.hasPermission('bse:purchase-order:query')") public CommonResult> getOrderByOrderIdAndType(@RequestBody DownOrUpOrderReqVO reqVO) { return success( purchaseOrderService.getOrderByOrderIdAndType(reqVO)); } @@ -205,6 +211,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { @PostMapping("/bound-order") @Operation(summary = "获取已绑定的订单") + @PreAuthorize("@ss.hasPermission('bse:purchase-order:query')") public CommonResult> boundOrder(@RequestBody DownOrUpOrderReqVO reqVO) { return success(purchaseOrderService.getBindOrderByOrder(reqVO)); } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java index 2ee17b3a..e4814558 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java @@ -143,6 +143,7 @@ public class SalesOrderController implements BusinessControllerMarker { //推送erp091 @PostMapping("/push-erp091") @Operation(summary = "推送erp091") + @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") public CommonResult pushErp091(@RequestBody @Validated @NotEmpty(message = "销售订单id不能为空") List ids) { ids.forEach(id -> salesOrderService.pushErp091(id)); return success(true); @@ -151,6 +152,7 @@ public class SalesOrderController implements BusinessControllerMarker { //提交审批 @PostMapping("/submit-order") @Operation(summary = "提交审批") + @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") public CommonResult submitOrder(@RequestParam("id") String id) { return success(salesOrderService.submitOrder(id)); } @@ -167,6 +169,7 @@ public class SalesOrderController implements BusinessControllerMarker { //提交审批 @PostMapping("/order-pass-reject") @Operation(summary = "订单审核") + @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") public CommonResult orderPassReject(@RequestBody SalesOrderReviewReqVO reqVO) { return success(salesOrderService.orderPassReject(reqVO)); } @@ -174,6 +177,7 @@ public class SalesOrderController implements BusinessControllerMarker { //关联订单 @PostMapping("/link-order") @Operation(summary = "关联订单") + @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") public CommonResult linkOrder(@RequestBody @Validated LinkOrderReqVO req) { return success(salesOrderService.linkOrder(req)); } @@ -181,6 +185,7 @@ public class SalesOrderController implements BusinessControllerMarker { //根据订单id和方式获取上或下游订单 @PostMapping("/order-by-order-id-and-type") @Operation(summary = "根据订单id和方式获取上或下游订单") + @PreAuthorize("@ss.hasPermission('bse:purchase-order:query')") public CommonResult> getOrderByOrderIdAndType(@RequestBody DownOrUpOrderReqVO reqVO) { return success(salesOrderService.getOrderByOrderIdAndType(reqVO)); } @@ -188,12 +193,14 @@ public class SalesOrderController implements BusinessControllerMarker { @PostMapping("/bound-order") @Operation(summary = "获取已绑定的订单") + @PreAuthorize("@ss.hasPermission('bse:purchase-order:query')") public CommonResult> boundOrder(@RequestBody DownOrUpOrderReqVO reqVO) { return success(salesOrderService.getBindOrderByOrder(reqVO)); } @PutMapping("/update-order-status") @Operation(summary = "批量修改订单状态", description = "sts取值于字典名称'销售订单状态',字典类型'PRCH_ORD_STS' 可以根据订单号和订单id修改") + @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") public CommonResult updateOrderStatus(@RequestBody @Validated OrderStsReqVO req) { salesOrderService.updateOrderStatusByIdOrOrderNo(req); return success(true); From 5a4d79449e976f732cc4c076f666998bb0eeba99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Thu, 20 Nov 2025 09:44:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseorder/PrchOrdDtlController.java | 14 ++++---- .../PurchaseOrderController.java | 36 +++++++++---------- .../salesorder/SalesOrderController.java | 16 ++++----- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PrchOrdDtlController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PrchOrdDtlController.java index 0754aa00..cb774569 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PrchOrdDtlController.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PrchOrdDtlController.java @@ -46,14 +46,14 @@ public class PrchOrdDtlController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建采购订单明细") - @PreAuthorize("@ss.hasPermission('bse:prch-ord-dtl:create')") + @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:create')") public CommonResult createPrchOrdDtl(@Valid @RequestBody PrchOrdDtlSaveReqVO createReqVO) { return success(prchOrdDtlService.createPrchOrdDtl(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新采购订单明细") - @PreAuthorize("@ss.hasPermission('bse:prch-ord-dtl:update')") + @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:update')") public CommonResult updatePrchOrdDtl(@Valid @RequestBody PrchOrdDtlSaveReqVO updateReqVO) { prchOrdDtlService.updatePrchOrdDtl(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除采购订单明细") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('bse:prch-ord-dtl:delete')") + @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:delete')") public CommonResult deletePrchOrdDtl(@RequestParam("id") Long id) { prchOrdDtlService.deletePrchOrdDtl(id); return success(true); @@ -71,7 +71,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除采购订单明细") - @PreAuthorize("@ss.hasPermission('bse:prch-ord-dtl:delete')") + @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:delete')") public CommonResult deletePrchOrdDtlList(@RequestBody BatchDeleteReqVO req) { prchOrdDtlService.deletePrchOrdDtlListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得采购订单明细") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('bse:prch-ord-dtl:query')") + @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:query')") public CommonResult getPrchOrdDtl(@RequestParam("id") Long id) { PrchOrdDtlDO prchOrdDtl = prchOrdDtlService.getPrchOrdDtl(id); return success(BeanUtils.toBean(prchOrdDtl, PrchOrdDtlRespVO.class)); @@ -88,7 +88,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得采购订单明细分页") - @PreAuthorize("@ss.hasPermission('bse:prch-ord-dtl:query')") + @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:query')") public CommonResult> getPrchOrdDtlPage(@Valid PrchOrdDtlPageReqVO pageReqVO) { PageResult pageResult = prchOrdDtlService.getPrchOrdDtlPage(pageReqVO); return success(BeanUtils.toBean(pageResult, PrchOrdDtlRespVO.class)); @@ -96,7 +96,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出采购订单明细 Excel") - @PreAuthorize("@ss.hasPermission('bse:prch-ord-dtl:export')") + @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:export')") @ApiAccessLog(operateType = EXPORT) public void exportPrchOrdDtlExcel(@Valid PrchOrdDtlPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java index 47f37e3d..dc9ff7bb 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java @@ -52,14 +52,14 @@ public class PurchaseOrderController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建采购订单") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:create')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:create')") public CommonResult createPurchaseOrder(@Valid @RequestBody PurchaseOrderSaveReqVO createReqVO) { return success(purchaseOrderService.createPurchaseOrder(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新采购订单") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:update')") public CommonResult updatePurchaseOrder(@Valid @RequestBody PurchaseOrderSaveReqVO updateReqVO) { purchaseOrderService.updatePurchaseOrder(updateReqVO); return success(true); @@ -68,7 +68,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除采购订单") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('bse:purchase-order:delete')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:delete')") public CommonResult deletePurchaseOrder(@RequestParam("id") Long id) { purchaseOrderService.deletePurchaseOrder(id); return success(true); @@ -77,7 +77,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除采购订单") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:delete')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:delete')") public CommonResult deletePurchaseOrderList(@RequestBody BatchDeleteReqVO req) { purchaseOrderService.deletePurchaseOrderListByIds(req.getIds()); return success(true); @@ -86,7 +86,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得采购订单") @Parameter(name = "id", description = "id是订单主键，splyBsnTp是订单类型采购或者是消费", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:query')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:query')") public CommonResult getPurchaseOrder(@RequestParam("id") Long id, @RequestParam(value = "splyBsnTp", required = false) String splyBsnTp) { PurchaseOrderDO purchaseOrder = purchaseOrderService.getPurchaseOrder(id, splyBsnTp); PurchaseOrderRespVO purchaseOrderRespVO = BeanUtils.toBean(purchaseOrder, PurchaseOrderRespVO.class); @@ -99,7 +99,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得采购订单分页") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:query')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:query')") public CommonResult> getPurchaseOrderPage(@Valid PurchaseOrderPageReqVO pageReqVO) { PageResult pageResult = purchaseOrderService.getPurchaseOrderPage(pageReqVO); PageResult purchaseOrderRespVOPageResult = BeanUtils.toBean(pageResult, PurchaseOrderRespVO.class); @@ -109,7 +109,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出采购订单 Excel") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:export')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:export')") @ApiAccessLog(operateType = EXPORT) public void exportPurchaseOrderExcel(@Valid PurchaseOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException { @@ -123,7 +123,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { //提交订单审核 @PostMapping("/submit-order") @Operation(summary = "提交订单审核") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:update')") public CommonResult submitOrder(@RequestParam("id") String id) { purchaseOrderService.submitOrder(Long.valueOf(id)); return success(true); @@ -131,7 +131,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { @PostMapping("/submit-order-batch") @Operation(summary = "批量提交订单审核") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:update')") public CommonResult submitOrder(@RequestBody @Validated @NotEmpty(message = "采购订单id不能为空") List ids) { System.out.println("ids:" + ids); ids.forEach(id -> purchaseOrderService.submitOrder(Long.valueOf(id))); @@ -141,7 +141,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { //提交ERP订单 @PostMapping("/submit-erp061") @Operation(summary = "推送ERP订单", description = "061')") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:update')") public CommonResult submitErp061(@RequestBody @Validated @NotEmpty(message = "采购订单id不能为空") List idsStr) { List ids = idsStr.stream().map(Long::valueOf).toList(); // todo 推送ERP订单 @@ -150,7 +150,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { @PostMapping("/submit-erp062") @Operation(summary = "推送ERP订单", description = "062当每次调更新接口后都需要调此接口") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:update')") public CommonResult submitErp062(@RequestParam @Validated @NotNull(message = "采购订单id不能为空") String id) { // todo 推送ERP订单 return success(purchaseOrderService.submitErp062(Long.valueOf(id))); @@ -159,7 +159,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { //通过订单号查询订单信息 @PostMapping("/get-order-by-order-no") @Operation(summary = "通过订单号查询订单信息", description = "通过订单号查询订单信息") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:query')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:query')") public CommonResult> getOrderByOrderNo(@RequestBody @Validated @NotEmpty(message = "采购订单不能为空") List orderNos) { return success(purchaseOrderService.getOrderByOrderNo(orderNos)); } @@ -167,7 +167,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { //根据订单id修改订单状态 @PutMapping("/update-order-status") @Operation(summary = "批量修改订单状态", description = "sts取值于字典名称'采购订单状态',字典类型'PRCH_ORD_STS' 可以根据订单号和订单id修改") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:update')") public CommonResult updateOrderStatus(@RequestBody @Validated OrderStsReqVO req) { purchaseOrderService.updateOrderStatusByIdOrOrderNo(req); return success(true); @@ -176,7 +176,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { //查询物料接口 @GetMapping("/material") @Operation(summary = "查询物料接口") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:query')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:query')") public CommonResult getMaterialList(@RequestParam @Schema(description = "采购订单号") @Validated @@ -188,14 +188,14 @@ public class PurchaseOrderController implements BusinessControllerMarker { //关联订单 @PostMapping("/link-order") @Operation(summary = "关联订单") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:update')") public CommonResult linkOrder(@RequestBody @Validated LinkOrderReqVO req) { return success(purchaseOrderService.linkOrder(req)); } @PostMapping("/order-pass-reject") @Operation(summary = "订单审核") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:update')") public CommonResult orderPassReject(@RequestBody PurchaseorderReqVO reqVO) { return success(purchaseOrderService.orderPassReject(reqVO)); } @@ -203,7 +203,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { //根据订单id和方式获取上或下游订单 @PostMapping("/order-by-order-id-and-type") @Operation(summary = "根据订单id和方式获取上或下游订单") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:query')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:query')") public CommonResult> getOrderByOrderIdAndType(@RequestBody DownOrUpOrderReqVO reqVO) { return success( purchaseOrderService.getOrderByOrderIdAndType(reqVO)); } @@ -211,7 +211,7 @@ public class PurchaseOrderController implements BusinessControllerMarker { @PostMapping("/bound-order") @Operation(summary = "获取已绑定的订单") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:query')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:query')") public CommonResult> boundOrder(@RequestBody DownOrUpOrderReqVO reqVO) { return success(purchaseOrderService.getBindOrderByOrder(reqVO)); } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java index e4814558..bc8d8a10 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java @@ -143,7 +143,7 @@ public class SalesOrderController implements BusinessControllerMarker { //推送erp091 @PostMapping("/push-erp091") @Operation(summary = "推送erp091") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:update')") public CommonResult pushErp091(@RequestBody @Validated @NotEmpty(message = "销售订单id不能为空") List ids) { ids.forEach(id -> salesOrderService.pushErp091(id)); return success(true); @@ -152,14 +152,14 @@ public class SalesOrderController implements BusinessControllerMarker { //提交审批 @PostMapping("/submit-order") @Operation(summary = "提交审批") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:update')") public CommonResult submitOrder(@RequestParam("id") String id) { return success(salesOrderService.submitOrder(id)); } @PostMapping("/submit-order-batch") @Operation(summary = "批量提交订单审核") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:update')") public CommonResult submitOrder(@RequestBody @Validated @NotEmpty(message = "销售订单id不能为空") List ids) { System.out.println("ids:" + ids); ids.forEach(id -> salesOrderService.submitOrder(id)); @@ -169,7 +169,7 @@ public class SalesOrderController implements BusinessControllerMarker { //提交审批 @PostMapping("/order-pass-reject") @Operation(summary = "订单审核") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:update')") public CommonResult orderPassReject(@RequestBody SalesOrderReviewReqVO reqVO) { return success(salesOrderService.orderPassReject(reqVO)); } @@ -177,7 +177,7 @@ public class SalesOrderController implements BusinessControllerMarker { //关联订单 @PostMapping("/link-order") @Operation(summary = "关联订单") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:update')") public CommonResult linkOrder(@RequestBody @Validated LinkOrderReqVO req) { return success(salesOrderService.linkOrder(req)); } @@ -185,7 +185,7 @@ public class SalesOrderController implements BusinessControllerMarker { //根据订单id和方式获取上或下游订单 @PostMapping("/order-by-order-id-and-type") @Operation(summary = "根据订单id和方式获取上或下游订单") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:query')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:query')") public CommonResult> getOrderByOrderIdAndType(@RequestBody DownOrUpOrderReqVO reqVO) { return success(salesOrderService.getOrderByOrderIdAndType(reqVO)); } @@ -193,14 +193,14 @@ public class SalesOrderController implements BusinessControllerMarker { @PostMapping("/bound-order") @Operation(summary = "获取已绑定的订单") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:query')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:query')") public CommonResult> boundOrder(@RequestBody DownOrUpOrderReqVO reqVO) { return success(salesOrderService.getBindOrderByOrder(reqVO)); } @PutMapping("/update-order-status") @Operation(summary = "批量修改订单状态", description = "sts取值于字典名称'销售订单状态',字典类型'PRCH_ORD_STS' 可以根据订单号和订单id修改") - @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')") + @PreAuthorize("@ss.hasPermission('base:purchase-order:update')") public CommonResult updateOrderStatus(@RequestBody @Validated OrderStsReqVO req) { salesOrderService.updateOrderStatusByIdOrOrderNo(req); return success(true); From b2c7ca399a094ffffde48ec998202b5104ea188b Mon Sep 17 00:00:00 2001 From: guojunyun Date: Thu, 20 Nov 2025 11:07:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=94=B6=E5=8F=91=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E6=8F=90=E4=BA=A4erp=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plat/module/erp/api/ErpBillMainApi.java | 5 + .../erp/api/dto/BillMainSubmitErpReqDTO.java | 176 ++++++++++++++++++ .../module/erp/api/ErpBillMainApiImpl.java | 6 + .../erp/service/erp/ErpBillMainService.java | 2 + .../service/erp/ErpBillMainServiceImpl.java | 62 ++++++ 5 files changed, 251 insertions(+) create mode 100644 zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/BillMainSubmitErpReqDTO.java diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpBillMainApi.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpBillMainApi.java index 1ececdd0..76b707b5 100644 --- a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpBillMainApi.java +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpBillMainApi.java @@ -1,5 +1,6 @@ package com.zt.plat.module.erp.api; +import com.zt.plat.module.erp.api.dto.BillMainSubmitErpReqDTO; import com.zt.plat.module.erp.api.dto.ErpBillMainSaveReqDTO; import com.zt.plat.module.erp.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; @@ -21,4 +22,8 @@ public interface ErpBillMainApi { @PostMapping(PREFIX + "/submit-bill-main-reverse") @Operation(summary = "冲销") String submitBillMainReverseToErp(@Valid @RequestBody ErpBillMainSaveReqDTO reqDTO); + + @PostMapping(PREFIX + "/submit/erp") + @Operation(summary = "erp数据提交") + String submitErp(@Valid @RequestBody BillMainSubmitErpReqDTO reqDTO); } diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/BillMainSubmitErpReqDTO.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/BillMainSubmitErpReqDTO.java new file mode 100644 index 00000000..f0ff6540 --- /dev/null +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/BillMainSubmitErpReqDTO.java @@ -0,0 +1,176 @@ +package com.zt.plat.module.erp.api.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 收发货单提交ERP Request DTO") +@Data +public class BillMainSubmitErpReqDTO { + @Schema(description = "接口编号") + private String funcnr; + + @Schema(description = "主键") + private Long id; + + @Schema(description = "类型(收货、发货、移库，字典: RECEIVING_SHIPPING_TYPE)") + private String type; + + @Schema(description = "订单号") + private String orderNo; + + @Schema(description = "订单明细主键") + private Long orderDetailId; + + @Schema(description = "收货单号;自动生成") + private String billNumber; + + @Schema(description = "实物物料编码") + private String materialCoding; + + @Schema(description = "实物物料名称") + private String materialName; + + @Schema(description = "实物收发货数量") + private BigDecimal materialQuantity; + + @Schema(description = "总干重") + private BigDecimal dryQuantity; + + @Schema(description = "实物计量单位") + private String materialUom; + + @Schema(description = "金属物料编码") + private String metalCoding; + + @Schema(description = "金属物料名称") + private String metalName; + + @Schema(description = "实际发货量") + private BigDecimal metalQuantity; + + @Schema(description = "金属计量单位") + private String metalUom; + + @Schema(description = "工厂名称") + private String factoryName; + + @Schema(description = "工厂编码") + private String factoryNumber; + + @Schema(description = "库位名称") + private String warehouseName; + + @Schema(description = "库位编码") + private String warehouseNumber; + + @Schema(description = "不含税总金额") + private BigDecimal notTaxAmount; + + @Schema(description = "含税总金额") + private BigDecimal inTaxAmount; + + @Schema(description = "总税额") + private BigDecimal taxAmount; + + @Schema(description = "付款比例") + private BigDecimal paymentRatio; + + @Schema(description = "实付总金额") + private BigDecimal relativityAmount; + + @Schema(description = "过账日期") + private LocalDateTime postingDate; + + @Schema(description = "客商编号") + private String customerNumber; + + @Schema(description = "客商名称") + private String customerName; + + @Schema(description = "订单类型") + private String orderType; + + @Schema(description = "订单分类(销售、采购、委托加工、来料加工，字典：SPLY_BSN_TP)") + private String businessType; + + @Schema(description = "状态（字典值RECEIVING_SHIPPING_STATUS ）") + private String status; + + @Schema(description = "小协议号") + private String agreementNumber; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "合同编码") + private String contractNumber; + + @Schema(description = "合同名称") + private String contractName; + + @Schema(description = "合同纸质合同号") + private String paperContractNumber; + + @Schema(description = "是否以金属结算(字典:ERP_CTRT_YN);根据订单类型判断，如果订单为原料，则默认\"是\"，如果是服务订单则不显示，默认为否。如铁精矿/烟尘") + private String isMetalSettlement; + + @Schema(description = "币种码") + private String currencyNumber; + + @Schema(description = "税码") + private String taxNumber; + + @Schema(description = "流程实例编号") + private String processInstanceId; + + @Schema(description = "审批意见") + private String reviewOpinion; + + @Schema(description = "任务节点主键") + private String taskNodeId; + + @Schema(description = "收发货方式(字典: RECEIVING_SHIPPING_WAY)") + private String way; + + @Schema(description = "总净重") + private BigDecimal wetQuantity; + + @Schema(description = "应该发货量") + private BigDecimal allQuantity; + + @Schema(description = "是否付款(字典: ERP_CTRT_YN)") + private String isPay; + + @Schema(description = "物料类型(原料、成品、服务，字典:SPLY_MTRL_TP)") + private String materialType; + + @Schema(description = "进厂开始日期") + private LocalDateTime intoStartDate; + + @Schema(description = "进厂结束日期") + private LocalDateTime intoEndDate; + + @Schema(description = "ERP订单号") + private String orderSapNumber; + + @Schema(description = "税率") + private BigDecimal taxRatio; + + @Schema(description = "收发货类型分类(字典: SND_OR_REC)") + private String isEstimate; + + @Schema(description = "品位类型(字典: GRADE_TYPE)") + private String gradeType; + + @Schema(description = "计量类型(字典：ASY_MTNG_TP)") + private String meteringType; + + @Schema(description = "是否货权转移(字典：ERP_CTRT_YN)") + private String isProductive; + + @Schema(description = "ERP状态(字典:BLL_ERP_STS)") + private String erpStatus; +} diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpBillMainApiImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpBillMainApiImpl.java index e225d658..5ec57dfb 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpBillMainApiImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpBillMainApiImpl.java @@ -1,6 +1,7 @@ package com.zt.plat.module.erp.api; import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.module.erp.api.dto.BillMainSubmitErpReqDTO; import com.zt.plat.module.erp.api.dto.ErpBillMainSaveReqDTO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpBillMainSaveReqVO; import com.zt.plat.module.erp.service.erp.ErpBillMainService; @@ -29,4 +30,9 @@ public class ErpBillMainApiImpl implements ErpBillMainApi{ ErpBillMainSaveReqVO erpBillMainSaveReqDTO = BeanUtils.toBean(reqDTO,ErpBillMainSaveReqVO.class); return erpBillMainService.submitBillMainReverseToErp(erpBillMainSaveReqDTO); } + + @Override + public String submitErp(BillMainSubmitErpReqDTO reqDTO) { + return erpBillMainService.submitErp(reqDTO); + } } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBillMainService.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBillMainService.java index f7cb72ca..8438e5b5 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBillMainService.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBillMainService.java @@ -1,8 +1,10 @@ package com.zt.plat.module.erp.service.erp; +import com.zt.plat.module.erp.api.dto.BillMainSubmitErpReqDTO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpBillMainSaveReqVO; public interface ErpBillMainService { String submitBillMainToErp(ErpBillMainSaveReqVO createVo); String submitBillMainReverseToErp(ErpBillMainSaveReqVO createVo); + String submitErp(BillMainSubmitErpReqDTO reqDTO); } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBillMainServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBillMainServiceImpl.java index ea310f68..5b89d904 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBillMainServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBillMainServiceImpl.java @@ -1,6 +1,7 @@ package com.zt.plat.module.erp.service.erp; import com.zt.plat.module.erp.api.ErpExternalApi; +import com.zt.plat.module.erp.api.dto.BillMainSubmitErpReqDTO; import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpBillMainSaveReqVO; import jakarta.annotation.Resource; @@ -62,6 +63,67 @@ public class ErpBillMainServiceImpl implements ErpBillMainService { return submitToErp(reqDTO); } + @Override + public String submitErp(BillMainSubmitErpReqDTO reqDTO) { + String res = null; + switch (reqDTO.getFuncnr()) { + case "095": + // TODO 暂时返回成功 + /*ErpSubmitReqDTO erpSubmitReqDTO = buildBaseReqDTO(createVo, reqDTO.getFuncnr()); + Map req = new HashMap<>(); + Map head = new HashMap<>(); + head.put("pstng_date", createVo.getPostingDate()); + head.put("doc_date", createVo.getPostingDate()); + head.put("header_txt", createVo.getRemark()); + head.put("bill_of_lading", ""); + req.put("head", head); + List> items = getMaps(createVo); + req.put("item", items); + erpSubmitReqDTO.setReq(req); + res = submitToErp(erpSubmitReqDTO);*/ + + res = "095"; + break; + case "071": + // TODO 暂时返回成功 + /*ErpSubmitReqDTO erpSubmitReqDTO = buildBaseReqDTO(createVo, reqDTO.getFuncnr()); + Map req = new HashMap<>(); + Map head = new HashMap<>(); + head.put("pstng_date", createVo.getPostingDate()); + head.put("doc_date", createVo.getPostingDate()); + head.put("header_txt", createVo.getRemark()); + head.put("bill_of_lading", ""); + req.put("head", head); + List> items = getMaps(createVo); + req.put("item", items); + erpSubmitReqDTO.setReq(req); + res = submitToErp(erpSubmitReqDTO);*/ + + res = "071"; + break; + case "093": + // TODO 暂时返回成功 + /*ErpSubmitReqDTO erpSubmitReqDTO = buildBaseReqDTO(createVo, reqDTO.getFuncnr()); + Map req = new HashMap<>(); + Map head = new HashMap<>(); + head.put("pstng_date", createVo.getPostingDate()); + head.put("doc_date", createVo.getPostingDate()); + head.put("header_txt", createVo.getRemark()); + head.put("bill_of_lading", ""); + req.put("head", head); + List> items = getMaps(createVo); + req.put("item", items); + erpSubmitReqDTO.setReq(req); + res = submitToErp(erpSubmitReqDTO);*/ + + res = "093"; + break; + default: + break; + } + return res; + } + // 抽取重复代码：构建基础 ErpSubmitReqDTO private ErpSubmitReqDTO buildBaseReqDTO(ErpBillMainSaveReqVO vo, String funcnr) { ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO(); From 584998b129fa4fcb6bc3ceba002ce6644e6f9d31 Mon Sep 17 00:00:00 2001 From: guojunyun Date: Thu, 20 Nov 2025 15:23:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?SZHGYL-289=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/contract/ContractServiceImpl.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index 5c8564ff..29d6b0ce 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -1191,11 +1191,11 @@ public class ContractServiceImpl implements ContractService { if (StringUtils.isNotEmpty(queryReqVO.getContractName()) || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) { contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber()); - } - // 未查询到相关合同 - if (CollectionUtils.isEmpty(contractIds)) { - return new PageResult<>(); + // 未查询到相关合同 + if (CollectionUtils.isEmpty(contractIds)) { + return new PageResult<>(); + } } // 分页查询 @@ -1218,11 +1218,11 @@ public class ContractServiceImpl implements ContractService { List contractIds = new ArrayList<>(); if (StringUtils.isNotEmpty(queryReqVO.getContractName()) || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) { contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber()); - } - // 未查询到相关合同 - if (CollectionUtils.isEmpty(contractIds)) { - return new PageResult<>(); + // 未查询到相关合同 + if (CollectionUtils.isEmpty(contractIds)) { + return new PageResult<>(); + } } // 分页查询 @@ -1245,11 +1245,11 @@ public class ContractServiceImpl implements ContractService { List contractIds = new ArrayList<>(); if (StringUtils.isNotEmpty(queryReqVO.getContractName()) || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) { contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber()); - } - // 未查询到相关合同 - if (CollectionUtils.isEmpty(contractIds)) { - return new PageResult<>(); + // 未查询到相关合同 + if (CollectionUtils.isEmpty(contractIds)) { + return new PageResult<>(); + } } // 分页查询