From de40d5c90cdc1ebbce62c96b679fe99ed60132ed Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 25 Apr 2024 13:55:42 +0800
Subject: [PATCH] md

---
 .../service/impl/EmisWaybillServiceImpl.java    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 4fe721fc8..b88738026 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -170,10 +170,13 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
         if(emisWaybill==null){
             return null;
         }
+        WaybillOrder waybillOrder = new WaybillOrder();
+
+        // 忽略复制过程中出现的错误
+        CopyOptions options = CopyOptions.create().setIgnoreError(true);
 
         // 基础信息
-        WaybillOrder waybillOrder = new WaybillOrder();
-        waybillOrder.setBillCode(billCode);
+        BeanUtil.copyProperties(emisWaybill,waybillOrder,options);
 
         // 收件人
         Reciever reciever = new Reciever();
@@ -202,9 +205,7 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
         sender.setCompany(emisWaybill.getSendCompany());
         waybillOrder.setSender(sender);
 
-        // 忽略复制过程中出现的错误
-        CopyOptions options = CopyOptions.create()
-                .setIgnoreError(true);
+
 
         // 收费项 // 查询收费项
         List<FeeItem> feeItems = new ArrayList<>();
@@ -213,7 +214,7 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
         List<EmisWaybillFeeitem> listFeeItem=emisWaybillFeeitemMapper.selectEmisWaybillFeeitemList(queryFeeitem);
         for (EmisWaybillFeeitem feeItem:listFeeItem) {
             FeeItem item = new FeeItem();
-            BeanUtil.copyProperties(item,feeItem,options);
+            BeanUtil.copyProperties(feeItem,item,options);
             feeItems.add(item);
         }
         waybillOrder.setFeeItems(feeItems);
@@ -226,7 +227,7 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
         List<EmisWaybillCargo> listCargo=emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo);
         for (EmisWaybillCargo cargoItem:listCargo) {
             Cargo item = new Cargo();
-            BeanUtil.copyProperties(item,cargoItem,options);
+            BeanUtil.copyProperties(cargoItem,item,options);
             cargoList.add(item);
         }
 
@@ -239,7 +240,7 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
         List<EmisWaybillAttachment> listAttachment=emisWaybillAttachmentMapper.selectEmisWaybillAttachmentList(queryAttachment);
         for (EmisWaybillAttachment attachmentItem:listAttachment) {
             Attachment item = new Attachment();
-            BeanUtil.copyProperties(item,attachmentItem,options);
+            BeanUtil.copyProperties(attachmentItem,item,options);
             attachmentList.add(item);
         }
         waybillOrder.setAttachmentList(attachmentList);