代码备份

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())

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<IoCodeTempResponse> list = codeTempService.findCodeList(filterCodeRequest);
+        for (IoCodeTempResponse ioSplitCodeResponse : list) {
+            if (StrUtil.isEmpty(ioSplitCodeResponse.getGgxh())) {
+                ioSplitCodeResponse.setGgxh(ioSplitCodeResponse.getBzgg());
+
+            }
+        }
         PageInfo<IoCodeTempResponse> pageInfo = new PageInfo<>(list);
         PageSimpleResponse<IoCodeTempResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());

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<IoOrderDetailCodeEntity> orderEntityList = ioOrderDetailCodeService.checkOrderList(orderId);
 
         List<IoOrderDetailCodeResponse> list = ioOrderDetailCodeService.getDetailCodeResponse(orderEntityList);
+        for (IoOrderDetailCodeResponse ioSplitCodeResponse : list) {
+            if (StrUtil.isEmpty(ioSplitCodeResponse.getSpec())) {
+                ioSplitCodeResponse.setSpec(ioSplitCodeResponse.getBzgg());
+
+            }
+        }
         PageSimpleResponse<IoOrderDetailCodeResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(Long.valueOf(list.size()));
         pageSimpleResponse.setList(list);