From f088f78338f6de19246c1b53c261c6b404cae7a4 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: Mon, 8 Dec 2025 17:07:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89sql=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=A0=E9=99=A4=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseOrderServiceImpl.java | 2 +- .../purchaseorder/PurchaseOrderMapper.xml | 1 + .../module/erp/api/ErpInvoiceRecheckApi.java | 19 +++++++++ .../erp/api/ErpInvoiceRecheckApiImpl.java | 28 +++++++++++++ .../service/erp/ErpInvoiceRecheckService.java | 9 ++++ .../erp/ErpInvoiceRecheckServiceImpl.java | 41 +++++++++++++++++++ 6 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApi.java create mode 100644 zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApiImpl.java create mode 100644 zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckService.java create mode 100644 zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckServiceImpl.java diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java index a078f9a5..63b1c627 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java @@ -690,7 +690,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { @Override public List getOrderByNos(List orderNos) { - return purchaseOrderMapper.selectList(PurchaseOrderDO::getSystemOrderNumber, orderNos); + return purchaseOrderMapper.selectList(PurchaseOrderDO::getSystemOrderNumber, orderNos,PurchaseOrderDO::getDeleted,0); } @Override diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/mapper/purchaseorder/PurchaseOrderMapper.xml b/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/mapper/purchaseorder/PurchaseOrderMapper.xml index 5966463b..2edd803d 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/mapper/purchaseorder/PurchaseOrderMapper.xml +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/mapper/purchaseorder/PurchaseOrderMapper.xml @@ -230,6 +230,7 @@ #{orderNumber} AND po.deleted=0 + AND pod.deleted=0 ORDER BY po.SYS_ORD_NUM, pod.LINE_NUM diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApi.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApi.java new file mode 100644 index 00000000..f220b12d --- /dev/null +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApi.java @@ -0,0 +1,19 @@ +package com.zt.plat.module.erp.api; + +import com.zt.plat.module.erp.enums.ApiConstants; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.HashMap; +import java.util.Map; +@FeignClient(name = ApiConstants.NAME) +@Tag(name = "RPC 服务 - ERP") +public interface ErpInvoiceRecheckApi { + String PREFIX = ApiConstants.PREFIX + "/erp-invoice-recheck"; + @PostMapping(PREFIX + "/submit082") + HashMap submit082(@RequestBody Map param); + @PostMapping(PREFIX + "/submit085") + HashMap submit085(@RequestBody Map param); +} diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApiImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApiImpl.java new file mode 100644 index 00000000..18309060 --- /dev/null +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApiImpl.java @@ -0,0 +1,28 @@ +package com.zt.plat.module.erp.api; + +import com.zt.plat.module.erp.service.erp.ErpInvoiceRecheckService; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.Map; + +@RestController +@Validated +@Slf4j +public class ErpInvoiceRecheckApiImpl implements ErpInvoiceRecheckApi{ + @Resource + private ErpInvoiceRecheckService erpInvoiceRecheckService; + + @Override + public HashMap submit082(Map param) { + return erpInvoiceRecheckService.submit082(param); + } + + @Override + public HashMap submit085(Map param) { + return erpInvoiceRecheckService.submit085(param); + } +} diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckService.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckService.java new file mode 100644 index 00000000..a00a8414 --- /dev/null +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckService.java @@ -0,0 +1,9 @@ +package com.zt.plat.module.erp.service.erp; + +import java.util.HashMap; +import java.util.Map; + +public interface ErpInvoiceRecheckService { + HashMap submit082(Map param); + HashMap submit085(Map param); +} diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckServiceImpl.java new file mode 100644 index 00000000..dd8d7ab5 --- /dev/null +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckServiceImpl.java @@ -0,0 +1,41 @@ +package com.zt.plat.module.erp.service.erp; + +import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils; +import com.zt.plat.module.erp.api.ErpExternalApi; +import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import java.util.HashMap; +import java.util.Map; + +@Service +@Validated +public class ErpInvoiceRecheckServiceImpl implements ErpInvoiceRecheckService { + @Resource + public ErpExternalApi erpExternalApi; + @Override + public HashMap submit082(Map param) { + ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO(); + reqDTO.setFuncnr("082"); + reqDTO.setBskey(param.get("id").toString()); + reqDTO.setUsrid(String.valueOf(SecurityFrameworkUtils.getLoginUserId())); + reqDTO.setUsrnm((SecurityFrameworkUtils.getLoginUserNickname())); + param.remove("id");//移除id字段 + reqDTO.setReq(param); + return erpExternalApi.submitDataToErp(reqDTO); + } + + @Override + public HashMap submit085(Map param) { + ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO(); + reqDTO.setFuncnr("085"); + reqDTO.setBskey(param.get("id").toString()); + reqDTO.setUsrid(String.valueOf(SecurityFrameworkUtils.getLoginUserId())); + reqDTO.setUsrnm((SecurityFrameworkUtils.getLoginUserNickname())); + param.remove("id"); + reqDTO.setReq(param); + return erpExternalApi.submitDataToErp(reqDTO); + } +}