From 6fd5d255ffb664241ac081b6b09fc1cda32abd7f Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 07 五月 2025 15:46:36 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 1 + rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java index 0b302c0..c540374 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java @@ -94,6 +94,10 @@ @ApiModelProperty("鎵╁睍瀛楁绱㈠紩") private String fieldsIndex; + @ApiModelProperty("琛屽彿") + private String platItemId; + + @ApiModelProperty("鎵╁睍瀛楁") private Map<String, Object> extendFields; diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java index c275000..e3f9273 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java @@ -975,6 +975,7 @@ .setSplrBatch(asnOrderItem.getSplrBatch()) .setMatnr(asnOrderItem.getMatnrCode()) .setInspect(asnOrderItem.getIsptResult$()) //璐ㄦ缁撴灉 + .setPlatItemId(asnOrderItem.getPlatItemId()) ; Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId()); -- Gitblit v1.9.1