From 01b144d4f71feb5ca149a8788321bc830310bedb Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:31:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=9B=B4=E6=96=B0=E5=92=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 文档中增加了关于字符串、字节和void数据类型的信息，完善了NumPy文档的常规介绍部分。- 解决了由于SQL查询中参数顺序错误导致的用户创建操作失败的问题，现在UUID可以正确分配给新用户记录。 -调整了EntityClass中的重新加载机制，以遵循`flush`参数，防止在刷新时刷新新实体。 - 代码库中进行了各种清理，包括使代码与规范一致、注释更新和移除未使用代码。 --- .../plugin/lets/plugin/outsourc/ConsignmachiningIn.java | 2 +- .../lets/plugin/outsourc/ConsignmachiningInReturn.java | 2 +- .../plugin/lets/plugin/purchase/ProxyPurchaseReturn.java | 6 +++--- .../lets/plugin/purchase/ProxyPurchaseWarehousOrder.java | 4 ++-- .../plugin/purchase/ProxyPurchaseWarehousWarehouse.java | 4 ++-- .../hzya/frame/ttxofs/dto/ofspoorder/OfsPoOrderHeader.java | 1 + .../RerturnGoodsOrderSearchDetails.java | 2 ++ 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java index a7a7501d..e80ca82c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java @@ -33,7 +33,7 @@ import java.math.BigDecimal; import java.util.*; /** - * O采购入库 -> U8C委外加工入库 + * O采购入库->U8C委外加工入库 * * @Author：liuyang * @Package：com.hzya.frame.plugin.lets.plugin.outsourc diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java index 865c1288..b94f73a0 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java @@ -38,7 +38,7 @@ import java.math.BigDecimal; import java.util.*; /** - * O采退出库 -> (关联之前正向的委外订单)U8C红字委外入库单 + * O采退出库->(关联之前正向的委外订单)U8C红字委外入库单 * * @Author：liuyang * @Package：com.hzya.frame.plugin.lets.plugin.outsourc diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java index 2b40fefa..8e086049 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java @@ -439,9 +439,9 @@ public class ProxyPurchaseReturn extends PluginBaseEntity { DetailsDto detailsDto = details.get(j); PurchaseReturnOrderDetails ofsPoOrderDetail = findOfsPoOrderDetail(details1, detailsDto); - //TODO 测试 - detailsDto.setShipQty("1"); - ofsPoOrderDetail.setFulfillAmount("10"); + //测试 +// detailsDto.setShipQty("1"); +// ofsPoOrderDetail.setFulfillAmount("10"); //2024年8月20日 16:02:21 已经和妮姐、万万确认，采购公司和收货公司目前是一致的，暂时不用区分取数逻辑 BdInvmandocEntity bdInvmandocEntity = queryInventoryMan(detailsDto, bdCorpEntity.getPkCorp()); 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 37dc2da6..3fec2a36 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 @@ -595,8 +595,8 @@ public class ProxyPurchaseWarehousOrder extends PluginBaseEntity { //2024年8月20日 14:47:55 丽知商城、OFS 供应商客商档案、传递到U8C的客商， //其中自定义项1作为原系统编码，因此统一传到自定义项一，已经和大家确认好了，没有关系的，放心大胆传吧，宝贝 String shipFromCode = header.getVendorName(); - //TODO 测试 - shipFromCode = "dy-off"; + //测试 +// shipFromCode = "dy-off"; Assert.notNull(shipFromCode, "O供应商编码不能为空，没有办法完成业务逻辑，请配置供应商编码(采购)"); Assert.state(!"".equals(shipFromCode.trim()), "O供应商编码不能为空，没有办法完成业务逻辑，请配置供应商编码(采购)！"); BdCubasdocEntity bdCubasdocEntity = new BdCubasdocEntity(); 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 97bf9ab8..056a1086 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 @@ -619,8 +619,8 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { //2024年8月20日 14:47:55 丽知商城、OFS 供应商客商档案、传递到U8C的客商， //其中自定义项1作为原系统编码，因此统一传到自定义项一，已经和大家确认好了，没有关系的，放心大胆传吧，宝贝 String shipFromCode = header.getShipFromCode(); - //TODO 测试 - shipFromCode = "dy-off"; + //测试 +// shipFromCode = "dy-off"; Assert.notNull(shipFromCode, "O供应商编码不能为空，没有办法完成业务逻辑，请配置供应商编码(采购)"); Assert.state(!"".equals(shipFromCode.trim()), "O供应商编码不能为空，没有办法完成业务逻辑，请配置供应商编码(采购)！"); BdCubasdocEntity bdCubasdocEntity = new BdCubasdocEntity(); diff --git a/service/src/main/java/com/hzya/frame/ttxofs/dto/ofspoorder/OfsPoOrderHeader.java b/service/src/main/java/com/hzya/frame/ttxofs/dto/ofspoorder/OfsPoOrderHeader.java index aefbde68..63908180 100644 --- a/service/src/main/java/com/hzya/frame/ttxofs/dto/ofspoorder/OfsPoOrderHeader.java +++ b/service/src/main/java/com/hzya/frame/ttxofs/dto/ofspoorder/OfsPoOrderHeader.java @@ -13,6 +13,7 @@ public class OfsPoOrderHeader { private String bizChannel; private String sourceAsnCode; private String status; + private String vendorCode; private String vendorName; private String shipFromAttentionTo; private String shipFromCountry; diff --git a/service/src/main/java/com/hzya/frame/ttxofs/dto/returngoodordersearch/RerturnGoodsOrderSearchDetails.java b/service/src/main/java/com/hzya/frame/ttxofs/dto/returngoodordersearch/RerturnGoodsOrderSearchDetails.java index 31530862..b9f00121 100755 --- a/service/src/main/java/com/hzya/frame/ttxofs/dto/returngoodordersearch/RerturnGoodsOrderSearchDetails.java +++ b/service/src/main/java/com/hzya/frame/ttxofs/dto/returngoodordersearch/RerturnGoodsOrderSearchDetails.java @@ -5,6 +5,8 @@ package com.hzya.frame.ttxofs.dto.returngoodordersearch; import lombok.Data; +import java.math.BigDecimal; + /** * Auto-generated: 2024-08-19 11:31:49 *