diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java index b74997dd2..c9356ec92 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java @@ -139,6 +139,8 @@ public class IoCollectOrderCodeManController extends BaseController { .tagStatus(1) .build(); collectOrderService.save(collectOrder); + } else { + collectOrder = collectOrderService.getByBillNo(addTagCodeReqeust.getBillNo()); } //直接扫码单生成业务单 @@ -312,7 +314,7 @@ public class IoCollectOrderCodeManController extends BaseController { } UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0); return IoCollectOrderBiz.builder() - .relId(udiRelevanceResponse.getRelId()) + .relId(udiRelevanceResponse.getId()) .thrCode(udiRelevanceResponse.getMainId()) .ybbm(udiRelevanceResponse.getYbbm()) .payFeeCode(udiRelevanceResponse.getPayFeeCode()) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 6fe3e9584..e576c505f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -5,6 +5,7 @@ import com.glxp.api.constant.*; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.exception.JsonException; +import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.impl.InvProductDetailService; import org.springframework.beans.BeanUtils; @@ -1126,6 +1127,7 @@ public class IoCodeTempController extends BaseController { codeEnttity.setPreSpaceCode(addOrderRequest.getPreCurSpaceCode()); codeEnttity.setPreInSpaceCode(addOrderRequest.getCheckPreInSpaceCode()); codeEnttity.setRelId(addOrderRequest.getRelId()); + codeEnttity.setFifoSplit(addOrderRequest.getFifoSplit()); codeEnttity.setProductType(2); codeEnttity.setCount(1); String unitFk = null; @@ -1576,6 +1578,12 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, "单据号不能为空!"); } List list = codeTempService.findCodeList(filterCodeRequest); + for (IoCodeTempResponse ioSplitCodeResponse : list) { + if (StrUtil.isEmpty(ioSplitCodeResponse.getGgxh())) { + ioSplitCodeResponse.setGgxh(ioSplitCodeResponse.getBzgg()); + + } + } PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java index 844f34923..2a085d7a5 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.inout; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -49,6 +50,12 @@ public class IoOrderDetailCodeController { List orderEntityList = ioOrderDetailCodeService.checkOrderList(orderId); List list = ioOrderDetailCodeService.getDetailCodeResponse(orderEntityList); + for (IoOrderDetailCodeResponse ioSplitCodeResponse : list) { + if (StrUtil.isEmpty(ioSplitCodeResponse.getSpec())) { + ioSplitCodeResponse.setSpec(ioSplitCodeResponse.getBzgg()); + + } + } PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(Long.valueOf(list.size())); pageSimpleResponse.setList(list);