From b5f1ede6b8c69d1454548c7c5a1751d7add39329 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Thu, 10 Apr 2025 10:02:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(purchase):=20=E8=BF=87=E6=BB=A4=E5=AE=9E?= =?UTF-8?q?=E5=8F=91=E6=95=B0=E9=87=8F=E4=B8=BA0=E7=9A=84=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ConsignmachiningCinfurmIn、ProxyPurchaseWarehousOrder 和 ProxyPurchaseWarehousWarehouse 类中添加过滤逻辑- 过滤掉实发数量为0的明细行，避免生成无效的采购订单 - 更新数据库密码配置 - 调整测试用例，使用新的采购订单代码 --- .../outsourc/ConsignmachiningCinfurmIn.java | 6 + .../purchase/ProxyPurchaseWarehousOrder.java | 5 + .../ProxyPurchaseWarehousWarehouse.java | 5 + .../src/main/resources/application-lets.yml | 2 +- .../ProxyPurchaseWarehousOrderTest.java | 2 +- .../ProxyPurchaseWarehousWarehouseTest.java | 2 +- .../test/java/com/hzya/frame/temButtom.java | 104 +++++++++--------- 7 files changed, 71 insertions(+), 55 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningCinfurmIn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningCinfurmIn.java index 67cf30eb..7901aa7d 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningCinfurmIn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningCinfurmIn.java @@ -470,6 +470,12 @@ public class ConsignmachiningCinfurmIn extends PluginBaseEntity { List consignmachiningInBodyDtoArrayList = new ArrayList<>(); for (int j = 0; j < details.size(); j++) { OFSReceiptConfirmSearchResponse.Detail detail = details.get(j); + + //如果明细行的实发数量为0则过滤掉 + if ("0".equals(new BigDecimal(detail.getReceivedQty()).stripTrailingZeros().toPlainString())) { + continue; + } + //匹配U8C采购订单明细行 ScOrderBEntity u8cPoOrderDetail = findOfsPoOrderDetailAndU8cPoOrderDetail(detail, stockinOrder, ofsPoOrderData, scOrderBEntityList); //通过O采购订单入库单明细行，联查OFS采购入库单明细行 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java index 6c72bd54..54ffd971 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java @@ -514,6 +514,11 @@ public class ProxyPurchaseWarehousOrder extends PluginBaseEntity { for (int j = 0; j < details.size(); j++) { OfsPoOrderDetails ofsPoOrderDetails = details.get(j); + //如果明细行的实发数量为0则过滤掉 +// if ("0".equals(new BigDecimal(ofsPoOrderDetails.getRequestQty()).stripTrailingZeros().toPlainString())) { +// continue; +// } + //2024年8月20日 16:02:21 已经和妮姐、万万确认，采购公司和收货公司目前是一致的，暂时不用区分取数逻辑 BdInvmandocEntity bdInvmandocEntity = queryInventoryMan(ofsPoOrderDetails, bdCorpEntity.getPkCorp()); String receivedQty = ofsPoOrderDetails.getRequestQty();//请求数量 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java index 71b83cdb..977142bc 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java @@ -511,6 +511,11 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { for (int j = 0; j < details.size(); j++) { OFSReceiptConfirmSearchResponse.Detail detail = details.get(j); + + if ("0".equals(new BigDecimal(detail.getReceivedQty()).stripTrailingZeros().toPlainString())) { + continue; + } + //OFS采购订单明细行 OfsPoOrderDetails ofsPoOrderDetail = findOfsPoOrderDetail(ofsPoOrderDataDetails, detail); //U8C采购订单明细行 diff --git a/buildpackage/src/main/resources/application-lets.yml b/buildpackage/src/main/resources/application-lets.yml index aca056ec..6107e8de 100644 --- a/buildpackage/src/main/resources/application-lets.yml +++ b/buildpackage/src/main/resources/application-lets.yml @@ -14,7 +14,7 @@ spring: master: url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=600000000&socketTimeout=600000000&autoReconnectForPools=true&keepAlive=true username: root - password: 62e4295b615a30dbf3b8ee96f41c820b + password: bd993088e8a7c3dc5f44441617f9b4bf driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 savefile: # 文件保存路径 diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java index fff9e817..9f5e8b26 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java @@ -27,7 +27,7 @@ public class ProxyPurchaseWarehousOrderTest { @Test public void startImplementByCode() { try { - proxyPurchaseWarehousOrder.startImplementByCode("LETS-PO2025032500000001"); + proxyPurchaseWarehousOrder.startImplementByCode("LETS-RE2025040300001802-confirm"); // proxyPurchaseWarehousOrder.startImplementByTime("2025-01-21 17:38:26", "2025-01-21 17:38:26"); } catch (Exception e) { e.printStackTrace(); diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java index 3b0bce0c..8e6dad2d 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java @@ -28,7 +28,7 @@ public class ProxyPurchaseWarehousWarehouseTest { public void startImplementByCode() { // proxyPurchaseWarehousWarehouse.startImplementByCode("LETS-RE2025030400002125-confirm"); - String code = "LETS-RE2025022800002706-confirm"; + String code = "LETS-RE2025040300001802-confirm"; proxyPurchaseWarehousWarehouse.startImplementByCode(code); } } \ No newline at end of file diff --git a/buildpackage/src/test/java/com/hzya/frame/temButtom.java b/buildpackage/src/test/java/com/hzya/frame/temButtom.java index cffbcd54..56715658 100644 --- a/buildpackage/src/test/java/com/hzya/frame/temButtom.java +++ b/buildpackage/src/test/java/com/hzya/frame/temButtom.java @@ -1,46 +1,46 @@ -//package com.hzya.frame; -// -//import cn.hutool.core.convert.Convert; -//import cn.hutool.http.HttpRequest; -//import com.alibaba.fastjson.JSON; -//import com.alibaba.fastjson.JSONObject; -//import com.baomidou.dynamic.datasource.annotation.DS; -//import com.hzya.frame.cbs8.dto.req.PayRequestDTO; -//import com.hzya.frame.cbs8.dto.req.PayResultRequestDTO; -//import com.hzya.frame.cbs8.dto.res.PayResultResDTO; -//import com.hzya.frame.cbs8.service.ICbs8ExtService; -//import com.hzya.frame.cbs8.service.ICbs8Service; -//import com.hzya.frame.cbs8.util.CBSUtil; -//import com.hzya.frame.cbs8.util.CbsAccessToken; +package com.hzya.frame; + +import cn.hutool.core.convert.Convert; +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.cbs8.dto.req.PayRequestDTO; +import com.hzya.frame.cbs8.dto.req.PayResultRequestDTO; +import com.hzya.frame.cbs8.dto.res.PayResultResDTO; +import com.hzya.frame.cbs8.service.ICbs8ExtService; +import com.hzya.frame.cbs8.service.ICbs8Service; +import com.hzya.frame.cbs8.util.CBSUtil; +import com.hzya.frame.cbs8.util.CbsAccessToken; //import com.hzya.frame.plugin.cbs8.plugin.PayApplyPluginInitializer; //import com.hzya.frame.plugin.cbs8.plugin.PayResultPluginInitializer; //import com.hzya.frame.plugin.cbs8.plugin.TransactionDetailPluginInitializer; //import com.hzya.frame.plugin.seeyonExt.plugin.SeeyonExtPluginInitializer; -//import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; -//import com.hzya.frame.seeyon.cbs8.service.IPaymentService; -//import com.hzya.frame.stringutil.StringUtil; -//import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; -//import com.hzya.frame.util.AESUtil; -//import org.apache.http.protocol.HTTP; -//import org.junit.Test; -//import org.junit.runner.RunWith; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.boot.test.context.SpringBootTest; -//import org.springframework.test.context.junit4.SpringRunner; -// -//import javax.annotation.Resource; -//import java.util.*; -// -///** -// * @ClassName dsasas -// * @Description -// * @Author llg -// * Date 2023/7/16 8:18 上午 -// */ +import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; +import com.hzya.frame.seeyon.cbs8.service.IPaymentService; +import com.hzya.frame.stringutil.StringUtil; +import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; +import com.hzya.frame.util.AESUtil; +import org.apache.http.protocol.HTTP; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import javax.annotation.Resource; +import java.util.*; + +/** + * @ClassName dsasas + * @Description + * @Author llg + * Date 2023/7/16 8:18 上午 + */ //@RunWith(SpringRunner.class) //@SpringBootTest(classes = {WebappApplication.class}) -//public class temButtom { -// +public class temButtom { + // @Resource // SeeyonExtPluginInitializer seeyonExtPluginInitializer; // @Resource @@ -56,7 +56,7 @@ // private TransactionDetailPluginInitializer transactionDetailPluginInitializer; // @Autowired // private PayResultPluginInitializer payResultPluginInitializer; -// + // @Test // public void cbs8PluginTest(){ // try { @@ -96,7 +96,7 @@ // List cl202406140002 = cs8Service.queryPayResult(new PayResultRequestDTO("CL202406140002")); // System.out.println("111"); // } -// + // @Test // public void cbs8ExtTest(){ // PaymentEntity paymentEntity = new PaymentEntity(); @@ -164,16 +164,16 @@ // throw new RuntimeException(e); // } // } -// -// @Test -// public void test01() { -// String a = AESUtil.encrypt("hzya@1314"); -// System.out.println(a); -// String b = AESUtil.decrypt("62e4295b615a30dbf3b8ee96f41c820b"); -// System.out.println(b); -// } -// -// -// -// -//} + + @Test + public void test01() { + String a = AESUtil.encrypt("hzya1314"); + System.out.println(a); + String b = AESUtil.decrypt("62e4295b615a30dbf3b8ee96f41c820b"); + System.out.println(b); + } + + + + +}