diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java index 42f7b984f..6d2e33a92 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java @@ -10,11 +10,17 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.collect.IoCollectCodeBackup; import com.glxp.api.entity.collect.IoCollectOrder; +import com.glxp.api.req.collect.CollectOrderCodeAutoRequest; +import com.glxp.api.req.collect.CollectOrderCodeManRequest; import com.glxp.api.req.collect.IoCollectCodeRequest; import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.collect.CollectOrderCodeAutoResponse; +import com.glxp.api.res.collect.CollectOrderCodeManResponse; import com.glxp.api.res.collect.IoCollectCodeResponse; import com.glxp.api.service.collect.IoCollectCodeBackService; +import com.glxp.api.service.collect.IoCollectOrderCodeAutoService; +import com.glxp.api.service.collect.IoCollectOrderCodeManService; import com.glxp.api.service.collect.IoCollectOrderService; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.BindingResult; @@ -40,6 +46,12 @@ public class IoCollectCodeBackupController extends BaseController { @Resource IoCollectOrderService collectOrderService; + @Resource + IoCollectOrderCodeAutoService ioCollectOrderCodeAutoService; + + @Resource + IoCollectOrderCodeManService ioCollectOrderCodeManService; + /** * 追溯码备份查询 */ @@ -107,6 +119,25 @@ public class IoCollectCodeBackupController extends BaseController { @GetMapping("/udiwms/basic/collect/ioCollectCode/endList") public BaseResponse filterList(IoCollectCodeRequest request) { List ioCollectCodeResponses = ioCollectCodeBackService.filterList(request); + for (IoCollectCodeResponse ioCollectCodeResponse : ioCollectCodeResponses){ + CollectOrderCodeAutoRequest collectOrderCodeAutoRequest = new CollectOrderCodeAutoRequest(); + collectOrderCodeAutoRequest.setOrderIdFk(request.getBillNo()); + collectOrderCodeAutoRequest.setUdiCode(ioCollectCodeResponse.getCode()); + List collectOrderCodeAutoResponses = ioCollectOrderCodeAutoService.filterList(collectOrderCodeAutoRequest); + if (collectOrderCodeAutoResponses.size() >0){ + CollectOrderCodeAutoResponse collectOrderCodeAutoResponse = collectOrderCodeAutoResponses.get(0); + ioCollectCodeResponse.setSerialNo(collectOrderCodeAutoResponse.getSerialNo()); + }else { + CollectOrderCodeManRequest collectOrderCodeManRequest = new CollectOrderCodeManRequest(); + collectOrderCodeManRequest.setUdiCode(ioCollectCodeResponse.getCode()); + collectOrderCodeManRequest.setOrderIdFk(request.getBillNo()); + List collectOrderCodeManResponses = ioCollectOrderCodeManService.filterList(collectOrderCodeManRequest); + if (collectOrderCodeManResponses.size() > 0){ + CollectOrderCodeManResponse collectOrderCodeManResponse = collectOrderCodeManResponses.get(0); + ioCollectCodeResponse.setSerialNo(collectOrderCodeManResponse.getSerialNo()); + } + } + } PageInfo pageInfo = new PageInfo<>(ioCollectCodeResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java index e3689d33c..5a3e3d001 100644 --- a/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java +++ b/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java @@ -109,5 +109,6 @@ public class IoCollectCodeResponse { private String batchNo; private String productDate; private String expireDate; + private String serialNo; private Integer scanActCount; } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java index 4d44a4864..0af47f089 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java @@ -38,6 +38,7 @@ public class IoCollectCodeBackService extends ServiceImpl