From 2ee0da858111c2fc3e7ba3cdc2c7f1431f338cdc Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 28 Apr 2024 05:51:18 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/domain/vo/Attachment.java | 11 +++++-----
 .../com/xdadan/erp/emis/domain/vo/Cargo.java  |  6 +++---
 .../xdadan/erp/emis/domain/vo/FeeItem.java    |  8 +++----
 .../com/xdadan/erp/emis/domain/vo/VoBase.java | 10 ++++-----
 .../erp/emis/domain/vo/WaybillOrder.java      | 21 ++++++++++++-------
 .../service/impl/EmisWaybillServiceImpl.java  |  2 +-
 6 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Attachment.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Attachment.java
index 08436a88a..ba7d98edd 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Attachment.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Attachment.java
@@ -1,15 +1,13 @@
 package com.xdadan.erp.emis.domain.vo;
 
 import com.xdadan.erp.emis.domain.EmisWaybillAttachment;
-import com.xdadan.erp.emis.domain.EmisWaybillCargo;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.util.List;
 
 
 @Data
-public class Attachment extends VoBase<EmisWaybillAttachment,Attachment> implements Serializable {
+public class Attachment extends VoBase<EmisWaybillAttachment,Attachment> {
 
     private static final long serialVersionUID = 1L;
 
@@ -49,6 +47,7 @@ public class Attachment extends VoBase<EmisWaybillAttachment,Attachment> impleme
         return voItem;
     }
 
+
     @Override
     public  EmisWaybillAttachment toDb(Attachment voItem){
         EmisWaybillAttachment dbItem = new EmisWaybillAttachment();
@@ -68,11 +67,11 @@ public class Attachment extends VoBase<EmisWaybillAttachment,Attachment> impleme
         return dbItem;
     }
 
-    public static List<EmisWaybillAttachment> toDBList(List<Attachment> voList){
-        return toDBList(voList);
+    public List<EmisWaybillAttachment> cvtToDbList(List<Attachment> voList){
+        return toDbList(voList);
     }
 
-    public static List<Attachment> toVoList(List<EmisWaybillAttachment> dbList){
+    public  List<Attachment> cvtToVoList(List<EmisWaybillAttachment> dbList){
         return toVoList(dbList);
     }
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Cargo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Cargo.java
index a13e3d802..9e6382d84 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Cargo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Cargo.java
@@ -152,11 +152,11 @@ public class Cargo extends VoBase<EmisWaybillCargo,Cargo> implements Serializabl
         return dbItem;
     }
 
-    public static List<EmisWaybillCargo> toDBList(List<Cargo> voList){
-        return toDBList(voList);
+    public  List<EmisWaybillCargo> cvtToDbList(List<Cargo> voList){
+        return toDbList(voList);
     }
 
-    public static List<Cargo> toVoList(List<EmisWaybillCargo> dbList){
+    public  List<Cargo> cvtToVoList(List<EmisWaybillCargo> dbList){
         return toVoList(dbList);
     }
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java
index 2c26ee54b..55a201e81 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java
@@ -1,7 +1,5 @@
 package com.xdadan.erp.emis.domain.vo;
 
-import com.xdadan.erp.emis.domain.EmisWaybillAttachment;
-import com.xdadan.erp.emis.domain.EmisWaybillCargo;
 import com.xdadan.erp.emis.domain.EmisWaybillFeeitem;
 import lombok.Data;
 
@@ -63,11 +61,11 @@ public class FeeItem extends VoBase<EmisWaybillFeeitem,FeeItem> {
         return dbItem;
     }
 
-    public static List<EmisWaybillFeeitem> toDBList(List<FeeItem> voList){
-        return toDBList(voList);
+    public  List<EmisWaybillFeeitem> cvtToDbList(List<FeeItem> voList){
+        return toDbList(voList);
     }
 
-    public static List<FeeItem> toVoList(List<EmisWaybillFeeitem> dbList){
+    public  List<FeeItem> cvtToVoList(List<EmisWaybillFeeitem> dbList){
         return toVoList(dbList);
     }
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/VoBase.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/VoBase.java
index e3514585f..d6cc813e3 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/VoBase.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/VoBase.java
@@ -1,22 +1,21 @@
 package com.xdadan.erp.emis.domain.vo;
 
-import com.xdadan.erp.emis.domain.EmisWaybillCargo;
+
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public abstract class VoBase<DB,VO> {
+    public abstract VO toVo(DB dbItem);
+    public abstract DB toDb(VO voItem);
 
-    public  abstract  VO toVo(DB dbItem);
-    public  abstract  DB toDb(VO voItem);
     /**
      * 转换为数据库类型
      * @param voList
      * @return
      */
     public List<DB> toDbList(List<VO> voList){
-
         if(!CollectionUtils.isEmpty(voList)){
             List<DB> list = new ArrayList<>();
             for (VO voItem: voList){
@@ -34,7 +33,7 @@ public abstract class VoBase<DB,VO> {
      * @param dbList
      * @return
      */
-    public List<VO> toVoList(List<DB> dbList){
+    public  List<VO> toVoList(List<DB> dbList){
 
         if(!CollectionUtils.isEmpty(dbList)){
             List<VO> list = new ArrayList<>();
@@ -47,4 +46,5 @@ public abstract class VoBase<DB,VO> {
         return null;
 
     }
+
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
index 6e6ae6a55..b3788b670 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
@@ -238,10 +238,14 @@ public class WaybillOrder  implements Serializable {
 
         WaybillOrder voItem = new WaybillOrder();
 
+        Cargo cargoCvt = new Cargo();
+        FeeItem feeItemCvt = new FeeItem();
+        Attachment attachmentCvt = new Attachment();
+
         // 转换其他list
-        voItem.setCargoList(Cargo.toVoList(dbCargoList));
-        voItem.setFeeItems(FeeItem.toVoList(dbFeeitemList));
-        voItem.setAttachmentList(Attachment.toVoList(dbAttachmentList));
+        voItem.setCargoList(cargoCvt.cvtToVoList(dbCargoList));
+        voItem.setFeeItems(feeItemCvt.cvtToVoList(dbFeeitemList));
+        voItem.setAttachmentList(attachmentCvt.cvtToVoList(dbAttachmentList));
 
         // 收件人
         Reciever reciever = new Reciever();
@@ -468,13 +472,16 @@ public class WaybillOrder  implements Serializable {
      * 转为数据库类型值
      * @return
      */
-    public static  EmisWaybill toDb(){
+    public  EmisWaybill toDb(){
         EmisWaybill dbWaybill = new EmisWaybill();
 
+        Cargo cargoCvt = new Cargo();
+        FeeItem feeItemCvt = new FeeItem();
+        Attachment attachmentCvt = new Attachment();
         // 设置货物信息
-        dbWaybill.setCargoList(Cargo.toDBList(this.getCargoList()));
-        dbWaybill.setFeeitemList(FeeItem.toDBList(this.getFeeItems()));
-        dbWaybill.setAttachmentList(Attachment.toDBList(this.getAttachmentList()));
+        dbWaybill.setCargoList(cargoCvt.cvtToDbList(this.getCargoList()));
+        dbWaybill.setFeeitemList(feeItemCvt.cvtToDbList(this.getFeeItems()));
+        dbWaybill.setAttachmentList(attachmentCvt.cvtToDbList(this.getAttachmentList()));
 
         dbWaybill.setOrderSn(this.getOrderSn());
         dbWaybill.setCustOrderId(this.getCustOrderId());
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 db589e261..62242c2b8 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
@@ -226,7 +226,7 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
             throw new Exception("已锁账，不允许修改");
         }
 
-        EmisWaybill emisWaybillNew = WaybillOrder.toDb();
+        EmisWaybill emisWaybillNew = waybillOrder.toDb();
 
         // 新增
         if(isNew){