diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsDetailedEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsDetailedEntity.xml
index 4f777f23..865c254f 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsDetailedEntity.xml
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsDetailedEntity.xml
@@ -308,8 +308,8 @@
and refundedAt >= #{refundedAtStart}
-
- and refundedAt <= #{refunderAtEnd}
+
+ and refundedAt <= #{refundedAtEnd}
-- and sts='Y'
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
index 6ae50630..68156dcc 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
@@ -362,7 +362,8 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
returnGoodHeaderDetailsDataDtoArrayList = queryTocofsReturngoodsDetailed(tocofsReturngoodsDetailedEntity);
} else {
Assert.state(false, "未知的场景类型!");
- } logger.info("数据返回行数:{}", returnGoodHeaderDetailsDataDtoArrayList.size());
+ }
+ logger.info("数据返回行数:{}", returnGoodHeaderDetailsDataDtoArrayList.size());
if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() {
@Override
@@ -2902,10 +2903,8 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
//测试
// goodsRertunSonDetailsDto.setReceivedQty("1");
-
+
String receivedQty = goodsRertunSonDetailsDto.getReceivedQty();
- //TODO 测试
- receivedQty = "0";
Assert.notNull(receivedQty, "售后订单:{} 存货明细行:{} 请求数量不能为空!", header1.getCode(), goodsRertunSonDetailsDto.getId());
Assert.state(!"".equals(receivedQty), header1.getCode(), goodsRertunSonDetailsDto.getId());
if ("0".equals(new BigDecimal(receivedQty).stripTrailingZeros().toPlainString())) {
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java
index e04f399d..d80245aa 100644
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java
@@ -35,8 +35,8 @@ public class SoSaleReturnPluginInitializerToCTest {
public void startImplement() {
// soSaleReturnPluginInitializerToC.startImplement(null, null);
try {
- String code = "LETS-RE2024122300000847";
- soSaleReturnPluginInitializerToC.startImplementByCode(code, "stock");
+// String code = "LETS-RE2024122300000847";
+// soSaleReturnPluginInitializerToC.startImplementByCode(code, "tran");
} catch (Exception e) {
e.printStackTrace();
}
@@ -46,7 +46,7 @@ public class SoSaleReturnPluginInitializerToCTest {
try {
-// soSaleReturnPluginInitializerToC.startImplementStockByTime("2024-11-01 00:00:00", "2024-11-05 23:59:59");
+ soSaleReturnPluginInitializerToC.startImplementStockByTime("2024-12-24 16:02:17", "2024-12-24 16:02:17","0");
// JSONObject jsonObject = new JSONObject();
// soSaleReturnPluginInitializerToC.executeBusiness(jsonObject);
diff --git a/service/src/main/java/com/hzya/frame/ttxofs/dto/stock/StockinOrderSearchResponse.java b/service/src/main/java/com/hzya/frame/ttxofs/dto/stock/StockinOrderSearchResponse.java
index 39283af5..3f1fd797 100644
--- a/service/src/main/java/com/hzya/frame/ttxofs/dto/stock/StockinOrderSearchResponse.java
+++ b/service/src/main/java/com/hzya/frame/ttxofs/dto/stock/StockinOrderSearchResponse.java
@@ -71,6 +71,15 @@ public class StockinOrderSearchResponse extends ReturnMessageBasics {
private RerturnGoodsOrderSearchData rerturnGoodsOrderSearchData;//OFS售后订单
private com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDetailsDto headerDetailsDto;//OFS销售订单
private String modified;
+ private String shipFromAttentionTo;
+ private String shipFromAddress;
+ private String shipFromCountry;
+ private String shipFromState;
+ private String shipFromCity;
+ private String shipFromDistrict;
+ private String shipFromMobile;
+ private String returnWaybillCode;
+ private String returnCarrier;
}
@Data
@@ -116,6 +125,10 @@ public class StockinOrderSearchResponse extends ReturnMessageBasics {
* 计算公式
*/
private String def8;
+
+ private String sourceOrderCode;
+
+ private String sourceLineNum;
}
}
}