From 8d00ffe08a37369beedc0e8055bc92cd3ecbcee1 Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Tue, 21 May 2024 15:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=BC=96=E5=8F=B7=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf/service/impl/VoucherServiceImpl.java    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
index 5f55d0b6..d983b42c 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
@@ -629,11 +629,11 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
                 voucherVehicleService.saveOrUpdate(entitys);
             }
         }
-        if (StringUtil.isNotEmpty(entity.getIsSaleDeliveryVoucherSource())){
-            VoucherEntity voucherEntity = voucherMapper.selectById(entity.getIsSaleDeliveryVoucherSource());
-            voucherEntity.setIsSaleDeliveryVoucher("2");
-            voucherMapper.updateById(voucherEntity);
-        }
+//        if (StringUtil.isNotEmpty(entity.getIsSaleDeliveryVoucherSource())){
+//            VoucherEntity voucherEntity = voucherMapper.selectById(entity.getIsSaleDeliveryVoucherSource());
+//            voucherEntity.setIsSaleDeliveryVoucher("2");
+//            voucherMapper.updateById(voucherEntity);
+//        }
     }
 
     /**
@@ -650,6 +650,8 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
         voucherForm = JsonUtil.getJsonToBean(
                 generaterSwapUtil.swapDatetime(VoucherConstant.getFormData(),voucherForm),VoucherForm.class);
 
+        String code = generaterSwapUtil.getBillNumber("fhpz", false);
+        int num = 1;
         if (voucherForm.getVoucherProductBatchList()!=null && voucherForm.getVoucherProductBatchList().size()>0){
             List<VoucherProductEntity> tableField111 = JsonUtil.getJsonToList(voucherForm.getVoucherProductBatchList(),VoucherProductEntity.class);
             for(VoucherProductEntity entitys : tableField111){
@@ -658,7 +660,9 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
                 String mainId = RandomUtil.uuId() ;
                 entity.setId(mainId);
                 entity.setVersion(0);
-                entity.setVoucherCode(generaterSwapUtil.getBillNumber("fhpz", false));
+                String voucherCode =  code + "(" + num + ")";
+                num = num + 1;
+                entity.setVoucherCode(voucherCode);
                 entity.setPreparationTime(DateUtil.getNowDate());
                 entity.setPoundlistTime(DateUtil.getNowDate());
                 if (StringUtils.isEmpty(entity.getPoundCode())){