From d9130440f17581dad293e003bbc38a0116d1d123 Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Tue, 11 Jun 2024 10:07:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E5=8F=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jnpf/service/impl/ReceiptOrderServiceImpl.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReceiptOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReceiptOrderServiceImpl.java
index 7e46be6f..c3439c70 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReceiptOrderServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReceiptOrderServiceImpl.java
@@ -62,6 +62,8 @@ public class ReceiptOrderServiceImpl extends ServiceImpl<ReceiptOrderMapper, Rec
     private VoucherMapper voucherMapper;
     @Autowired
     private ProductWarehouseService productWarehouseService;
+    @Autowired
+    private BusinessCargoService businessCargoService;
     @Override
     public List<ReceiptOrderEntity> getList(ReceiptOrderPagination receiptOrderPagination){
         return getTypeList(receiptOrderPagination,receiptOrderPagination.getDataType());
@@ -500,8 +502,9 @@ public class ReceiptOrderServiceImpl extends ServiceImpl<ReceiptOrderMapper, Rec
                 entitys.setOrderId(entity.getId());
                 if(isSave && entity.getReceiptType().equals("1")){
                     ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getInfo(entitys.getProductId());
-                    if (ObjectUtil.isNotEmpty(productWarehouseEntity) && productWarehouseEntity.getInventoryType().equals("1")){
-                        entitys.setBatchNo(productWarehouseEntity.getCode());
+                    BusinessCargoEntity businessCargoEntity = businessCargoService.getById(entitys.getCargoId());
+                    if (ObjectUtil.isNotEmpty(productWarehouseEntity) && productWarehouseEntity.getInventoryType().equals("1") && ObjectUtil.isNotEmpty(businessCargoEntity)){
+                        entitys.setBatchNo(businessCargoEntity.getId());
                     }else {
                         entitys.setBatchNo(generaterSwapUtil.getBillNumber("batch", false));
                     }