md

emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java

@@ -208,8 +208,9 @@ public class EmisBaseService {
                  customerCode = emisCustomerUser.getCustomerCode();
                  addresItem.setCustomerCode(customerCode);
                  emisCustomerAddressMapper.updateEmisCustomerAddress(addresItem);
+             }else{
+                 customerCode=addresItem.getCustomerCode();
              }
-
          }
 
          emisCustomerAddressNew.setCustomerCode(customerCode);

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java

@@ -229,6 +229,21 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
         // 新增
         if(isNew){
+            addWayBill(emisWaybillSave);
+        }else{
+            emisWaybillSave.setId(emisWaybillOld.getId());
+            updateWayBill(emisWaybillSave);
+        }
+
+        return  1;
+    }
+
+
+    /**
+     * 新增费用
+     * @param emisWaybillSave
+     */
+    private void addWayBill(EmisWaybill emisWaybillSave){
 
         //补齐数据
         emisWaybillSave.preInsert();
@@ -296,6 +311,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         sendAddress.setUseSiteCode(getCurrentUser().getOwnerSiteCode());
         sendAddress.setAddressType("1");
         EmisCustomerAddress sendAddressNew=createCustomerAddress(sendAddress);
+
         sendCustomerCode = sendAddressNew.getCustomerCode();
         emisWaybillSave.setCustomerCode(sendCustomerCode);
 
@@ -369,18 +385,21 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                 emisWaybillAttachmentMapper.insertEmisWaybillAttachment(attachmentItem);
             }
         }
+    }
 
-        }else{
 
-            emisWaybillSave.setId(emisWaybillOld.getId());
+    private void updateWayBill(EmisWaybill emisWaybillSave){
         emisWaybillSave.preUpdate();
 
+        // 基础信息更新
         emisWaybillMapper.updateEmisWaybill(emisWaybillSave);
-        }
 
-        return  1;
+        // 更新资费
-    }
 
+        // 更新产品
+
+        // 更新附件
+    }
 
     /**
      * 运单费用计算接口