diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonController.java
index 77c1743..265d2a0 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonController.java
@@ -13,27 +13,17 @@ package com.xdadan.erp.web.oms2c;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.xdadan.erp.oms.common.annotation.Log;
 import com.xdadan.erp.oms.common.core.controller.BaseController;
 import com.xdadan.erp.oms.common.core.domain.AjaxResult;
-import com.xdadan.erp.oms.common.core.page.TableDataInfo;
 import com.xdadan.erp.oms.common.core.redis.RedissonService;
-import com.xdadan.erp.oms.common.enums.BusinessType;
 import com.xdadan.erp.oms.common.utils.DateUtils;
 import com.xdadan.erp.oms.common.utils.SecurityUtils;
-import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
-import com.xdadan.erp.emis.domain.EmisBrand;
-import com.xdadan.erp.emis.domain.EmisPrintTpl;
-import com.xdadan.erp.emis.domain.EmisWaybill;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
-import com.xdadan.erp.emis.domain.vo.AddressParseResult;
-import com.xdadan.erp.emis.domain.vo.Reciever;
-import com.xdadan.erp.emis.domain.vo.Sender;
-import com.xdadan.erp.emis.domain.vo.WaybillOrder;
-import com.xdadan.erp.emis.service.*;
+import com.xdadan.erp.oms2c.domain.EmisPrintTpl;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.vo.AddressParseResult;
+import com.xdadan.erp.oms2c.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -73,39 +63,6 @@ public class Oms2cCommonController extends BaseController
     @Autowired
     RedissonService redissonService;
 
-    /**
-     * 获取中心可用简单数
-     * @param prefix
-     * @return
-     */
-    @RequestMapping(value = "/getCenterTotalAvailablePag")
-    public AjaxResult getCenterTotalAvailablePag(String prefix)
-    {
-        return AjaxResult.success("获取成功",emisElectronicPagService.getCenterTotalAvailablePag("T7080"));
-    }
-
-
-    /**
-     * 获取网点总可用面单数
-     */
-    @RequestMapping(value = "/getTotalAvailablePag")
-    public AjaxResult getTotalAvailablePag(String useSiteCode,String prefix)
-    {
-        try {
-            if(StringUtils.isEmpty(useSiteCode)){
-                try {
-                    useSiteCode= SecurityUtils.getLoginUser().getUser().getOwnerSiteCode();
-                }catch (Exception ex){
-                    ex.printStackTrace();
-                }
-            }
-            Map dataMap = emisElectronicSitePagService.getTotalAvailablePag(useSiteCode,"T7080");
-            return AjaxResult.success("获取成功",dataMap);
-        }catch (Exception ex){
-            ex.printStackTrace();
-            return AjaxResult.error(ex.getMessage());
-        }
-    }
 
     /**
      * 获取电子面单单号
@@ -129,24 +86,7 @@ public class Oms2cCommonController extends BaseController
         }
     }
 
-    /**
-     * 获取合包单号
-     */
-    @RequestMapping(value = "/getPackNo")
-    public AjaxResult getPackNo()
-    {
-        try {
-            String YYYYMMDDHH = "yyyyMMddHH";
 
-            String hbKey= "THB-"+DateUtils.parseDateToStr(YYYYMMDDHH,new Date());
-            Long lockNo = redissonService.addAndGetLong(hbKey,1L);
-            String packNo =hbKey+ "-" +StringUtils.leftPad(String.valueOf(lockNo),4,"0");
-            return AjaxResult.success("获取成功",packNo);
-        }catch (Exception ex){
-            ex.printStackTrace();
-            return AjaxResult.error(ex.getMessage());
-        }
-    }
 
     /**
      * 获取进仓单号
@@ -188,144 +128,7 @@ public class Oms2cCommonController extends BaseController
         }
     }
 
-    /**
-     * 获取解析地址
-     */
-    @RequestMapping(value = "/getEmpSpecialService")
-    public AjaxResult getEmpSpecialService(String empCode)
-    {
-        try {
-//            #小程序://探路速运/Nt29PF2JBvBkf2w
-//            AddressParseResult addressParseResult = emisRegionService.parseAddress(content);
-            return AjaxResult.success("解析成功");
-        }catch (Exception ex){
-            ex.printStackTrace();
-            // 返回子定义异常
-            if(ex instanceof EmisBizError){
-                return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
-            }
-
-            return AjaxResult.error("服务器异常，联系客服");
-        }
-    }
-
-    /**
-     * 获取解析地址
-     */
-    @RequestMapping(value = "/testGenCustomer")
-    public AjaxResult testGenCustomer()
-    {
-        try {
-//            AddressParseResult addressParseResult = emisRegionService.parseAddress(content);
-            emisBaseService.batchGenCustomerCode();
-            return AjaxResult.success("解析成功");
-        }catch (Exception ex){
-            ex.printStackTrace();
-            // 返回子定义异常
-            if(ex instanceof EmisBizError){
-                return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
-            }
-
-            return AjaxResult.error("服务器异常，联系客服");
-        }
-    }
 
 
-    @RequestMapping("/getPrintDataByPrinter")
-    public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response, String billCode, String billCodeRange,String tplCode, String lang, String printType)
-    {
-
-        if(StringUtils.isEmpty(billCode)){
-            return AjaxResult.error("参数错误");
-        }
-
-        if(!StringUtils.isEmpty(billCode)){
-            try {
-
-                Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, tplCode,lang, printType);
-                JSONObject printItem = new JSONObject();
-                printItem.put("billCode",billCode);
-
-                if(order!=null) {
-                    printItem.put("billDetail", Base64.getEncoder().encodeToString(JSONObject.toJSONString(order).getBytes(Charset.forName("UTF-8"))));
-                    printItem.put("isEncrpt",false);
-                    printItem.put("printCount",1);
-                    printItem.put("printDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date()));
-                    printItem.put("result","success");
-                    printItem.put("message","success");
-                    return AjaxResult.success("获取成功",printItem);
-                }else{
-                    return AjaxResult.error("单号不存在:"+billCode);
-                }
-
-
-            }catch (Exception ex){
-                ex.printStackTrace();
-                return AjaxResult.error("获取失败");
-            }
-        }
-
-        return AjaxResult.error("获取失败");
-
-    }
-
-    /**
-     * 预览电子面单打印
-     */
-    @RequestMapping(value = "/previewBillPrintImage")
-    public AjaxResult previewBillPrintImage(String uuid)
-    {
-        try {
-            return AjaxResult.success("解析成功");
-        }catch (Exception ex){
-            ex.printStackTrace();
-            // 返回子定义异常
-            if(ex instanceof EmisBizError){
-                return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
-            }
-
-            return AjaxResult.error("服务器异常，联系客服");
-        }
-    }
-
-    /**
-     * 获取打印模版
-     */
-    @RequestMapping(value = "/getTnPrinterLocalPrintTpl")
-    public AjaxResult getTnPrinterLocalPrintTpl(String key,String siteCode,String appCode)
-    {
-        try {
-            if(!"1070ff852af893f45fb3f8275a5bfb23".equals(key)){
-                return AjaxResult.error("非法请求！");
-            }
-
-            EmisPrintTpl queryEmisPrintTpl = new EmisPrintTpl();
-            queryEmisPrintTpl.setStatus(1);
-
-            JSONArray tplList  = new JSONArray();
-            List<EmisPrintTpl> list=emisPrintTplService.selectPrintTplListByPrinter(queryEmisPrintTpl);
-            for (EmisPrintTpl tpl:list) {
-
-                JSONObject jobjTpl = new JSONObject();
-                jobjTpl.put("code",tpl.getCode());
-                jobjTpl.put("name",tpl.getName());
-                jobjTpl.put("expressType",tpl.getExpressType());
-                jobjTpl.put("tplEncData",tpl.getTplEncData());
-
-                tplList.add(jobjTpl);
-
-            }
-
-
-            return AjaxResult.success("获取成功",tplList);
-        }catch (Exception ex){
-            ex.printStackTrace();
-            // 返回子定义异常
-            if(ex instanceof EmisBizError){
-                return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
-            }
-            return AjaxResult.error("服务器异常，联系客服");
-        }
-    }
 
 }
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonToolsController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonToolsController.java
index c618094..32e774a 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonToolsController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonToolsController.java
@@ -15,24 +15,17 @@ import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.oms.common.core.controller.BaseController;
 import com.xdadan.erp.oms.common.core.domain.AjaxResult;
 import com.xdadan.erp.oms.common.core.page.TableDataInfo;
-import com.xdadan.erp.emis.domain.EmisSite;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
-import com.xdadan.erp.emis.domain.vo.AddressParseResult;
-import com.xdadan.erp.emis.service.EmisBaseService;
-import com.xdadan.erp.emis.service.IEmisElectronicPagService;
-import com.xdadan.erp.emis.service.IEmisRegionService;
-import com.xdadan.erp.emis.service.IEmisWaybillService;
+import com.xdadan.erp.oms2c.service.EmisBaseService;
+import com.xdadan.erp.oms2c.service.IEmisWaybillService;
 import com.xdadan.erp.system.domain.SysNotice;
 import com.xdadan.erp.system.service.ISysNoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 
 /**
  * Statistics 公共 Controller
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCountryController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCountryController.java
index 826bcb9..967ad37 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCountryController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCountryController.java
@@ -15,8 +15,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
-import com.xdadan.erp.emis.domain.EmisSite;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,11 +33,10 @@ import com.xdadan.erp.oms.common.core.controller.BaseController;
 import com.xdadan.erp.oms.common.core.domain.AjaxResult;
 import com.xdadan.erp.oms.common.core.page.TableDataInfo;
 import com.xdadan.erp.oms.common.enums.BusinessType;
-import com.xdadan.erp.oms.common.utils.StringUtils;
 import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
-import com.xdadan.erp.emis.domain.EmisCountry;
-import com.xdadan.erp.emis.service.IEmisCountryService;
+import com.xdadan.erp.oms2c.domain.EmisCountry;
+import com.xdadan.erp.oms2c.service.IEmisCountryService;
 
 /**
  * 国家Controller
@@ -56,7 +54,6 @@ public class Oms2cCountryController extends BaseController
     /**
      * 查询国家列表
      */
-//    @PreAuthorize("@ss.hasPermi('emis:emisCountry:list')")
     @GetMapping("/list")
     public TableDataInfo list(EmisCountry emisCountry)
     {
@@ -65,7 +62,6 @@ public class Oms2cCountryController extends BaseController
         return getDataTable(list);
     }
 
-//    @PreAuthorize("@ss.hasPermi('emis:emisCountry:list')")
     @JacksonFilter(include= {"id","code","name","nameEn","twoCode"},value= EmisCountry.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @RequestMapping("/listSimple")
     public TableDataInfo listSimple(EmisCountry emisCountry)
@@ -75,18 +71,6 @@ public class Oms2cCountryController extends BaseController
         return getDataTable(list);
     }
 
-    /**
-     * 导出国家列表
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisCountry:export')")
-    @Log(title = "国家", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, EmisCountry emisCountry)
-    {
-        List<EmisCountry> list = emisCountryService.selectEmisCountryList(emisCountry);
-        ExcelUtil<EmisCountry> util = new ExcelUtil<EmisCountry>(EmisCountry.class);
-        util.exportExcel(response, list, "国家数据");
-    }
 
     /**
      * 获取国家详细信息
@@ -98,47 +82,5 @@ public class Oms2cCountryController extends BaseController
         return AjaxResult.success(emisCountryService.selectEmisCountryById(id));
     }
 
-    /**
-     * 新增国家
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisCountry:add')")
-    @Log(title = "国家", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody EmisCountry emisCountry)
-    {
-        // 判断国家是否有重复
-        try {
-            return toAjax(emisCountryService.insertEmisCountry(emisCountry));
-        } catch (EmisBizError emisBizError) {
-            emisBizError.printStackTrace();
-            return AjaxResult.error(emisBizError.getMessage());
-        }catch (DuplicateKeyException e) {
-            e.printStackTrace();
-            return AjaxResult.error("数据重复!");
-        }
 
-
-    }
-
-    /**
-     * 修改国家
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisCountry:edit')")
-    @Log(title = "国家", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody EmisCountry emisCountry)
-    {
-        return toAjax(emisCountryService.updateEmisCountry(emisCountry));
-    }
-
-    /**
-     * 删除国家
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisCountry:remove')")
-    @Log(title = "国家", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Integer[] ids)
-    {
-        return toAjax(emisCountryService.deleteEmisCountryByIds(ids));
-    }
 }
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAccountController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAccountController.java
index e4b136d..83dde8e 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAccountController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAccountController.java
@@ -22,11 +22,10 @@ import com.xdadan.erp.oms.common.core.controller.BaseController;
 import com.xdadan.erp.oms.common.core.domain.AjaxResult;
 import com.xdadan.erp.oms.common.core.page.TableDataInfo;
 import com.xdadan.erp.oms.common.enums.BusinessType;
-import com.xdadan.erp.oms.common.utils.StringUtils;
 import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
-import com.xdadan.erp.emis.domain.EmisCustomerAccount;
-import com.xdadan.erp.emis.service.IEmisCustomerAccountService;
+import com.xdadan.erp.oms2c.domain.EmisCustomerAccount;
+import com.xdadan.erp.oms2c.service.IEmisCustomerAccountService;
 
 /**
  * 快递用户结算账户Controller
@@ -53,18 +52,6 @@ public class Oms2cCustomerAccountController extends BaseController
         return getDataTable(list);
     }
 
-    /**
-     * 导出快递用户结算账户列表
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisCustomerAccount:export')")
-    @Log(title = "快递用户结算账户", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, EmisCustomerAccount emisCustomerAccount)
-    {
-        List<EmisCustomerAccount> list = emisCustomerAccountService.selectEmisCustomerAccountList(emisCustomerAccount);
-        ExcelUtil<EmisCustomerAccount> util = new ExcelUtil<EmisCustomerAccount>(EmisCustomerAccount.class);
-        util.exportExcel(response, list, "快递用户结算账户数据");
-    }
 
     /**
      * 获取快递用户结算账户详细信息
@@ -76,46 +63,5 @@ public class Oms2cCustomerAccountController extends BaseController
         return AjaxResult.success(emisCustomerAccountService.selectEmisCustomerAccountById(id));
     }
 
-    /**
-     * 新增快递用户结算账户
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisCustomerAccount:add')")
-    @Log(title = "快递用户结算账户", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody EmisCustomerAccount emisCustomerAccount)
-    {
-        return toAjax(emisCustomerAccountService.insertEmisCustomerAccount(emisCustomerAccount));
-    }
 
-    /**
-     * 修改快递用户结算账户
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisCustomerAccount:edit')")
-    @Log(title = "快递用户结算账户", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody EmisCustomerAccount emisCustomerAccount)
-    {
-        return toAjax(emisCustomerAccountService.updateEmisCustomerAccount(emisCustomerAccount));
-    }
-
-    /**
-     * 删除快递用户结算账户
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisCustomerAccount:remove')")
-    @Log(title = "快递用户结算账户", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(emisCustomerAccountService.deleteEmisCustomerAccountByIds(ids));
-    }
-
-    /**
-     * 根据地区获取新月结账号
-     */
-//    @PreAuthorize("@ss.hasPermi('system:user:query')")
-//    @GetMapping(value = { "/getNewCustNo" })
-//    public AjaxResult getNewCustNo(@RequestParam("ownerSiteCode")String ownerSiteCode)
-//    {
-//        return AjaxResult.success("成功",userService.getNewEmpCode(ownerSiteCode));
-//    }
 }
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAddressController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAddressController.java
index 1ca0745..93f1db6 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAddressController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAddressController.java
@@ -15,8 +15,6 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
-import com.xdadan.erp.oms.common.core.domain.entity.SysUser;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -28,8 +26,8 @@ import com.xdadan.erp.oms.common.core.page.TableDataInfo;
 import com.xdadan.erp.oms.common.enums.BusinessType;
 import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
-import com.xdadan.erp.emis.domain.EmisCustomerAddress;
-import com.xdadan.erp.emis.service.IEmisCustomerAddressService;
+import com.xdadan.erp.oms2c.domain.EmisCustomerAddress;
+import com.xdadan.erp.oms2c.service.IEmisCustomerAddressService;
 
 /**
  * 客户收寄件地址Controller
@@ -47,7 +45,6 @@ public class Oms2cCustomerAddressController extends BaseController
     /**
      * 查询客户收寄件地址列表
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisCustomerAddress:list')")
     @GetMapping("/list")
     public TableDataInfo list(EmisCustomerAddress emisCustomerAddress)
     {
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerSettleBillController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerSettleBillController.java
index fc73622..f348a43 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerSettleBillController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerSettleBillController.java
@@ -29,11 +29,10 @@ import com.xdadan.erp.oms.common.core.controller.BaseController;
 import com.xdadan.erp.oms.common.core.domain.AjaxResult;
 import com.xdadan.erp.oms.common.core.page.TableDataInfo;
 import com.xdadan.erp.oms.common.enums.BusinessType;
-import com.xdadan.erp.oms.common.utils.StringUtils;
 import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
-import com.xdadan.erp.emis.domain.EmisCustomerSettleBill;
-import com.xdadan.erp.emis.service.IEmisCustomerSettleBillService;
+import com.xdadan.erp.oms2c.domain.EmisCustomerSettleBill;
+import com.xdadan.erp.oms2c.service.IEmisCustomerSettleBillService;
 
 /**
  * 快递用户结算账单Controller
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerUserController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerUserController.java
index 49b65e8..a98035b 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerUserController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerUserController.java
@@ -15,9 +15,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
-import com.xdadan.erp.emis.domain.EmisDestination;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
-import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.oms2c.service.EmisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,8 +36,8 @@ import com.xdadan.erp.oms.common.enums.BusinessType;
 import com.xdadan.erp.oms.common.utils.StringUtils;
 import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
-import com.xdadan.erp.emis.domain.EmisCustomerUser;
-import com.xdadan.erp.emis.service.IEmisCustomerUserService;
+import com.xdadan.erp.oms2c.domain.EmisCustomerUser;
+import com.xdadan.erp.oms2c.service.IEmisCustomerUserService;
 
 /**
  * 快递客户用户Controller
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cGoodsController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cGoodsController.java
index 5e98f7b..9686459 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cGoodsController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cGoodsController.java
@@ -15,7 +15,6 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
-import com.xdadan.erp.emis.domain.EmisTransProduct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,11 +31,10 @@ import com.xdadan.erp.oms.common.core.controller.BaseController;
 import com.xdadan.erp.oms.common.core.domain.AjaxResult;
 import com.xdadan.erp.oms.common.core.page.TableDataInfo;
 import com.xdadan.erp.oms.common.enums.BusinessType;
-import com.xdadan.erp.oms.common.utils.StringUtils;
 import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
-import com.xdadan.erp.emis.domain.EmisGoods;
-import com.xdadan.erp.emis.service.IEmisGoodsService;
+import com.xdadan.erp.oms2c.domain.EmisGoods;
+import com.xdadan.erp.oms2c.service.IEmisGoodsService;
 
 /**
  * 货物信息Controller
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cRegionController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cRegionController.java
index b48dff0..5fb11b6 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cRegionController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cRegionController.java
@@ -15,7 +15,6 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
-import com.xdadan.erp.emis.domain.EmisCountry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,11 +31,10 @@ import com.xdadan.erp.oms.common.core.controller.BaseController;
 import com.xdadan.erp.oms.common.core.domain.AjaxResult;
 import com.xdadan.erp.oms.common.core.page.TableDataInfo;
 import com.xdadan.erp.oms.common.enums.BusinessType;
-import com.xdadan.erp.oms.common.utils.StringUtils;
 import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
-import com.xdadan.erp.emis.domain.EmisRegion;
-import com.xdadan.erp.emis.service.IEmisRegionService;
+import com.xdadan.erp.oms2c.domain.EmisRegion;
+import com.xdadan.erp.oms2c.service.IEmisRegionService;
 
 /**
  * 四级省市区镇表Controller
@@ -54,7 +52,6 @@ public class Oms2cRegionController extends BaseController
     /**
      * 查询四级省市区镇表列表
      */
-//    @PreAuthorize("@ss.hasPermi('emis:emisRegion:list')")
     @GetMapping("/list")
     public TableDataInfo list(EmisRegion emisRegion)
     {
@@ -81,59 +78,14 @@ public class Oms2cRegionController extends BaseController
     }
 
 
-    /**
-     * 导出四级省市区镇表列表
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisRegion:export')")
-    @Log(title = "四级省市区镇表", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, EmisRegion emisRegion)
-    {
-        List<EmisRegion> list = emisRegionService.selectEmisRegionList(emisRegion);
-        ExcelUtil<EmisRegion> util = new ExcelUtil<EmisRegion>(EmisRegion.class);
-        util.exportExcel(response, list, "四级省市区镇表数据");
-    }
-
     /**
      * 获取四级省市区镇表详细信息
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisRegion:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
         return AjaxResult.success(emisRegionService.selectEmisRegionById(id));
     }
 
-    /**
-     * 新增四级省市区镇表
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisRegion:add')")
-    @Log(title = "四级省市区镇表", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody EmisRegion emisRegion)
-    {
-        return toAjax(emisRegionService.insertEmisRegion(emisRegion));
-    }
 
-    /**
-     * 修改四级省市区镇表
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisRegion:edit')")
-    @Log(title = "四级省市区镇表", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody EmisRegion emisRegion)
-    {
-        return toAjax(emisRegionService.updateEmisRegion(emisRegion));
-    }
-
-    /**
-     * 删除四级省市区镇表
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisRegion:remove')")
-    @Log(title = "四级省市区镇表", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(emisRegionService.deleteEmisRegionByIds(ids));
-    }
 }
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransLineController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransLineController.java
index 2af48cf..852f47f 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransLineController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransLineController.java
@@ -15,10 +15,8 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
-import com.xdadan.erp.emis.domain.EmisCountry;
-import com.xdadan.erp.emis.domain.EmisSite;
-import com.xdadan.erp.emis.service.EmisBaseService;
-import org.apache.commons.lang3.StringUtils;
+import com.xdadan.erp.oms2c.domain.EmisSite;
+import com.xdadan.erp.oms2c.service.EmisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,8 +35,8 @@ import com.xdadan.erp.oms.common.core.page.TableDataInfo;
 import com.xdadan.erp.oms.common.enums.BusinessType;
 import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
-import com.xdadan.erp.emis.domain.EmisTransLine;
-import com.xdadan.erp.emis.service.IEmisTransLineService;
+import com.xdadan.erp.oms2c.domain.EmisTransLine;
+import com.xdadan.erp.oms2c.service.IEmisTransLineService;
 
 /**
  * 线路Controller
@@ -89,18 +87,7 @@ public class Oms2cTransLineController extends BaseController
         return getDataTable(list);
     }
 
-    /**
-     * 导出线路列表
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisTransLine:export')")
-    @Log(title = "线路", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, EmisTransLine emisTransLine)
-    {
-        List<EmisTransLine> list = emisTransLineService.selectEmisTransLineList(emisTransLine);
-        ExcelUtil<EmisTransLine> util = new ExcelUtil<EmisTransLine>(EmisTransLine.class);
-        util.exportExcel(response, list, "线路数据");
-    }
+
 
     /**
      * 获取线路详细信息
@@ -112,36 +99,5 @@ public class Oms2cTransLineController extends BaseController
         return AjaxResult.success(emisTransLineService.selectEmisTransLineById(id));
     }
 
-    /**
-     * 新增线路
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisTransLine:add')")
-    @Log(title = "线路", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody EmisTransLine emisTransLine)
-    {
-        return toAjax(emisTransLineService.insertEmisTransLine(emisTransLine));
-    }
 
-    /**
-     * 修改线路
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisTransLine:edit')")
-    @Log(title = "线路", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody EmisTransLine emisTransLine)
-    {
-        return toAjax(emisTransLineService.updateEmisTransLine(emisTransLine));
-    }
-
-    /**
-     * 删除线路
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisTransLine:remove')")
-    @Log(title = "线路", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(emisTransLineService.deleteEmisTransLineByIds(ids));
-    }
 }
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransProductController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransProductController.java
index 0be7215..bd09f28 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransProductController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransProductController.java
@@ -15,7 +15,6 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
-import com.xdadan.erp.emis.domain.EmisBrand;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,11 +31,10 @@ import com.xdadan.erp.oms.common.core.controller.BaseController;
 import com.xdadan.erp.oms.common.core.domain.AjaxResult;
 import com.xdadan.erp.oms.common.core.page.TableDataInfo;
 import com.xdadan.erp.oms.common.enums.BusinessType;
-import com.xdadan.erp.oms.common.utils.StringUtils;
 import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
-import com.xdadan.erp.emis.domain.EmisTransProduct;
-import com.xdadan.erp.emis.service.IEmisTransProductService;
+import com.xdadan.erp.oms2c.domain.EmisTransProduct;
+import com.xdadan.erp.oms2c.service.IEmisTransProductService;
 
 /**
  * 运输产品类型Controller
@@ -54,7 +52,6 @@ public class Oms2cTransProductController extends BaseController
     /**
      * 查询运输产品类型列表
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisTransProduct:list')")
     @GetMapping("/list")
     public TableDataInfo list(EmisTransProduct emisTransProduct)
     {
@@ -63,7 +60,6 @@ public class Oms2cTransProductController extends BaseController
         return getDataTable(list);
     }
 
-//    @PreAuthorize("@ss.hasPermi('emis:emisTransProduct:list')")
     @JacksonFilter(include= {"id","prodCode","prodName","prodNameEn","agingDesc"},value= EmisTransProduct.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @RequestMapping("/listSimple")
     public TableDataInfo listSimple(EmisTransProduct emisTransProduct)
@@ -74,59 +70,15 @@ public class Oms2cTransProductController extends BaseController
         return getDataTable(list);
     }
 
-    /**
-     * 导出运输产品类型列表
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisTransProduct:export')")
-    @Log(title = "运输产品类型", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, EmisTransProduct emisTransProduct)
-    {
-        List<EmisTransProduct> list = emisTransProductService.selectEmisTransProductList(emisTransProduct);
-        ExcelUtil<EmisTransProduct> util = new ExcelUtil<EmisTransProduct>(EmisTransProduct.class);
-        util.exportExcel(response, list, "运输产品类型数据");
-    }
+
 
     /**
      * 获取运输产品类型详细信息
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisTransProduct:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
         return AjaxResult.success(emisTransProductService.selectEmisTransProductById(id));
     }
 
-    /**
-     * 新增运输产品类型
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisTransProduct:add')")
-    @Log(title = "运输产品类型", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody EmisTransProduct emisTransProduct)
-    {
-        return toAjax(emisTransProductService.insertEmisTransProduct(emisTransProduct));
-    }
-
-    /**
-     * 修改运输产品类型
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisTransProduct:edit')")
-    @Log(title = "运输产品类型", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody EmisTransProduct emisTransProduct)
-    {
-        return toAjax(emisTransProductService.updateEmisTransProduct(emisTransProduct));
-    }
-
-    /**
-     * 删除运输产品类型
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisTransProduct:remove')")
-    @Log(title = "运输产品类型", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(emisTransProductService.deleteEmisTransProductByIds(ids));
-    }
 }
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cWaybillController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cWaybillController.java
index 69a41a8..1ba03cc 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cWaybillController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cWaybillController.java
@@ -18,36 +18,29 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
-import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.oms.common.config.PayConfig;
-import com.xdadan.erp.oms.common.core.domain.entity.SysUser;
 import com.xdadan.erp.oms.common.utils.DateUtils;
-import com.xdadan.erp.oms.common.utils.file.FileUtils;
 import com.xdadan.erp.oms.common.utils.idgen.UUID;
-import com.xdadan.erp.emis.domain.EmisBrand;
-import com.xdadan.erp.emis.domain.EmisCountry;
-import com.xdadan.erp.emis.domain.EmisTmsScanRecord;
-import com.xdadan.erp.emis.domain.enumtype.ScanType;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
-import com.xdadan.erp.emis.domain.vo.*;
-import com.xdadan.erp.emis.service.*;
-import com.xdadan.erp.emis.service.print.IXddTplPrint;
-import com.xdadan.erp.emis.service.print.tanex.TanexTplPrintImpl;
+import com.xdadan.erp.oms2c.domain.EmisTmsScanRecord;
+import com.xdadan.erp.oms2c.domain.enumtype.ScanType;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.vo.*;
+import com.xdadan.erp.oms2c.service.*;
+import com.xdadan.erp.oms2c.service.print.IXddTplPrint;
+import com.xdadan.erp.oms2c.service.print.tanex.TanexTplPrintImpl;
 import com.xdadan.erp.system.domain.SysFileInfo;
 import com.xdadan.erp.system.service.ISysFileInfoService;
 import com.xdadan.erp.system.service.ISysUserService;
-import com.xdadan.erp.system.service.impl.SysUserServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import com.xdadan.erp.oms.common.annotation.Log;
@@ -56,7 +49,7 @@ import com.xdadan.erp.oms.common.core.domain.AjaxResult;
 import com.xdadan.erp.oms.common.core.page.TableDataInfo;
 import com.xdadan.erp.oms.common.enums.BusinessType;
 
-import com.xdadan.erp.emis.domain.EmisWaybill;
+import com.xdadan.erp.oms2c.domain.EmisWaybill;
 
 /**
  * 运单列表Controller
@@ -477,281 +470,6 @@ public class Oms2cWaybillController extends BaseController
         return getDataTable(list);
     }
 
-    @RequestMapping("/realGetWaybillPrintData")
-    public AjaxResult realGetWaybillPrintData(String billCode, String billCodeRange, String lang,String tplCode, String printType,String isNeedPdf)
-    {
-        /*
-        , HttpServletRequest request, HttpServletResponse response
-           [
-            {
-             "billCode":"T123213",
-             "pdfInfo":"1231232112",
-             "billDetail":"1231232",
-             "isEncrpt":"false",
-             "printCount":"1",
-             "printDate":"",
-             "result":"success",
-             "message":"",
-            }
-           ]
-         */
-
-        if(!StringUtils.isEmpty(billCode)){
-            try {
-                JSONArray jArr = new JSONArray();
-                String[] billCodeArr = billCode.split(",");
-
-                for(String billCodeItem:billCodeArr) {
-                    Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, tplCode,lang, printType);
-                    JSONObject printItem = new JSONObject();
-                    printItem.put("billCode",billCodeItem);
-                    printItem.put("billDetail",Base64.getEncoder().encodeToString(JSONObject.toJSONString(order).getBytes(Charset.forName("UTF-8"))));
-                    printItem.put("isEncrpt",false);
-                    printItem.put("printCount",1);
-                    printItem.put("printDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date()));
-
-                    if(order!=null) {
-
-                        if("T".equals(isNeedPdf)) {
-                            ByteArrayOutputStream os = new ByteArrayOutputStream();
-                            IXddTplPrint tplPrint = new TanexTplPrintImpl();
-                            tplPrint.genPDF(order, os);
-                            // 生成pdf base64
-                            byte[] pdfBytes = os.toByteArray();
-                            String pdfBase64Str = Base64.getEncoder().encodeToString(pdfBytes);
-                            System.out.println(pdfBase64Str);
-                            printItem.put("pdfInfo", pdfBase64Str);
-                        }else{
-                            printItem.put("pdfInfo", "");
-                        }
-
-                        printItem.put("result","success");
-                        printItem.put("message","success");
-                    }else{
-                        printItem.put("result","fail");
-                        printItem.put("message","未获取到数据");
-                    }
-                    jArr.add(printItem);
-                }
-
-                return AjaxResult.success("获取成功",jArr);
-            }catch (Exception ex){
-                ex.printStackTrace();
-                return AjaxResult.error("获取失败");
-            }
-        }
-
-        return AjaxResult.error("获取失败");
-    }
-
-    @RequestMapping("/realGetPrintList")
-    public AjaxResult realGetPrintList(String billCode, String billCodeRange,String tplCode, String lang, String printType)
-    {
-        /*
-        , HttpServletRequest request, HttpServletResponse response
-           [
-            {
-               "billCode": "T7080300000206",
-              "result": "success",
-              "message": "打印",
-              "imageUrl": "http://oss-emis.xxx.com/m123213123.png"
-            }
-           ]
-         */
-
-        if(!StringUtils.isEmpty(billCode)){
-            try {
-                JSONArray jArr = new JSONArray();
-                String[] billCodeArr = billCode.split(",");
-
-                for(String billCodeItem:billCodeArr) {
-                    Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange,tplCode,lang, printType);
-                    JSONObject printItem = new JSONObject();
-                    printItem.put("billCode",billCodeItem);
-                    if(order!=null) {
-
-                        try
-                        {
-                            String fileId = UUID.fastUUID().toString();
-                            String fileUploadDir = PayConfig.getUploadPath()+File.separator+DateUtils.datePath();
-
-                            File saveDir = new File(fileUploadDir);
-                            if(!saveDir.exists()){
-                                saveDir.mkdirs();
-                            }
-
-                            String saveFileName = fileUploadDir+File.separator+fileId+".png";
-
-                            FileOutputStream os = new FileOutputStream(saveFileName);//输出流
-                            IXddTplPrint tplPrint = new TanexTplPrintImpl();
-                            tplPrint.genPNG(order, os);
-
-                            JSONObject jObjRemark = new JSONObject();
-                            jObjRemark.put("billCode",billCodeItem);
-                            jObjRemark.put("billCodeRange",billCodeRange);
-                            jObjRemark.put("lang",lang);
-                            jObjRemark.put("printType",printType);
-
-                            SysFileInfo sysFileInfo=sysFileInfoService.ossUploadLocalFile(saveFileName,billCodeItem,jObjRemark.toJSONString());
-                            String imageUrl = sysFileInfo.getFileRemoteUrl();
-                            printItem.put("imageUrl", imageUrl);
-                            printItem.put("result","success");
-                            printItem.put("message","success");
-                        }
-                        catch (Exception e)
-                        {
-                            e.printStackTrace();
-                            printItem.put("imageUrl", "");
-                            printItem.put("result","fail");
-                            printItem.put("message","生成图片异常");
-
-                        }
-
-
-                    }else{
-                        printItem.put("result","fail");
-                        printItem.put("message","未获取到数据");
-                    }
-                    jArr.add(printItem);
-                }
-
-                return AjaxResult.success("获取成功",jArr);
-            }catch (Exception ex){
-                ex.printStackTrace();
-                return AjaxResult.error("获取失败");
-            }
-        }
-
-        return AjaxResult.error("获取失败");
-    }
-
-
-    @RequestMapping("/realGetWaybillPdf")
-    public AjaxResult realGetWaybillPdf(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType,String isNeedPdf)
-    {
-        if(StringUtils.isEmpty(billCode)){
-            return AjaxResult.error("参数错误");
-        }
-
-        try {
-            response.setCharacterEncoding("UTF-8");
-            response.setContentType("application/pdf");
-            response.setHeader("Content-Disposition", "filename=" + billCode+".pdf");
-            OutputStream os=response.getOutputStream();
-
-            Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, tplCode,lang, printType);
-            if(order!=null) {
-                IXddTplPrint tplPrint = new TanexTplPrintImpl();
-                tplPrint.genPDF(order, os);
-            }else{
-                return AjaxResult.error("运单不存在");
-            }
-
-            return null;
-        }catch (Exception ex){
-            ex.printStackTrace();
-            return  AjaxResult.error("获取异常");
-        }
-
-    }
-
-    @RequestMapping("/realGetWaybillPng")
-    public AjaxResult realGetWaybillPng(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang,String tplCode, String printType,String isNeedPdf)
-    {
-
-        if(StringUtils.isEmpty(billCode)){
-            return AjaxResult.error("参数错误");
-        }
-
-        try {
-            response.setCharacterEncoding("UTF-8");
-            response.setContentType(MediaType.IMAGE_PNG_VALUE);
-            response.setHeader("Content-Disposition", "filename=" + billCode+".png");
-            OutputStream os=response.getOutputStream();
-
-            Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange,tplCode, lang, printType);
-            if(order!=null) {
-                IXddTplPrint tplPrint = new TanexTplPrintImpl();
-                tplPrint.genPNG(order, os);
-            }else{
-                return AjaxResult.error("运单不存在");
-                // 忽略错误
-            }
-
-
-            return null;
-        }catch (Exception ex){
-            ex.printStackTrace();
-            return AjaxResult.error("系统异常");
-        }
-
-    }
-
-
-
-
-    @RequestMapping("/updatePrintStatus")
-    public AjaxResult updatePrintStatus(String billCode)
-    {
-
-        if(StringUtils.isEmpty(billCode)){
-            return AjaxResult.error("参数错误");
-        }
-
-        if(!StringUtils.isEmpty(billCode)){
-            try {
-                emisBaseService.updatePrintStatus(billCode);
-
-                return AjaxResult.success("处理成功");
-            }catch (Exception ex){
-                ex.printStackTrace();
-                return AjaxResult.error("处理失败");
-            }
-        }
-
-        return AjaxResult.error("处理失败");
-
-    }
-
-    @RequestMapping("/getPrintDataByPrinter")
-    public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType)
-    {
-
-        if(StringUtils.isEmpty(billCode)){
-            return AjaxResult.error("参数错误");
-        }
-
-        if(!StringUtils.isEmpty(billCode)){
-            try {
-
-                Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange,tplCode, lang, printType);
-                JSONObject printItem = new JSONObject();
-                printItem.put("billCode",billCode);
-
-                if(order!=null) {
-                    printItem.put("billDetail",Base64.getEncoder().encodeToString(JSONObject.toJSONString(order).getBytes(Charset.forName("UTF-8"))));
-                    printItem.put("isEncrpt",false);
-                    printItem.put("printCount",1);
-                    printItem.put("printDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date()));
-                    printItem.put("result","success");
-                    printItem.put("message","success");
-                }else{
-                    printItem.put("result","fail");
-                    printItem.put("message","未获取到数据");
-                }
-
-
-                return AjaxResult.success("获取成功",printItem);
-            }catch (Exception ex){
-                ex.printStackTrace();
-                return AjaxResult.error("获取失败");
-            }
-        }
-
-        return AjaxResult.error("获取失败");
-
-    }
-
 
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/ScanDataHelper.java b/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/ScanDataHelper.java
deleted file mode 100644
index 3795d58..0000000
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/ScanDataHelper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.xdadan.erp.emis.service.impl;
-
-import com.xdadan.erp.oms.common.core.domain.entity.SysUser;
-import com.xdadan.erp.emis.domain.EmisTmsScanRecord;
-import com.xdadan.erp.emis.domain.enumtype.ScanType;
-import org.apache.commons.lang3.StringUtils;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-public class ScanDataHelper {
-
-}
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisBrand.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisBrand.java
similarity index 70%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisBrand.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisBrand.java
index 0442404..ef8eced 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisBrand.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisBrand.java
@@ -8,17 +8,9 @@
  * @Description: <p> 品牌 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisContinent.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisContinent.java
similarity index 70%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisContinent.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisContinent.java
index d61e568..fccd3e4 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisContinent.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisContinent.java
@@ -8,17 +8,9 @@
  * @Description: <p> 全球大区 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCountry.java
similarity index 72%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCountry.java
index b2b93b8..aa140be 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCountry.java
@@ -8,17 +8,9 @@
  * @Description: <p> 国家 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCountryArea.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCountryArea.java
similarity index 67%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCountryArea.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCountryArea.java
index 35e2a97..35f3fdd 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCountryArea.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCountryArea.java
@@ -8,17 +8,9 @@
  * @Description: <p> 国家大区表 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerAccount.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCustomerAccount.java
similarity index 77%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerAccount.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCustomerAccount.java
index 06eb6b7..cf92bf3 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerAccount.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCustomerAccount.java
@@ -8,17 +8,9 @@
  * @Description: <p> 快递用户结算账户 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerAddress.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCustomerAddress.java
similarity index 98%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerAddress.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCustomerAddress.java
index 749e06f..da04c91 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerAddress.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCustomerAddress.java
@@ -8,7 +8,7 @@
  * @Description: <p> 客户收寄件地址 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerSettleBill.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCustomerSettleBill.java
similarity index 88%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerSettleBill.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCustomerSettleBill.java
index c2b6a5e..d376e52 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerSettleBill.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCustomerSettleBill.java
@@ -8,17 +8,9 @@
  * @Description: <p> 快递用户结算账单 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCustomerUser.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCustomerUser.java
index 9b10bf7..d0ba873 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisCustomerUser.java
@@ -8,16 +8,11 @@
  * @Description: <p> 快递客户用户 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
+
 import java.util.Date;
 import lombok.Data;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisDestination.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisDestination.java
similarity index 79%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisDestination.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisDestination.java
index 4ad701f..3386176 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisDestination.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisDestination.java
@@ -8,17 +8,9 @@
  * @Description: <p> 目的地 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPag.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisElectronicPag.java
similarity index 82%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPag.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisElectronicPag.java
index 3a9c4ba..aacb1c8 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPag.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisElectronicPag.java
@@ -8,15 +8,11 @@
  * @Description: <p> 电子面单 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPagApply.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisElectronicPagApply.java
similarity index 89%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPagApply.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisElectronicPagApply.java
index 7b83263..99ca861 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPagApply.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisElectronicPagApply.java
@@ -8,15 +8,11 @@
  * @Description: <p> 网点电子面单申请 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicSitePag.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisElectronicSitePag.java
similarity index 85%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicSitePag.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisElectronicSitePag.java
index 6a71f2a..6c3044a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicSitePag.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisElectronicSitePag.java
@@ -8,15 +8,11 @@
  * @Description: <p> 站点电子面单 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisFeeType.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisFeeType.java
similarity index 68%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisFeeType.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisFeeType.java
index 70ef60d..8c8fae0 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisFeeType.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisFeeType.java
@@ -8,16 +8,9 @@
  * @Description: <p> 费用类型 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisGoods.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisGoods.java
similarity index 90%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisGoods.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisGoods.java
index bc535b7..70902f3 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisGoods.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisGoods.java
@@ -8,17 +8,12 @@
  * @Description: <p> 货物信息 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
-import java.util.Date;
+
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisMaterial.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisMaterial.java
similarity index 80%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisMaterial.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisMaterial.java
index b77ceb8..c7fa23d 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisMaterial.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisMaterial.java
@@ -8,17 +8,12 @@
  * @Description: <p> 物料类型 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
-import java.util.Date;
+
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayAccount.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisMonthpayAccount.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayAccount.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisMonthpayAccount.java
index ba6d0fc..0d25e87 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayAccount.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisMonthpayAccount.java
@@ -8,16 +8,11 @@
  * @Description: <p> 月结账户表 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
+
 import java.util.Date;
 import lombok.Data;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayUseApply.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisMonthpayUseApply.java
similarity index 81%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayUseApply.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisMonthpayUseApply.java
index 31f2ff3..f885165 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayUseApply.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisMonthpayUseApply.java
@@ -8,16 +8,11 @@
  * @Description: <p> 月结账号使用申请关联 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
+
 import java.util.Date;
 import lombok.Data;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisNotCalcAging.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisNotCalcAging.java
similarity index 77%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisNotCalcAging.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisNotCalcAging.java
index e80054a..2986a43 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisNotCalcAging.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisNotCalcAging.java
@@ -8,15 +8,11 @@
  * @Description: <p> 不计时效维护 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.util.Date;
 import lombok.Data;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisPrintTpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisPrintTpl.java
similarity index 77%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisPrintTpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisPrintTpl.java
index 535e111..df60950 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisPrintTpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisPrintTpl.java
@@ -8,17 +8,9 @@
  * @Description: <p> 快递打印模板 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisPrintTplRel.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisPrintTplRel.java
similarity index 66%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisPrintTplRel.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisPrintTplRel.java
index c6c7fd9..b14946a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisPrintTplRel.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisPrintTplRel.java
@@ -8,17 +8,9 @@
  * @Description: <p> 快递商户关联表 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisProblemType.java
similarity index 73%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisProblemType.java
index 35cbc12..c138f6e 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisProblemType.java
@@ -8,17 +8,9 @@
  * @Description: <p> 问题件类型 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteDispArea.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisQuoteDispArea.java
similarity index 74%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteDispArea.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisQuoteDispArea.java
index 5ccfc57..7358651 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteDispArea.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisQuoteDispArea.java
@@ -8,17 +8,9 @@
  * @Description: <p> 派件区域 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteExpression.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisQuoteExpression.java
similarity index 77%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteExpression.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisQuoteExpression.java
index 2081513..0acefcb 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteExpression.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisQuoteExpression.java
@@ -8,16 +8,9 @@
  * @Description: <p> 费用计算表达式 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisQuotePrice.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisQuotePrice.java
index dd9da6a..fc9740d 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisQuotePrice.java
@@ -8,15 +8,11 @@
  * @Description: <p> 费用报价 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteSendArea.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisQuoteSendArea.java
similarity index 74%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteSendArea.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisQuoteSendArea.java
index 3f8ef0a..b0613df 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteSendArea.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisQuoteSendArea.java
@@ -8,17 +8,9 @@
  * @Description: <p> 寄件区域 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisRegion.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisRegion.java
similarity index 75%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisRegion.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisRegion.java
index 1aecfb0..3b6ce76 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisRegion.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisRegion.java
@@ -8,17 +8,9 @@
  * @Description: <p> 四级省市区镇表 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisSite.java
similarity index 96%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisSite.java
index bf0a5fb..3f56a8a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisSite.java
@@ -8,16 +8,11 @@
  * @Description: <p> 网点 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
+
 import java.util.Date;
 import lombok.Data;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisSiteAccount.java
similarity index 82%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisSiteAccount.java
index fe1b556..94212da 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisSiteAccount.java
@@ -8,17 +8,9 @@
  * @Description: <p> 网点结算账户 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisSiteSettleRecord.java
similarity index 89%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisSiteSettleRecord.java
index 439abc5..b987626 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisSiteSettleRecord.java
@@ -8,17 +8,9 @@
  * @Description: <p> 网点账户结算记录 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisSpecialCalcWeight.java
similarity index 81%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisSpecialCalcWeight.java
index 635c02e..f7df362 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisSpecialCalcWeight.java
@@ -8,16 +8,11 @@
  * @Description: <p> 特殊取重 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsPack.java
similarity index 86%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsPack.java
index 0afc573..beefbdd 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsPack.java
@@ -8,15 +8,11 @@
  * @Description: <p> TMS合包 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsPackDtl.java
similarity index 77%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsPackDtl.java
index 1809e57..76340c8 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsPackDtl.java
@@ -8,16 +8,11 @@
  * @Description: <p> TMS合包明细 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
+
 import java.util.Date;
 import lombok.Data;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanPicInfo.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsScanPicInfo.java
similarity index 74%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanPicInfo.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsScanPicInfo.java
index b24b794..b2001b9 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanPicInfo.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsScanPicInfo.java
@@ -8,17 +8,9 @@
  * @Description: <p> TMS扫描图片信息 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsScanRecord.java
similarity index 90%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsScanRecord.java
index aa9fdce..f6db107 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsScanRecord.java
@@ -8,16 +8,11 @@
  * @Description: <p> TMS扫描记录 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsSiteBatch.java
similarity index 89%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsSiteBatch.java
index 3f84a9b..3b8272d 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsSiteBatch.java
@@ -8,15 +8,11 @@
  * @Description: <p> TMS组批次 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsSiteBatchDtl.java
similarity index 78%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsSiteBatchDtl.java
index 1153c26..c59b13e 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsSiteBatchDtl.java
@@ -8,16 +8,11 @@
  * @Description: <p> TMS组批次明细 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
+
 import java.util.Date;
 import lombok.Data;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchLoading.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsSiteBatchLoading.java
similarity index 70%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchLoading.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsSiteBatchLoading.java
index 925f467..4715d2a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchLoading.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsSiteBatchLoading.java
@@ -8,17 +8,9 @@
  * @Description: <p> TMS组批次配载 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlan.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsTransPlan.java
similarity index 76%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlan.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsTransPlan.java
index c4833e0..c4af250 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlan.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsTransPlan.java
@@ -8,17 +8,11 @@
  * @Description: <p> TMS承运线路计划 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 import lombok.Data;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlanDtl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsTransPlanDtl.java
similarity index 76%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlanDtl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsTransPlanDtl.java
index 87a9005..51a556f 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlanDtl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTmsTransPlanDtl.java
@@ -8,17 +8,12 @@
  * @Description: <p> TMS承运线路计划明细 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
-import java.util.Date;
+
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTransLine.java
similarity index 81%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTransLine.java
index a992f6a..e88aca8 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTransLine.java
@@ -8,16 +8,9 @@
  * @Description: <p> 线路 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTransProduct.java
similarity index 79%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTransProduct.java
index 39e19e5..c4fd24b 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisTransProduct.java
@@ -8,16 +8,9 @@
  * @Description: <p> 运输产品类型 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWarehouseIn.java
similarity index 82%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWarehouseIn.java
index 5427877..acf3558 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWarehouseIn.java
@@ -8,16 +8,11 @@
  * @Description: <p> 进仓单 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
+
 import java.util.Date;
 import lombok.Data;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWarehouseInBatch.java
similarity index 85%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWarehouseInBatch.java
index 3173e33..b7ba52b 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWarehouseInBatch.java
@@ -8,15 +8,11 @@
  * @Description: <p> 进仓单批次 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInDtl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWarehouseInDtl.java
similarity index 85%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInDtl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWarehouseInDtl.java
index 6ca6dff..4ee3a40 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInDtl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWarehouseInDtl.java
@@ -8,17 +8,12 @@
  * @Description: <p> 进仓单明细 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
-import java.util.Date;
+
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybill.java
similarity index 96%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybill.java
index c74520a..d487260 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybill.java
@@ -8,18 +8,11 @@
  * @Description: <p> 运单列表 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillAttachment.java
similarity index 73%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillAttachment.java
index f371d64..63d2edc 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillAttachment.java
@@ -8,17 +8,9 @@
  * @Description: <p> 运单附件 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillCargo.java
similarity index 84%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillCargo.java
index 33b4bef..0236ad7 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillCargo.java
@@ -8,17 +8,12 @@
  * @Description: <p> 运单货物 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
-import java.util.Date;
+
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillFeeitem.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillFeeitem.java
similarity index 79%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillFeeitem.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillFeeitem.java
index e66bfbf..12cc6d3 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillFeeitem.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillFeeitem.java
@@ -8,17 +8,12 @@
  * @Description: <p> 运单费用条目 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
-import java.util.Date;
+
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemFaq.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillProblemFaq.java
similarity index 73%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemFaq.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillProblemFaq.java
index d31a0fe..4b23f92 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemFaq.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillProblemFaq.java
@@ -8,17 +8,9 @@
  * @Description: <p> 问题件FAG 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Data;
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillProblemInfo.java
similarity index 88%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillProblemInfo.java
index 9a97774..5529dfb 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillProblemInfo.java
@@ -8,16 +8,11 @@
  * @Description: <p> 问题件 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
-import java.math.BigDecimal;
+
 import java.util.Date;
 import lombok.Data;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillTransfer.java
similarity index 83%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillTransfer.java
index 84ffa39..5fb2b30 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/EmisWaybillTransfer.java
@@ -8,15 +8,11 @@
  * @Description: <p> 运单转件表 实体类 </p>
  */
 
-package com.xdadan.erp.emis.domain;
+package com.xdadan.erp.oms2c.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.xdadan.erp.oms.common.annotation.Excel;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.oms.common.core.domain.TreeEntity;
-import java.io.Serializable;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/EmisBizErrorType.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/EmisBizErrorType.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/EmisBizErrorType.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/EmisBizErrorType.java
index 674ad7a..7e56534 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/EmisBizErrorType.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/EmisBizErrorType.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.domain.enumtype;
+package com.xdadan.erp.oms2c.domain.enumtype;
 
 import lombok.Getter;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/PaymentStatus.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/PaymentStatus.java
similarity index 90%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/PaymentStatus.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/PaymentStatus.java
index f9e8176..74d7cd6 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/PaymentStatus.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/PaymentStatus.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.domain.enumtype;
+package com.xdadan.erp.oms2c.domain.enumtype;
 
 /**
  * 付款状态
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/ScanType.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/ScanType.java
similarity index 97%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/ScanType.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/ScanType.java
index 81c8075..24af304 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/ScanType.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/ScanType.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.domain.enumtype;
+package com.xdadan.erp.oms2c.domain.enumtype;
 
 public enum ScanType {
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/TransType.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/TransType.java
similarity index 88%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/TransType.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/TransType.java
index 42af69f..5dd60e7 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/TransType.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/TransType.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.domain.enumtype;
+package com.xdadan.erp.oms2c.domain.enumtype;
 
 public enum TransType {
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillAttachType.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/WaybillAttachType.java
similarity index 88%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillAttachType.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/WaybillAttachType.java
index 2bbeaff..7891f45 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillAttachType.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/WaybillAttachType.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.domain.enumtype;
+package com.xdadan.erp.oms2c.domain.enumtype;
 
 public enum WaybillAttachType {
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillStatus.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/WaybillStatus.java
similarity index 98%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillStatus.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/WaybillStatus.java
index f1f7dfa..313af63 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillStatus.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/enumtype/WaybillStatus.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.domain.enumtype;
+package com.xdadan.erp.oms2c.domain.enumtype;
 
 /**
  * waybill status
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/exception/EmisBizError.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/exception/EmisBizError.java
similarity index 74%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/exception/EmisBizError.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/exception/EmisBizError.java
index 2fe4229..1273c63 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/exception/EmisBizError.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/exception/EmisBizError.java
@@ -1,6 +1,6 @@
-package com.xdadan.erp.emis.domain.exception;
+package com.xdadan.erp.oms2c.domain.exception;
 
-import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
+import com.xdadan.erp.oms2c.domain.enumtype.EmisBizErrorType;
 
 public class EmisBizError extends Exception {
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatDataInfo.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/stat/ScanStatDataInfo.java
similarity index 58%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatDataInfo.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/stat/ScanStatDataInfo.java
index ccfc580..3050ffe 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatDataInfo.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/stat/ScanStatDataInfo.java
@@ -1,15 +1,8 @@
-package com.xdadan.erp.emis.domain.stat;
+package com.xdadan.erp.oms2c.domain.stat;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import com.xdadan.erp.emis.domain.EmisTmsScanRecord;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 扫描统计信息,自定义VO,非表结构
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/stat/SendStatDataInfo.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/stat/SendStatDataInfo.java
similarity index 80%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/stat/SendStatDataInfo.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/stat/SendStatDataInfo.java
index 723dbc4..64fbdbd 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/stat/SendStatDataInfo.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/stat/SendStatDataInfo.java
@@ -1,10 +1,8 @@
-package com.xdadan.erp.emis.domain.stat;
+package com.xdadan.erp.oms2c.domain.stat;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 寄件录单统计
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/AddressParseResult.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/AddressParseResult.java
similarity index 90%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/AddressParseResult.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/AddressParseResult.java
index 429d8a1..53889ef 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/AddressParseResult.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/AddressParseResult.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.domain.vo;
+package com.xdadan.erp.oms2c.domain.vo;
 
 import lombok.Data;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/Attachment.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/Attachment.java
similarity index 96%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/Attachment.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/Attachment.java
index ba7d98e..73871c0 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/Attachment.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/Attachment.java
@@ -1,6 +1,6 @@
-package com.xdadan.erp.emis.domain.vo;
+package com.xdadan.erp.oms2c.domain.vo;
 
-import com.xdadan.erp.emis.domain.EmisWaybillAttachment;
+import com.xdadan.erp.oms2c.domain.EmisWaybillAttachment;
 import lombok.Data;
 
 import java.util.List;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/Cargo.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/Cargo.java
similarity index 98%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/Cargo.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/Cargo.java
index 75fa5d5..92fa7f2 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/Cargo.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/Cargo.java
@@ -1,6 +1,6 @@
-package com.xdadan.erp.emis.domain.vo;
+package com.xdadan.erp.oms2c.domain.vo;
 
-import com.xdadan.erp.emis.domain.EmisWaybillCargo;
+import com.xdadan.erp.oms2c.domain.EmisWaybillCargo;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/FeeItem.java
similarity index 96%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/FeeItem.java
index 936f304..1dcbb61 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/FeeItem.java
@@ -1,6 +1,6 @@
-package com.xdadan.erp.emis.domain.vo;
+package com.xdadan.erp.oms2c.domain.vo;
 
-import com.xdadan.erp.emis.domain.EmisWaybillFeeitem;
+import com.xdadan.erp.oms2c.domain.EmisWaybillFeeitem;
 import lombok.Data;
 
 import java.math.BigDecimal;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/Reciever.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/Reciever.java
similarity index 88%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/Reciever.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/Reciever.java
index a127cf4..44ad71c 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/Reciever.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/Reciever.java
@@ -1,7 +1,5 @@
-package com.xdadan.erp.emis.domain.vo;
+package com.xdadan.erp.oms2c.domain.vo;
 
-import com.xdadan.erp.emis.domain.EmisWaybill;
-import com.xdadan.erp.emis.domain.EmisWaybillFeeitem;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/Sender.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/Sender.java
similarity index 96%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/Sender.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/Sender.java
index fd99995..9a40b81 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/Sender.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/Sender.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.domain.vo;
+package com.xdadan.erp.oms2c.domain.vo;
 
 import lombok.Data;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/VoBase.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/VoBase.java
similarity index 96%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/VoBase.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/VoBase.java
index d6cc813..2e5ca72 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/VoBase.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/VoBase.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.domain.vo;
+package com.xdadan.erp.oms2c.domain.vo;
 
 
 import org.springframework.util.CollectionUtils;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/WaybillOrder.java
similarity index 99%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/WaybillOrder.java
index a5ffe74..1da34e3 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/WaybillOrder.java
@@ -1,13 +1,12 @@
-package com.xdadan.erp.emis.domain.vo;
+package com.xdadan.erp.oms2c.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xdadan.erp.emis.domain.EmisWaybill;
-import com.xdadan.erp.emis.domain.EmisWaybillAttachment;
-import com.xdadan.erp.emis.domain.EmisWaybillCargo;
-import com.xdadan.erp.emis.domain.EmisWaybillFeeitem;
+import com.xdadan.erp.oms2c.domain.EmisWaybill;
+import com.xdadan.erp.oms2c.domain.EmisWaybillAttachment;
+import com.xdadan.erp.oms2c.domain.EmisWaybillCargo;
+import com.xdadan.erp.oms2c.domain.EmisWaybillFeeitem;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanInfo.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/scan/ScanInfo.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanInfo.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/scan/ScanInfo.java
index 1db21b4..fb3a62f 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanInfo.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/scan/ScanInfo.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.domain.vo.scan;
+package com.xdadan.erp.oms2c.domain.vo.scan;
 
 import lombok.Data;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanResult.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/scan/ScanResult.java
similarity index 89%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanResult.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/scan/ScanResult.java
index f4a3539..5d20326 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanResult.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/scan/ScanResult.java
@@ -1,10 +1,9 @@
-package com.xdadan.erp.emis.domain.vo.scan;
+package com.xdadan.erp.oms2c.domain.vo.scan;
 
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 
 /**
   扫描信息
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanResultItem.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/scan/ScanResultItem.java
similarity index 88%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanResultItem.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/scan/ScanResultItem.java
index 987ad52..cdf55ee 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanResultItem.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/domain/vo/scan/ScanResultItem.java
@@ -1,11 +1,9 @@
-package com.xdadan.erp.emis.domain.vo.scan;
+package com.xdadan.erp.oms2c.domain.vo.scan;
 
-import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisBaseMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisBaseMapper.java
similarity index 89%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisBaseMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisBaseMapper.java
index b684c00..d99080d 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisBaseMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisBaseMapper.java
@@ -8,14 +8,10 @@
  * @Description: <p> 品牌 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.oms.common.core.cache.MybatisRedisCache;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-import java.util.List;
 
 /**
  * @ClassName EmisBaseMapper
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisBrandMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisBrandMapper.java
similarity index 88%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisBrandMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisBrandMapper.java
index 12891ac..7574c19 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisBrandMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisBrandMapper.java
@@ -8,13 +8,11 @@
  * @Description: <p> 品牌 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.oms.common.core.cache.MybatisRedisCache;
-import com.xdadan.erp.emis.domain.EmisBrand;
-import org.apache.ibatis.annotations.CacheNamespace;
+import com.xdadan.erp.oms2c.domain.EmisBrand;
 
 /**
  * @ClassName EmisBrandMapper
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisContinentMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisContinentMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisContinentMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisContinentMapper.java
index 4fd7ecd..7b84c01 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisContinentMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisContinentMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 地球洲 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisContinent;
+import com.xdadan.erp.oms2c.domain.EmisContinent;
 /**
  * @ClassName EmisContinentMapper
  * @Description <p> 地球洲 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCountryAreaMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCountryAreaMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCountryAreaMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCountryAreaMapper.java
index 2f3fb40..5b60613 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCountryAreaMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCountryAreaMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 国家大区表 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisCountryArea;
+import com.xdadan.erp.oms2c.domain.EmisCountryArea;
 /**
  * @ClassName EmisCountryAreaMapper
  * @Description <p> 国家大区表 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCountryMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCountryMapper.java
similarity index 84%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCountryMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCountryMapper.java
index ff34b3e..2669b80 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCountryMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCountryMapper.java
@@ -8,15 +8,11 @@
  * @Description: <p> 国家 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.oms.common.core.cache.MybatisRedisCache;
-import com.xdadan.erp.emis.domain.EmisCountry;
-import org.apache.ibatis.annotations.CacheNamespace;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import com.xdadan.erp.oms2c.domain.EmisCountry;
 
 /**
  * @ClassName EmisCountryMapper
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerAccountMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCustomerAccountMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerAccountMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCustomerAccountMapper.java
index eaca676..8c0f578 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerAccountMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCustomerAccountMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 快递用户结算账户 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisCustomerAccount;
+import com.xdadan.erp.oms2c.domain.EmisCustomerAccount;
 /**
  * @ClassName EmisCustomerAccountMapper
  * @Description <p> 快递用户结算账户 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerAddressMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCustomerAddressMapper.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerAddressMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCustomerAddressMapper.java
index 4fba65f..98b2678 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerAddressMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCustomerAddressMapper.java
@@ -8,14 +8,11 @@
  * @Description: <p> 客户收寄件地址 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
-import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisCustomerAddress;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
+import com.xdadan.erp.oms2c.domain.EmisCustomerAddress;
 
 /**
  * @ClassName EmisCustomerAddressMapper
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerSettleBillMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCustomerSettleBillMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerSettleBillMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCustomerSettleBillMapper.java
index ee17713..cd9ebaa 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerSettleBillMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCustomerSettleBillMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 快递用户结算账单 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisCustomerSettleBill;
+import com.xdadan.erp.oms2c.domain.EmisCustomerSettleBill;
 /**
  * @ClassName EmisCustomerSettleBillMapper
  * @Description <p> 快递用户结算账单 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCustomerUserMapper.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCustomerUserMapper.java
index 9edd30d..a9d55f2 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisCustomerUserMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 快递客户用户 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisCustomerUser;
+import com.xdadan.erp.oms2c.domain.EmisCustomerUser;
 /**
  * @ClassName EmisCustomerUserMapper
  * @Description <p> 快递客户用户 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisDestinationMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisDestinationMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisDestinationMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisDestinationMapper.java
index bd129fd..de81cbc 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisDestinationMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisDestinationMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 目的地 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisDestination;
+import com.xdadan.erp.oms2c.domain.EmisDestination;
 /**
  * @ClassName EmisDestinationMapper
  * @Description <p> 目的地 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisElectronicPagApplyMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisElectronicPagApplyMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisElectronicPagApplyMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisElectronicPagApplyMapper.java
index a5fa165..bd50b02 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisElectronicPagApplyMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisElectronicPagApplyMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 网点电子面单申请 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisElectronicPagApply;
+import com.xdadan.erp.oms2c.domain.EmisElectronicPagApply;
 /**
  * @ClassName EmisElectronicPagApplyMapper
  * @Description <p> 网点电子面单申请 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisElectronicPagMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisElectronicPagMapper.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisElectronicPagMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisElectronicPagMapper.java
index d370a2a..da2a258 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisElectronicPagMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisElectronicPagMapper.java
@@ -8,12 +8,11 @@
  * @Description: <p> 电子面单 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisElectronicPag;
-import com.xdadan.erp.emis.domain.EmisElectronicSitePag;
+import com.xdadan.erp.oms2c.domain.EmisElectronicPag;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Select;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisElectronicSitePagMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisElectronicSitePagMapper.java
similarity index 96%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisElectronicSitePagMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisElectronicSitePagMapper.java
index c041de6..815102a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisElectronicSitePagMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisElectronicSitePagMapper.java
@@ -8,12 +8,11 @@
  * @Description: <p> 电子面单 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisElectronicPag;
-import com.xdadan.erp.emis.domain.EmisElectronicSitePag;
+import com.xdadan.erp.oms2c.domain.EmisElectronicSitePag;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Select;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisFeeTypeMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisFeeTypeMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisFeeTypeMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisFeeTypeMapper.java
index fffd5a7..8ecb703 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisFeeTypeMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisFeeTypeMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 费用类型 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisFeeType;
+import com.xdadan.erp.oms2c.domain.EmisFeeType;
 /**
  * @ClassName EmisFeeTypeMapper
  * @Description <p> 费用类型 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisGoodsMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisGoodsMapper.java
similarity index 88%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisGoodsMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisGoodsMapper.java
index 1ebc1aa..5e58fee 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisGoodsMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisGoodsMapper.java
@@ -8,13 +8,11 @@
  * @Description: <p> 货物信息 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.oms.common.core.cache.MybatisRedisCache;
-import com.xdadan.erp.emis.domain.EmisGoods;
-import org.apache.ibatis.annotations.CacheNamespace;
+import com.xdadan.erp.oms2c.domain.EmisGoods;
 
 /**
  * @ClassName EmisGoodsMapper
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisMaterialMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisMaterialMapper.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisMaterialMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisMaterialMapper.java
index 148185f..7d8e56d 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisMaterialMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisMaterialMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 物料类型 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisMaterial;
+import com.xdadan.erp.oms2c.domain.EmisMaterial;
 /**
  * @ClassName EmisMaterialMapper
  * @Description <p> 物料类型 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisMonthpayAccountMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisMonthpayAccountMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisMonthpayAccountMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisMonthpayAccountMapper.java
index 966cb2b..8d65371 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisMonthpayAccountMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisMonthpayAccountMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 月结账户表 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisMonthpayAccount;
+import com.xdadan.erp.oms2c.domain.EmisMonthpayAccount;
 /**
  * @ClassName EmisMonthpayAccountMapper
  * @Description <p> 月结账户表 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisMonthpayUseApplyMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisMonthpayUseApplyMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisMonthpayUseApplyMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisMonthpayUseApplyMapper.java
index 1d7089b..cbf794c 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisMonthpayUseApplyMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisMonthpayUseApplyMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 月结账号使用申请关联 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisMonthpayUseApply;
+import com.xdadan.erp.oms2c.domain.EmisMonthpayUseApply;
 /**
  * @ClassName EmisMonthpayUseApplyMapper
  * @Description <p> 月结账号使用申请关联 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisNotCalcAgingMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisNotCalcAgingMapper.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisNotCalcAgingMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisNotCalcAgingMapper.java
index 20ab234..5a2f07a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisNotCalcAgingMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisNotCalcAgingMapper.java
@@ -8,12 +8,12 @@
  * @Description: <p> 不计时效维护 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisNotCalcAging;
+import com.xdadan.erp.oms2c.domain.EmisNotCalcAging;
 import org.apache.ibatis.annotations.Param;
 
 /**
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisPrintTplMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisPrintTplMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisPrintTplMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisPrintTplMapper.java
index b3c1bdf..b1cf5cb 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisPrintTplMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisPrintTplMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 快递打印模板 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisPrintTpl;
+import com.xdadan.erp.oms2c.domain.EmisPrintTpl;
 /**
  * @ClassName EmisPrintTplMapper
  * @Description <p> 快递打印模板 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisPrintTplRelMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisPrintTplRelMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisPrintTplRelMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisPrintTplRelMapper.java
index cf8519d..ebee1c6 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisPrintTplRelMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisPrintTplRelMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 快递商户关联表 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisPrintTplRel;
+import com.xdadan.erp.oms2c.domain.EmisPrintTplRel;
 /**
  * @ClassName EmisPrintTplRelMapper
  * @Description <p> 快递商户关联表 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisProblemTypeMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisProblemTypeMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisProblemTypeMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisProblemTypeMapper.java
index b8b9999..8961d87 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisProblemTypeMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisProblemTypeMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 问题件类型 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisProblemType;
+import com.xdadan.erp.oms2c.domain.EmisProblemType;
 /**
  * @ClassName EmisProblemTypeMapper
  * @Description <p> 问题件类型 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisQuoteDispAreaMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisQuoteDispAreaMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisQuoteDispAreaMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisQuoteDispAreaMapper.java
index 8aa4546..fd2b8fd 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisQuoteDispAreaMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisQuoteDispAreaMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 派件区域 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisQuoteDispArea;
+import com.xdadan.erp.oms2c.domain.EmisQuoteDispArea;
 /**
  * @ClassName EmisQuoteDispAreaMapper
  * @Description <p> 派件区域 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisQuoteExpressionMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisQuoteExpressionMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisQuoteExpressionMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisQuoteExpressionMapper.java
index 2a375ac..b57e11d 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisQuoteExpressionMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisQuoteExpressionMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 费用计算表达式 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisQuoteExpression;
+import com.xdadan.erp.oms2c.domain.EmisQuoteExpression;
 /**
  * @ClassName EmisQuoteExpressionMapper
  * @Description <p> 费用计算表达式 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisQuotePriceMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisQuotePriceMapper.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisQuotePriceMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisQuotePriceMapper.java
index 62e5c0b..098fb77 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisQuotePriceMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisQuotePriceMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 费用报价 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisQuotePrice;
+import com.xdadan.erp.oms2c.domain.EmisQuotePrice;
 /**
  * @ClassName EmisQuotePriceMapper
  * @Description <p> 费用报价 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisQuoteSendAreaMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisQuoteSendAreaMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisQuoteSendAreaMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisQuoteSendAreaMapper.java
index 7e4a974..521956e 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisQuoteSendAreaMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisQuoteSendAreaMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 寄件区域 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisQuoteSendArea;
+import com.xdadan.erp.oms2c.domain.EmisQuoteSendArea;
 /**
  * @ClassName EmisQuoteSendAreaMapper
  * @Description <p> 寄件区域 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisRegionMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisRegionMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisRegionMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisRegionMapper.java
index 7ceb207..c8bdc23 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisRegionMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisRegionMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 四级省市区镇表 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisRegion;
+import com.xdadan.erp.oms2c.domain.EmisRegion;
 /**
  * @ClassName EmisRegionMapper
  * @Description <p> 四级省市区镇表 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteAccountMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisSiteAccountMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteAccountMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisSiteAccountMapper.java
index d86936c..a0931bc 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteAccountMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisSiteAccountMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 网点结算账户 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisSiteAccount;
+import com.xdadan.erp.oms2c.domain.EmisSiteAccount;
 /**
  * @ClassName EmisSiteAccountMapper
  * @Description <p> 网点结算账户 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisSiteMapper.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisSiteMapper.java
index f8e0472..f801b10 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisSiteMapper.java
@@ -8,12 +8,12 @@
  * @Description: <p> 网点 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xdadan.erp.oms.common.core.cache.MybatisRedisCache;
-import com.xdadan.erp.emis.domain.EmisSite;
+import com.xdadan.erp.oms2c.domain.EmisSite;
 import org.apache.ibatis.annotations.CacheNamespace;
 
 /**
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteSettleRecordMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisSiteSettleRecordMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteSettleRecordMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisSiteSettleRecordMapper.java
index de44e98..751ffa4 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteSettleRecordMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisSiteSettleRecordMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 网点账户结算记录 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisSiteSettleRecord;
+import com.xdadan.erp.oms2c.domain.EmisSiteSettleRecord;
 /**
  * @ClassName EmisSiteSettleRecordMapper
  * @Description <p> 网点账户结算记录 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisSpecialCalcWeightMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisSpecialCalcWeightMapper.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisSpecialCalcWeightMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisSpecialCalcWeightMapper.java
index cd3d596..1184089 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisSpecialCalcWeightMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisSpecialCalcWeightMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 特殊取重 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisSpecialCalcWeight;
+import com.xdadan.erp.oms2c.domain.EmisSpecialCalcWeight;
 /**
  * @ClassName EmisSpecialCalcWeightMapper
  * @Description <p> 特殊取重 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsPackDtlMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsPackDtlMapper.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsPackDtlMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsPackDtlMapper.java
index 740a92b..72f290e 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsPackDtlMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsPackDtlMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> TMS合包明细 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisTmsPackDtl;
+import com.xdadan.erp.oms2c.domain.EmisTmsPackDtl;
 /**
  * @ClassName EmisTmsPackDtlMapper
  * @Description <p> TMS合包明细 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsPackMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsPackMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsPackMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsPackMapper.java
index a4035fb..d691a68 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsPackMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsPackMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> TMS合包 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisTmsPack;
+import com.xdadan.erp.oms2c.domain.EmisTmsPack;
 /**
  * @ClassName EmisTmsPackMapper
  * @Description <p> TMS合包 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanPicInfoMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsScanPicInfoMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanPicInfoMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsScanPicInfoMapper.java
index c04d3e6..73e3b87 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanPicInfoMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsScanPicInfoMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> TMS扫描图片信息 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisTmsScanPicInfo;
+import com.xdadan.erp.oms2c.domain.EmisTmsScanPicInfo;
 /**
  * @ClassName EmisTmsScanPicInfoMapper
  * @Description <p> TMS扫描图片信息 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsScanRecordMapper.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsScanRecordMapper.java
index e3e994e..1231453 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsScanRecordMapper.java
@@ -8,16 +8,14 @@
  * @Description: <p> TMS扫描记录 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisTmsScanPicInfo;
-import com.xdadan.erp.emis.domain.EmisTmsScanRecord;
-import com.xdadan.erp.emis.domain.stat.ScanStatDataInfo;
+import com.xdadan.erp.oms2c.domain.EmisTmsScanRecord;
+import com.xdadan.erp.oms2c.domain.stat.ScanStatDataInfo;
 import org.apache.ibatis.annotations.Param;
 
 /**
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchDtlMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsSiteBatchDtlMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchDtlMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsSiteBatchDtlMapper.java
index 28c8cef..d126180 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchDtlMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsSiteBatchDtlMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 一级网点TMS组批次明细 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisTmsSiteBatchDtl;
+import com.xdadan.erp.oms2c.domain.EmisTmsSiteBatchDtl;
 /**
  * @ClassName EmisTmsSiteBatchDtlMapper
  * @Description <p> 一级网点TMS组批次明细 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchLoadingMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsSiteBatchLoadingMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchLoadingMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsSiteBatchLoadingMapper.java
index 2392524..4f2c91a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchLoadingMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsSiteBatchLoadingMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 一级网点TMS组批次配置 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisTmsSiteBatchLoading;
+import com.xdadan.erp.oms2c.domain.EmisTmsSiteBatchLoading;
 /**
  * @ClassName EmisTmsSiteBatchLoadingMapper
  * @Description <p> 一级网点TMS组批次配置 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsSiteBatchMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsSiteBatchMapper.java
index 3b42e05..cab6f92 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsSiteBatchMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 一级网点TMS组批次 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisTmsSiteBatch;
+import com.xdadan.erp.oms2c.domain.EmisTmsSiteBatch;
 /**
  * @ClassName EmisTmsSiteBatchMapper
  * @Description <p> 一级网点TMS组批次 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsTransPlanDtlMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsTransPlanDtlMapper.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsTransPlanDtlMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsTransPlanDtlMapper.java
index 7944163..335e022 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsTransPlanDtlMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsTransPlanDtlMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> TMS承运线路计划明细 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisTmsTransPlanDtl;
+import com.xdadan.erp.oms2c.domain.EmisTmsTransPlanDtl;
 /**
  * @ClassName EmisTmsTransPlanDtlMapper
  * @Description <p> TMS承运线路计划明细 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsTransPlanMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsTransPlanMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsTransPlanMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsTransPlanMapper.java
index cca3ed0..91e149b 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsTransPlanMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTmsTransPlanMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> TMS承运线路计划 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisTmsTransPlan;
+import com.xdadan.erp.oms2c.domain.EmisTmsTransPlan;
 /**
  * @ClassName EmisTmsTransPlanMapper
  * @Description <p> TMS承运线路计划 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTransLineMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTransLineMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTransLineMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTransLineMapper.java
index bb5e752..978cb39 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTransLineMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTransLineMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 线路 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisTransLine;
+import com.xdadan.erp.oms2c.domain.EmisTransLine;
 /**
  * @ClassName EmisTransLineMapper
  * @Description <p> 线路 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTransProductMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTransProductMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTransProductMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTransProductMapper.java
index d44e200..021c7fd 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisTransProductMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisTransProductMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 运输产品类型 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisTransProduct;
+import com.xdadan.erp.oms2c.domain.EmisTransProduct;
 /**
  * @ClassName EmisTransProductMapper
  * @Description <p> 运输产品类型 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWarehouseInBatchMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWarehouseInBatchMapper.java
index 7d6f311..7eafa81 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWarehouseInBatchMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 进仓单批次 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisWarehouseInBatch;
+import com.xdadan.erp.oms2c.domain.EmisWarehouseInBatch;
 /**
  * @ClassName EmisWarehouseInBatchMapper
  * @Description <p> 进仓单批次 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInDtlMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWarehouseInDtlMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInDtlMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWarehouseInDtlMapper.java
index 4bd0538..f8849e7 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInDtlMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWarehouseInDtlMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 进仓单明细 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisWarehouseInDtl;
+import com.xdadan.erp.oms2c.domain.EmisWarehouseInDtl;
 /**
  * @ClassName EmisWarehouseInDtlMapper
  * @Description <p> 进仓单明细 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWarehouseInMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWarehouseInMapper.java
index f3e8eac..ff2c5dd 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWarehouseInMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 进仓单 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisWarehouseIn;
+import com.xdadan.erp.oms2c.domain.EmisWarehouseIn;
 /**
  * @ClassName EmisWarehouseInMapper
  * @Description <p> 进仓单 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillAttachmentMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillAttachmentMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillAttachmentMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillAttachmentMapper.java
index a00951d..6a44268 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillAttachmentMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillAttachmentMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 运单附件 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisWaybillAttachment;
+import com.xdadan.erp.oms2c.domain.EmisWaybillAttachment;
 /**
  * @ClassName EmisWaybillAttachmentMapper
  * @Description <p> 运单附件 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillCargoMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillCargoMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillCargoMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillCargoMapper.java
index 95c1cc3..19f8bc4 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillCargoMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillCargoMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 运单货物 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisWaybillCargo;
+import com.xdadan.erp.oms2c.domain.EmisWaybillCargo;
 /**
  * @ClassName EmisWaybillCargoMapper
  * @Description <p> 运单货物 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillFeeitemMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillFeeitemMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillFeeitemMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillFeeitemMapper.java
index a12b307..4de03e9 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillFeeitemMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillFeeitemMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 运单费用条目 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisWaybillFeeitem;
+import com.xdadan.erp.oms2c.domain.EmisWaybillFeeitem;
 /**
  * @ClassName EmisWaybillFeeitemMapper
  * @Description <p> 运单费用条目 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillMapper.java
similarity index 96%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillMapper.java
index 8762985..a36198d 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillMapper.java
@@ -8,14 +8,13 @@
  * @Description: <p> 运单列表 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisWaybill;
+import com.xdadan.erp.oms2c.domain.EmisWaybill;
 import org.apache.ibatis.annotations.Param;
 
 /**
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillProblemFaqMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillProblemFaqMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillProblemFaqMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillProblemFaqMapper.java
index de21c23..b3dcb30 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillProblemFaqMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillProblemFaqMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 问题件FAG Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisWaybillProblemFaq;
+import com.xdadan.erp.oms2c.domain.EmisWaybillProblemFaq;
 /**
  * @ClassName EmisWaybillProblemFaqMapper
  * @Description <p> 问题件FAG Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillProblemInfoMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillProblemInfoMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillProblemInfoMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillProblemInfoMapper.java
index bfe8a74..a99f57f 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillProblemInfoMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillProblemInfoMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 问题件 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisWaybillProblemInfo;
+import com.xdadan.erp.oms2c.domain.EmisWaybillProblemInfo;
 /**
  * @ClassName EmisWaybillProblemInfoMapper
  * @Description <p> 问题件 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillTransferMapper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillTransferMapper.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillTransferMapper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillTransferMapper.java
index 231cfcc..a5104e0 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillTransferMapper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/mapper/EmisWaybillTransferMapper.java
@@ -8,11 +8,11 @@
  * @Description: <p> 运单转件表 Mapper 接口 </p>
  *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
  */
-package com.xdadan.erp.emis.mapper;
+package com.xdadan.erp.oms2c.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisWaybillTransfer;
+import com.xdadan.erp.oms2c.domain.EmisWaybillTransfer;
 /**
  * @ClassName EmisWaybillTransferMapper
  * @Description <p> 运单转件表 Mapper 接口 </p>
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/EmisBaseService.java
similarity index 96%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/EmisBaseService.java
index 284fa80..1d6843f 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/EmisBaseService.java
@@ -8,49 +8,27 @@
  * @Description: <p> 运单列表 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
- import cn.hutool.core.collection.CollectionUtil;
- import cn.hutool.core.lang.Snowflake;
- import cn.hutool.core.util.IdUtil;
- import cn.hutool.db.DbUtil;
- import com.alibaba.fastjson.JSON;
  import com.alibaba.fastjson.JSONObject;
- import com.alibaba.fastjson.serializer.PropertyFilter;
- import com.alibaba.fastjson.serializer.SerializeFilter;
- import com.alibaba.fastjson.serializer.SerializerFeature;
- import com.alibaba.fastjson.serializer.ValueFilter;
- import com.fasterxml.jackson.annotation.JsonFormat;
  import com.xdadan.erp.oms.common.core.domain.entity.SysUser;
  import com.xdadan.erp.oms.common.utils.DateUtils;
  import com.xdadan.erp.oms.common.utils.DictUtils;
  import com.xdadan.erp.oms.common.utils.SecurityUtils;
- import com.xdadan.erp.emis.domain.*;
- import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
- import com.xdadan.erp.emis.domain.enumtype.PaymentStatus;
- import com.xdadan.erp.emis.domain.enumtype.ScanType;
- import com.xdadan.erp.emis.domain.enumtype.WaybillStatus;
- import com.xdadan.erp.emis.domain.exception.EmisBizError;
- import com.xdadan.erp.emis.domain.vo.WaybillOrder;
- import com.xdadan.erp.emis.domain.vo.scan.ScanResultItem;
- import com.xdadan.erp.emis.mapper.*;
- import com.xdadan.erp.emis.service.IEmisWaybillAttachmentService;
- import com.xdadan.erp.emis.service.IEmisWaybillCargoService;
- import com.xdadan.erp.emis.service.IEmisWaybillFeeitemService;
- import com.xdadan.erp.emis.service.IEmisWaybillService;
- import com.xdadan.erp.emis.utils.WaybillHelper;
- import com.xdadan.erp.emis.utils.sensitive.Convert;
+ import com.xdadan.erp.oms2c.domain.*;
+ import com.xdadan.erp.oms2c.domain.enumtype.PaymentStatus;
+ import com.xdadan.erp.oms2c.domain.enumtype.ScanType;
+ import com.xdadan.erp.oms2c.domain.enumtype.WaybillStatus;
+ import com.xdadan.erp.oms2c.mapper.*;
+ import com.xdadan.erp.oms2c.utils.WaybillHelper;
+ import com.xdadan.erp.oms2c.utils.sensitive.Convert;
  import com.xdadan.erp.system.mapper.SysUserMapper;
- import jdk.nashorn.internal.runtime.Undefined;
  import lombok.extern.slf4j.Slf4j;
  import org.apache.commons.lang3.StringUtils;
  import org.springframework.beans.factory.annotation.Autowired;
  import org.springframework.stereotype.Service;
- import org.springframework.transaction.annotation.Transactional;
  import org.springframework.util.CollectionUtils;
 
- import java.math.BigDecimal;
- import java.text.SimpleDateFormat;
  import java.util.*;
 
  /**
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisBrandService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisBrandService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisBrandService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisBrandService.java
index 00eed8a..fce66c7 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisBrandService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisBrandService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 品牌 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisBrand;
+import com.xdadan.erp.oms2c.domain.EmisBrand;
 
 /**
  * @ClassName EmisBrandService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisContinentService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisContinentService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisContinentService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisContinentService.java
index a287119..0beb3a3 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisContinentService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisContinentService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 地球洲 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisContinent;
+import com.xdadan.erp.oms2c.domain.EmisContinent;
 
 /**
  * @ClassName EmisContinentService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCountryAreaService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCountryAreaService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCountryAreaService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCountryAreaService.java
index 7152f11..3859bdc 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCountryAreaService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCountryAreaService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 国家大区表 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisCountryArea;
+import com.xdadan.erp.oms2c.domain.EmisCountryArea;
 
 /**
  * @ClassName EmisCountryAreaService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCountryService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCountryService.java
similarity index 90%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCountryService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCountryService.java
index 8112f91..d80e0ff 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCountryService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCountryService.java
@@ -7,11 +7,11 @@
  * @version v1.0  
  * @Description: <p> 国家 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisCountry;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.EmisCountry;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
 
  /**
  * @ClassName EmisCountryService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerAccountService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCustomerAccountService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerAccountService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCustomerAccountService.java
index c9ca6dd..6ba519a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerAccountService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCustomerAccountService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 快递用户结算账户 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisCustomerAccount;
+import com.xdadan.erp.oms2c.domain.EmisCustomerAccount;
 
 /**
  * @ClassName EmisCustomerAccountService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerAddressService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCustomerAddressService.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerAddressService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCustomerAddressService.java
index 036576c..7f83609 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerAddressService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCustomerAddressService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 客户收寄件地址 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisCustomerAddress;
+import com.xdadan.erp.oms2c.domain.EmisCustomerAddress;
 
 /**
  * @ClassName EmisCustomerAddressService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerSettleBillService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCustomerSettleBillService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerSettleBillService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCustomerSettleBillService.java
index ce9966d..a017ccf 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerSettleBillService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCustomerSettleBillService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 快递用户结算账单 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisCustomerSettleBill;
+import com.xdadan.erp.oms2c.domain.EmisCustomerSettleBill;
 
 /**
  * @ClassName EmisCustomerSettleBillService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerUserService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCustomerUserService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerUserService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCustomerUserService.java
index 63ddd51..4949229 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerUserService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisCustomerUserService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 快递客户用户 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisCustomerUser;
+import com.xdadan.erp.oms2c.domain.EmisCustomerUser;
 
 /**
  * @ClassName EmisCustomerUserService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisDestinationService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisDestinationService.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisDestinationService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisDestinationService.java
index 2a0eebe..78d595f 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisDestinationService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisDestinationService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 目的地 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisDestination;
+import com.xdadan.erp.oms2c.domain.EmisDestination;
 
 /**
  * @ClassName EmisDestinationService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagApplyService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisElectronicPagApplyService.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagApplyService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisElectronicPagApplyService.java
index e1478fc..104dddd 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagApplyService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisElectronicPagApplyService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 网点电子面单申请 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisElectronicPagApply;
+import com.xdadan.erp.oms2c.domain.EmisElectronicPagApply;
 
 /**
  * @ClassName EmisElectronicPagApplyService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisElectronicPagService.java
similarity index 93%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisElectronicPagService.java
index cecc72c..ad32c53 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisElectronicPagService.java
@@ -7,13 +7,12 @@
  * @version v1.0  
  * @Description: <p> 电子面单 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import java.util.Map;
 
-import com.xdadan.erp.emis.domain.EmisElectronicPag;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.EmisElectronicPag;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
 
  /**
  * @ClassName EmisElectronicPagService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicSitePagService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisElectronicSitePagService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicSitePagService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisElectronicSitePagService.java
index 9242e24..5dafcea 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicSitePagService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisElectronicSitePagService.java
@@ -7,13 +7,13 @@
  * @version v1.0  
  * @Description: <p> 电子面单 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
 import java.util.Map;
 
-import com.xdadan.erp.emis.domain.EmisElectronicSitePag;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.EmisElectronicSitePag;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
 
  /**
  * @ClassName EmisElectronicSitePagService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisFeeTypeService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisFeeTypeService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisFeeTypeService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisFeeTypeService.java
index 3595e97..baa276b 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisFeeTypeService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisFeeTypeService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 费用类型 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisFeeType;
+import com.xdadan.erp.oms2c.domain.EmisFeeType;
 
 /**
  * @ClassName EmisFeeTypeService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisGoodsService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisGoodsService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisGoodsService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisGoodsService.java
index 9e1c52d..805add0 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisGoodsService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisGoodsService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 货物信息 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisGoods;
+import com.xdadan.erp.oms2c.domain.EmisGoods;
 
 /**
  * @ClassName EmisGoodsService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisMaterialService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisMaterialService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisMaterialService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisMaterialService.java
index bf953d0..306f90e 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisMaterialService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisMaterialService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 物料类型 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisMaterial;
+import com.xdadan.erp.oms2c.domain.EmisMaterial;
 
 /**
  * @ClassName EmisMaterialService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisMonthpayAccountService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisMonthpayAccountService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisMonthpayAccountService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisMonthpayAccountService.java
index b31e73e..40288e2 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisMonthpayAccountService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisMonthpayAccountService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 月结账户表 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisMonthpayAccount;
+import com.xdadan.erp.oms2c.domain.EmisMonthpayAccount;
 
 /**
  * @ClassName EmisMonthpayAccountService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisMonthpayUseApplyService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisMonthpayUseApplyService.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisMonthpayUseApplyService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisMonthpayUseApplyService.java
index ebc8fad..b6126b5 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisMonthpayUseApplyService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisMonthpayUseApplyService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 月结账号使用申请关联 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisMonthpayUseApply;
+import com.xdadan.erp.oms2c.domain.EmisMonthpayUseApply;
 
 /**
  * @ClassName EmisMonthpayUseApplyService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisNotCalcAgingService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisNotCalcAgingService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisNotCalcAgingService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisNotCalcAgingService.java
index b1ee79b..def1353 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisNotCalcAgingService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisNotCalcAgingService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 不计时效维护 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisNotCalcAging;
+import com.xdadan.erp.oms2c.domain.EmisNotCalcAging;
 
 /**
  * @ClassName EmisNotCalcAgingService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisPrintTplRelService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisPrintTplRelService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisPrintTplRelService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisPrintTplRelService.java
index 133ff2f..6cc0428 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisPrintTplRelService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisPrintTplRelService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 快递商户关联表 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisPrintTplRel;
+import com.xdadan.erp.oms2c.domain.EmisPrintTplRel;
 
 /**
  * @ClassName EmisPrintTplRelService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisPrintTplService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisPrintTplService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisPrintTplService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisPrintTplService.java
index 15b3562..3c81a99 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisPrintTplService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisPrintTplService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 快递打印模板 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisPrintTpl;
+import com.xdadan.erp.oms2c.domain.EmisPrintTpl;
 
 /**
  * @ClassName EmisPrintTplService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisProblemTypeService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisProblemTypeService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisProblemTypeService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisProblemTypeService.java
index 3f45dc2..a07df94 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisProblemTypeService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisProblemTypeService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 问题件类型 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisProblemType;
+import com.xdadan.erp.oms2c.domain.EmisProblemType;
 
 /**
  * @ClassName EmisProblemTypeService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisQuoteDispAreaService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisQuoteDispAreaService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisQuoteDispAreaService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisQuoteDispAreaService.java
index 94761ae..6e70ce7 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisQuoteDispAreaService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisQuoteDispAreaService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 派件区域 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisQuoteDispArea;
+import com.xdadan.erp.oms2c.domain.EmisQuoteDispArea;
 
 /**
  * @ClassName EmisQuoteDispAreaService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisQuoteExpressionService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisQuoteExpressionService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisQuoteExpressionService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisQuoteExpressionService.java
index 32191ce..bf7050d 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisQuoteExpressionService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisQuoteExpressionService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 费用计算表达式 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisQuoteExpression;
+import com.xdadan.erp.oms2c.domain.EmisQuoteExpression;
 
 /**
  * @ClassName EmisQuoteExpressionService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisQuotePriceService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisQuotePriceService.java
similarity index 88%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisQuotePriceService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisQuotePriceService.java
index ae23f02..a8eb25e 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisQuotePriceService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisQuotePriceService.java
@@ -7,12 +7,11 @@
  * @version v1.0  
  * @Description: <p> 费用报价 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisQuotePrice;
-import com.xdadan.erp.emis.domain.EmisWaybillFeeitem;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.EmisQuotePrice;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
 
  /**
  * @ClassName EmisQuotePriceService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisQuoteSendAreaService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisQuoteSendAreaService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisQuoteSendAreaService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisQuoteSendAreaService.java
index d4ec007..7afe16a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisQuoteSendAreaService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisQuoteSendAreaService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 寄件区域 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisQuoteSendArea;
+import com.xdadan.erp.oms2c.domain.EmisQuoteSendArea;
 
 /**
  * @ClassName EmisQuoteSendAreaService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisRegionService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisRegionService.java
similarity index 88%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisRegionService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisRegionService.java
index 1ee514b..cd168f2 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisRegionService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisRegionService.java
@@ -7,12 +7,12 @@
  * @version v1.0
  * @Description: <p> 四级省市区镇表 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisRegion;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
-import com.xdadan.erp.emis.domain.vo.AddressParseResult;
+import com.xdadan.erp.oms2c.domain.EmisRegion;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.vo.AddressParseResult;
 
 /**
  * @ClassName EmisRegionService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisSiteAccountService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisSiteAccountService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisSiteAccountService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisSiteAccountService.java
index b391623..2d7a106 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisSiteAccountService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisSiteAccountService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 网点结算账户 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisSiteAccount;
+import com.xdadan.erp.oms2c.domain.EmisSiteAccount;
 
 /**
  * @ClassName EmisSiteAccountService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisSiteService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisSiteService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisSiteService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisSiteService.java
index e310227..f534af0 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisSiteService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisSiteService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 网点 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisSite;
+import com.xdadan.erp.oms2c.domain.EmisSite;
 
 /**
  * @ClassName EmisSiteService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisSiteSettleRecordService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisSiteSettleRecordService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisSiteSettleRecordService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisSiteSettleRecordService.java
index bcd100c..c678f44 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisSiteSettleRecordService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisSiteSettleRecordService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 网点账户结算记录 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisSiteSettleRecord;
+import com.xdadan.erp.oms2c.domain.EmisSiteSettleRecord;
 
 /**
  * @ClassName EmisSiteSettleRecordService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisSpecialCalcWeightService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisSpecialCalcWeightService.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisSpecialCalcWeightService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisSpecialCalcWeightService.java
index e343ecb..64be2ed 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisSpecialCalcWeightService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisSpecialCalcWeightService.java
@@ -7,11 +7,11 @@
  * @version v1.0  
  * @Description: <p> 特殊取重 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisSpecialCalcWeight;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.EmisSpecialCalcWeight;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
 
  /**
  * @ClassName EmisSpecialCalcWeightService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsPackDtlService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsPackDtlService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsPackDtlService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsPackDtlService.java
index 4e38d5d..d280f74 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsPackDtlService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsPackDtlService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> TMS合包明细 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisTmsPackDtl;
+import com.xdadan.erp.oms2c.domain.EmisTmsPackDtl;
 
 /**
  * @ClassName EmisTmsPackDtlService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsPackService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsPackService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsPackService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsPackService.java
index 00e550c..7434b3d 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsPackService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsPackService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> TMS合包 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisTmsPack;
+import com.xdadan.erp.oms2c.domain.EmisTmsPack;
 
 /**
  * @ClassName EmisTmsPackService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanPicInfoService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsScanPicInfoService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanPicInfoService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsScanPicInfoService.java
index b6e6dd2..2ef5893 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanPicInfoService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsScanPicInfoService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> TMS扫描图片信息 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisTmsScanPicInfo;
+import com.xdadan.erp.oms2c.domain.EmisTmsScanPicInfo;
 
 /**
  * @ClassName EmisTmsScanPicInfoService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsScanRecordService.java
similarity index 88%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsScanRecordService.java
index 6ff691c..955f066 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsScanRecordService.java
@@ -7,16 +7,16 @@
  * @version v1.0  
  * @Description: <p> TMS扫描记录 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
 import java.util.Map;
 
-import com.xdadan.erp.emis.domain.EmisTmsScanRecord;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
-import com.xdadan.erp.emis.domain.stat.ScanStatDataInfo;
-import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
-import com.xdadan.erp.emis.domain.vo.scan.ScanResult;
+import com.xdadan.erp.oms2c.domain.EmisTmsScanRecord;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.stat.ScanStatDataInfo;
+import com.xdadan.erp.oms2c.domain.vo.scan.ScanInfo;
+import com.xdadan.erp.oms2c.domain.vo.scan.ScanResult;
 
  /**
  * @ClassName EmisTmsScanRecordService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchDtlService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsSiteBatchDtlService.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchDtlService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsSiteBatchDtlService.java
index bbc8250..9e06b13 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchDtlService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsSiteBatchDtlService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 一级网点TMS组批次明细 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisTmsSiteBatchDtl;
+import com.xdadan.erp.oms2c.domain.EmisTmsSiteBatchDtl;
 
 /**
  * @ClassName EmisTmsSiteBatchDtlService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchLoadingService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsSiteBatchLoadingService.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchLoadingService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsSiteBatchLoadingService.java
index 76c2278..bc016e1 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchLoadingService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsSiteBatchLoadingService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 一级网点TMS组批次配置 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisTmsSiteBatchLoading;
+import com.xdadan.erp.oms2c.domain.EmisTmsSiteBatchLoading;
 
 /**
  * @ClassName EmisTmsSiteBatchLoadingService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsSiteBatchService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsSiteBatchService.java
index aefb1dc..68372a7 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsSiteBatchService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 一级网点TMS组批次 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisTmsSiteBatch;
+import com.xdadan.erp.oms2c.domain.EmisTmsSiteBatch;
 
 /**
  * @ClassName EmisTmsSiteBatchService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsTransPlanDtlService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsTransPlanDtlService.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsTransPlanDtlService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsTransPlanDtlService.java
index 4b8838d..4c8f94c 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsTransPlanDtlService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsTransPlanDtlService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> TMS承运线路计划明细 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisTmsTransPlanDtl;
+import com.xdadan.erp.oms2c.domain.EmisTmsTransPlanDtl;
 
 /**
  * @ClassName EmisTmsTransPlanDtlService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsTransPlanService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsTransPlanService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsTransPlanService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsTransPlanService.java
index 7011f9a..d0084dd 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTmsTransPlanService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTmsTransPlanService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> TMS承运线路计划 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisTmsTransPlan;
+import com.xdadan.erp.oms2c.domain.EmisTmsTransPlan;
 
 /**
  * @ClassName EmisTmsTransPlanService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTransLineService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTransLineService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTransLineService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTransLineService.java
index 93b3f6a..39ad0c1 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTransLineService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTransLineService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 线路 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisTransLine;
+import com.xdadan.erp.oms2c.domain.EmisTransLine;
 
 /**
  * @ClassName EmisTransLineService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTransProductService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTransProductService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTransProductService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTransProductService.java
index 86362d6..37168bc 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisTransProductService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisTransProductService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 运输产品类型 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisTransProduct;
+import com.xdadan.erp.oms2c.domain.EmisTransProduct;
 
 /**
  * @ClassName EmisTransProductService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInBatchService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWarehouseInBatchService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInBatchService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWarehouseInBatchService.java
index 62e1cdc..eb38f30 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInBatchService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWarehouseInBatchService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 进仓单批次 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisWarehouseInBatch;
+import com.xdadan.erp.oms2c.domain.EmisWarehouseInBatch;
 
 /**
  * @ClassName EmisWarehouseInBatchService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInDtlService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWarehouseInDtlService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInDtlService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWarehouseInDtlService.java
index 550c795..d36db4e 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInDtlService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWarehouseInDtlService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 进仓单明细 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisWarehouseInDtl;
+import com.xdadan.erp.oms2c.domain.EmisWarehouseInDtl;
 
 /**
  * @ClassName EmisWarehouseInDtlService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWarehouseInService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWarehouseInService.java
index 41fc707..4031329 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWarehouseInService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 进仓单 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisWarehouseIn;
+import com.xdadan.erp.oms2c.domain.EmisWarehouseIn;
 
 /**
  * @ClassName EmisWarehouseInService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillAttachmentService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillAttachmentService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillAttachmentService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillAttachmentService.java
index 71e9644..7f0f9e3 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillAttachmentService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillAttachmentService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 运单附件 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisWaybillAttachment;
+import com.xdadan.erp.oms2c.domain.EmisWaybillAttachment;
 
 /**
  * @ClassName EmisWaybillAttachmentService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillCargoService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillCargoService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillCargoService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillCargoService.java
index f6c2cb1..94b3fa0 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillCargoService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillCargoService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 运单货物 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisWaybillCargo;
+import com.xdadan.erp.oms2c.domain.EmisWaybillCargo;
 
 /**
  * @ClassName EmisWaybillCargoService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillFeeitemService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillFeeitemService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillFeeitemService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillFeeitemService.java
index 4514540..7b284cd 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillFeeitemService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillFeeitemService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 运单费用条目 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisWaybillFeeitem;
+import com.xdadan.erp.oms2c.domain.EmisWaybillFeeitem;
 
 /**
  * @ClassName EmisWaybillFeeitemService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillProblemFaqService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillProblemFaqService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillProblemFaqService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillProblemFaqService.java
index 749a7f6..840379c 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillProblemFaqService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillProblemFaqService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 问题件FAG 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisWaybillProblemFaq;
+import com.xdadan.erp.oms2c.domain.EmisWaybillProblemFaq;
 
 /**
  * @ClassName EmisWaybillProblemFaqService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillProblemInfoService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillProblemInfoService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillProblemInfoService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillProblemInfoService.java
index fefc1a3..5895f3d 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillProblemInfoService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillProblemInfoService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 问题件 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisWaybillProblemInfo;
+import com.xdadan.erp.oms2c.domain.EmisWaybillProblemInfo;
 
 /**
  * @ClassName EmisWaybillProblemInfoService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillService.java
similarity index 93%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillService.java
index d7cdfa6..7850494 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillService.java
@@ -7,15 +7,14 @@
  * @version v1.0  
  * @Description: <p> 运单列表 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
 import java.util.Map;
 
-import com.xdadan.erp.emis.domain.EmisWaybill;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
-import com.xdadan.erp.emis.domain.vo.AddressParseResult;
-import com.xdadan.erp.emis.domain.vo.WaybillOrder;
+import com.xdadan.erp.oms2c.domain.EmisWaybill;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.vo.WaybillOrder;
 
  /**
  * @ClassName EmisWaybillService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillTransferService.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillTransferService.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillTransferService.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillTransferService.java
index 6ba5b7c..e138a9a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillTransferService.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/IEmisWaybillTransferService.java
@@ -7,10 +7,10 @@
  * @version v1.0  
  * @Description: <p> 运单转件表 服务类接口 </p>
  */
-package com.xdadan.erp.emis.service;
+package com.xdadan.erp.oms2c.service;
 
 import java.util.List;
-import com.xdadan.erp.emis.domain.EmisWaybillTransfer;
+import com.xdadan.erp.oms2c.domain.EmisWaybillTransfer;
 
 /**
  * @ClassName EmisWaybillTransferService
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisBrandServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisBrandServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisBrandServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisBrandServiceImpl.java
index e0de536..4eeea3d 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisBrandServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisBrandServiceImpl.java
@@ -8,18 +8,17 @@
  * @Description: <p> 品牌 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.xdadan.erp.emis.domain.EmisTransLine;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisBrand;
-import com.xdadan.erp.emis.mapper.EmisBrandMapper;
-import com.xdadan.erp.emis.service.IEmisBrandService;
+import com.xdadan.erp.oms2c.domain.EmisBrand;
+import com.xdadan.erp.oms2c.mapper.EmisBrandMapper;
+import com.xdadan.erp.oms2c.service.IEmisBrandService;
 
 /**
  * 品牌Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisContinentServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisContinentServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisContinentServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisContinentServiceImpl.java
index c7b01ae..ff2eeb4 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisContinentServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisContinentServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 地球洲 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisContinent;
-import com.xdadan.erp.emis.mapper.EmisContinentMapper;
-import com.xdadan.erp.emis.service.IEmisContinentService;
+import com.xdadan.erp.oms2c.domain.EmisContinent;
+import com.xdadan.erp.oms2c.mapper.EmisContinentMapper;
+import com.xdadan.erp.oms2c.service.IEmisContinentService;
 
 /**
  * 地球洲Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCountryAreaServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCountryAreaServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCountryAreaServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCountryAreaServiceImpl.java
index 0e53fa7..df28cd3 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCountryAreaServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCountryAreaServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 国家大区表 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisCountryArea;
-import com.xdadan.erp.emis.mapper.EmisCountryAreaMapper;
-import com.xdadan.erp.emis.service.IEmisCountryAreaService;
+import com.xdadan.erp.oms2c.domain.EmisCountryArea;
+import com.xdadan.erp.oms2c.mapper.EmisCountryAreaMapper;
+import com.xdadan.erp.oms2c.service.IEmisCountryAreaService;
 
 /**
  * 国家大区表Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCountryServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCountryServiceImpl.java
similarity index 87%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCountryServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCountryServiceImpl.java
index a27fa0d..7ff4f10 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCountryServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCountryServiceImpl.java
@@ -8,18 +8,16 @@
  * @Description: <p> 国家 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
-import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
-import org.apache.ibatis.annotations.Param;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisCountry;
-import com.xdadan.erp.emis.mapper.EmisCountryMapper;
-import com.xdadan.erp.emis.service.IEmisCountryService;
+import com.xdadan.erp.oms2c.domain.EmisCountry;
+import com.xdadan.erp.oms2c.mapper.EmisCountryMapper;
+import com.xdadan.erp.oms2c.service.IEmisCountryService;
 
 /**
  * 国家Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAccountServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCustomerAccountServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAccountServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCustomerAccountServiceImpl.java
index bdd8b4f..d8ddd07 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAccountServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCustomerAccountServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 快递用户结算账户 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisCustomerAccount;
-import com.xdadan.erp.emis.mapper.EmisCustomerAccountMapper;
-import com.xdadan.erp.emis.service.IEmisCustomerAccountService;
+import com.xdadan.erp.oms2c.domain.EmisCustomerAccount;
+import com.xdadan.erp.oms2c.mapper.EmisCustomerAccountMapper;
+import com.xdadan.erp.oms2c.service.IEmisCustomerAccountService;
 
 /**
  * 快递用户结算账户Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCustomerAddressServiceImpl.java
similarity index 94%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCustomerAddressServiceImpl.java
index 9e29d12..daa1891 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCustomerAddressServiceImpl.java
@@ -8,16 +8,16 @@
  * @Description: <p> 客户收寄件地址 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
-import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.oms2c.service.EmisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisCustomerAddress;
-import com.xdadan.erp.emis.mapper.EmisCustomerAddressMapper;
-import com.xdadan.erp.emis.service.IEmisCustomerAddressService;
+import com.xdadan.erp.oms2c.domain.EmisCustomerAddress;
+import com.xdadan.erp.oms2c.mapper.EmisCustomerAddressMapper;
+import com.xdadan.erp.oms2c.service.IEmisCustomerAddressService;
 
 /**
  * 客户收寄件地址Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerSettleBillServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCustomerSettleBillServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerSettleBillServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCustomerSettleBillServiceImpl.java
index e40cb52..5e309c9 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerSettleBillServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCustomerSettleBillServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 快递用户结算账单 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisCustomerSettleBill;
-import com.xdadan.erp.emis.mapper.EmisCustomerSettleBillMapper;
-import com.xdadan.erp.emis.service.IEmisCustomerSettleBillService;
+import com.xdadan.erp.oms2c.domain.EmisCustomerSettleBill;
+import com.xdadan.erp.oms2c.mapper.EmisCustomerSettleBillMapper;
+import com.xdadan.erp.oms2c.service.IEmisCustomerSettleBillService;
 
 /**
  * 快递用户结算账单Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCustomerUserServiceImpl.java
similarity index 90%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCustomerUserServiceImpl.java
index 43fd3b2..20e2ad5 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisCustomerUserServiceImpl.java
@@ -8,16 +8,16 @@
  * @Description: <p> 快递客户用户 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
-import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.oms2c.service.EmisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisCustomerUser;
-import com.xdadan.erp.emis.mapper.EmisCustomerUserMapper;
-import com.xdadan.erp.emis.service.IEmisCustomerUserService;
+import com.xdadan.erp.oms2c.domain.EmisCustomerUser;
+import com.xdadan.erp.oms2c.mapper.EmisCustomerUserMapper;
+import com.xdadan.erp.oms2c.service.IEmisCustomerUserService;
 
 /**
  * 快递客户用户Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisDestinationServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisDestinationServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisDestinationServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisDestinationServiceImpl.java
index 1d30c4b..13c4ff2 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisDestinationServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisDestinationServiceImpl.java
@@ -8,19 +8,18 @@
  * @Description: <p> 目的地 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.xdadan.erp.oms.common.core.domain.entity.SysTenant;
-import com.xdadan.erp.emis.domain.EmisRegion;
-import com.xdadan.erp.emis.mapper.EmisRegionMapper;
+import com.xdadan.erp.oms2c.domain.EmisRegion;
+import com.xdadan.erp.oms2c.mapper.EmisRegionMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisDestination;
-import com.xdadan.erp.emis.mapper.EmisDestinationMapper;
-import com.xdadan.erp.emis.service.IEmisDestinationService;
+import com.xdadan.erp.oms2c.domain.EmisDestination;
+import com.xdadan.erp.oms2c.mapper.EmisDestinationMapper;
+import com.xdadan.erp.oms2c.service.IEmisDestinationService;
 
 /**
  * 目的地Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagApplyServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisElectronicPagApplyServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagApplyServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisElectronicPagApplyServiceImpl.java
index dfc9170..6f40fa3 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagApplyServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisElectronicPagApplyServiceImpl.java
@@ -8,18 +8,17 @@
  * @Description: <p> 网点电子面单申请 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.Date;
 import java.util.List;
 
-import com.xdadan.erp.emis.mapper.EmisElectronicPagMapper;
-import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.oms2c.service.EmisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisElectronicPagApply;
-import com.xdadan.erp.emis.mapper.EmisElectronicPagApplyMapper;
-import com.xdadan.erp.emis.service.IEmisElectronicPagApplyService;
+import com.xdadan.erp.oms2c.domain.EmisElectronicPagApply;
+import com.xdadan.erp.oms2c.mapper.EmisElectronicPagApplyMapper;
+import com.xdadan.erp.oms2c.service.IEmisElectronicPagApplyService;
 
 /**
  * 网点电子面单申请Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisElectronicPagServiceImpl.java
similarity index 95%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisElectronicPagServiceImpl.java
index 91a720b..2e86b1c 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisElectronicPagServiceImpl.java
@@ -8,31 +8,26 @@
  * @Description: <p> 电子面单 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.math.BigDecimal;
 import java.util.*;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xdadan.erp.oms.common.core.redis.RedissonService;
-import com.xdadan.erp.oms.common.utils.DateUtils;
-import com.xdadan.erp.emis.domain.EmisElectronicPagApply;
-import com.xdadan.erp.emis.domain.EmisElectronicSitePag;
-import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
-import com.xdadan.erp.emis.mapper.EmisElectronicPagApplyMapper;
-import com.xdadan.erp.emis.mapper.EmisElectronicSitePagMapper;
-import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.oms2c.domain.EmisElectronicPagApply;
+import com.xdadan.erp.oms2c.domain.EmisElectronicSitePag;
+import com.xdadan.erp.oms2c.domain.enumtype.EmisBizErrorType;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.mapper.EmisElectronicPagApplyMapper;
+import com.xdadan.erp.oms2c.mapper.EmisElectronicSitePagMapper;
+import com.xdadan.erp.oms2c.service.EmisBaseService;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisElectronicPag;
-import com.xdadan.erp.emis.mapper.EmisElectronicPagMapper;
-import com.xdadan.erp.emis.service.IEmisElectronicPagService;
+import com.xdadan.erp.oms2c.domain.EmisElectronicPag;
+import com.xdadan.erp.oms2c.mapper.EmisElectronicPagMapper;
+import com.xdadan.erp.oms2c.service.IEmisElectronicPagService;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
  /**
  * 电子面单Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicSitePagServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisElectronicSitePagServiceImpl.java
similarity index 93%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicSitePagServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisElectronicSitePagServiceImpl.java
index 12ff4a5..859954a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicSitePagServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisElectronicSitePagServiceImpl.java
@@ -8,24 +8,22 @@
  * @Description: <p> 电子面单 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import com.xdadan.erp.oms.common.core.redis.RedissonService;
-import com.xdadan.erp.emis.domain.EmisElectronicPag;
-import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
-import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.oms2c.domain.enumtype.EmisBizErrorType;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.service.EmisBaseService;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisElectronicSitePag;
-import com.xdadan.erp.emis.mapper.EmisElectronicSitePagMapper;
-import com.xdadan.erp.emis.service.IEmisElectronicSitePagService;
+import com.xdadan.erp.oms2c.domain.EmisElectronicSitePag;
+import com.xdadan.erp.oms2c.mapper.EmisElectronicSitePagMapper;
+import com.xdadan.erp.oms2c.service.IEmisElectronicSitePagService;
 import org.springframework.util.CollectionUtils;
 
  /**
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisFeeTypeServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisFeeTypeServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisFeeTypeServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisFeeTypeServiceImpl.java
index 8a0e436..7b601ad 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisFeeTypeServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisFeeTypeServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 费用类型 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisFeeType;
-import com.xdadan.erp.emis.mapper.EmisFeeTypeMapper;
-import com.xdadan.erp.emis.service.IEmisFeeTypeService;
+import com.xdadan.erp.oms2c.domain.EmisFeeType;
+import com.xdadan.erp.oms2c.mapper.EmisFeeTypeMapper;
+import com.xdadan.erp.oms2c.service.IEmisFeeTypeService;
 
 /**
  * 费用类型Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisGoodsServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisGoodsServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisGoodsServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisGoodsServiceImpl.java
index b8c8e27..295e2fc 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisGoodsServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisGoodsServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 货物信息 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisGoods;
-import com.xdadan.erp.emis.mapper.EmisGoodsMapper;
-import com.xdadan.erp.emis.service.IEmisGoodsService;
+import com.xdadan.erp.oms2c.domain.EmisGoods;
+import com.xdadan.erp.oms2c.mapper.EmisGoodsMapper;
+import com.xdadan.erp.oms2c.service.IEmisGoodsService;
 
 /**
  * 货物信息Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisMaterialServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisMaterialServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisMaterialServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisMaterialServiceImpl.java
index d0ef8bc..87c3813 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisMaterialServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisMaterialServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 物料类型 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisMaterial;
-import com.xdadan.erp.emis.mapper.EmisMaterialMapper;
-import com.xdadan.erp.emis.service.IEmisMaterialService;
+import com.xdadan.erp.oms2c.domain.EmisMaterial;
+import com.xdadan.erp.oms2c.mapper.EmisMaterialMapper;
+import com.xdadan.erp.oms2c.service.IEmisMaterialService;
 
 /**
  * 物料类型Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisMonthpayAccountServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisMonthpayAccountServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisMonthpayAccountServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisMonthpayAccountServiceImpl.java
index f80a4bf..da8e86a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisMonthpayAccountServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisMonthpayAccountServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 月结账户表 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisMonthpayAccount;
-import com.xdadan.erp.emis.mapper.EmisMonthpayAccountMapper;
-import com.xdadan.erp.emis.service.IEmisMonthpayAccountService;
+import com.xdadan.erp.oms2c.domain.EmisMonthpayAccount;
+import com.xdadan.erp.oms2c.mapper.EmisMonthpayAccountMapper;
+import com.xdadan.erp.oms2c.service.IEmisMonthpayAccountService;
 
 /**
  * 月结账户表Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisMonthpayUseApplyServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisMonthpayUseApplyServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisMonthpayUseApplyServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisMonthpayUseApplyServiceImpl.java
index 5995407..d230392 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisMonthpayUseApplyServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisMonthpayUseApplyServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 月结账号使用申请关联 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisMonthpayUseApply;
-import com.xdadan.erp.emis.mapper.EmisMonthpayUseApplyMapper;
-import com.xdadan.erp.emis.service.IEmisMonthpayUseApplyService;
+import com.xdadan.erp.oms2c.domain.EmisMonthpayUseApply;
+import com.xdadan.erp.oms2c.mapper.EmisMonthpayUseApplyMapper;
+import com.xdadan.erp.oms2c.service.IEmisMonthpayUseApplyService;
 
 /**
  * 月结账号使用申请关联Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisNotCalcAgingServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisNotCalcAgingServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisNotCalcAgingServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisNotCalcAgingServiceImpl.java
index d1dfd11..6d241a9 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisNotCalcAgingServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisNotCalcAgingServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 不计时效维护 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisNotCalcAging;
-import com.xdadan.erp.emis.mapper.EmisNotCalcAgingMapper;
-import com.xdadan.erp.emis.service.IEmisNotCalcAgingService;
+import com.xdadan.erp.oms2c.domain.EmisNotCalcAging;
+import com.xdadan.erp.oms2c.mapper.EmisNotCalcAgingMapper;
+import com.xdadan.erp.oms2c.service.IEmisNotCalcAgingService;
 
 /**
  * 不计时效维护Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisPrintTplRelServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisPrintTplRelServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisPrintTplRelServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisPrintTplRelServiceImpl.java
index 1c2cf67..dd82281 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisPrintTplRelServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisPrintTplRelServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 快递商户关联表 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisPrintTplRel;
-import com.xdadan.erp.emis.mapper.EmisPrintTplRelMapper;
-import com.xdadan.erp.emis.service.IEmisPrintTplRelService;
+import com.xdadan.erp.oms2c.domain.EmisPrintTplRel;
+import com.xdadan.erp.oms2c.mapper.EmisPrintTplRelMapper;
+import com.xdadan.erp.oms2c.service.IEmisPrintTplRelService;
 
 /**
  * 快递商户关联表Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisPrintTplServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisPrintTplServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisPrintTplServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisPrintTplServiceImpl.java
index f7fb081..d73dcc0 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisPrintTplServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisPrintTplServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 快递打印模板 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisPrintTpl;
-import com.xdadan.erp.emis.mapper.EmisPrintTplMapper;
-import com.xdadan.erp.emis.service.IEmisPrintTplService;
+import com.xdadan.erp.oms2c.domain.EmisPrintTpl;
+import com.xdadan.erp.oms2c.mapper.EmisPrintTplMapper;
+import com.xdadan.erp.oms2c.service.IEmisPrintTplService;
 
 /**
  * 快递打印模板Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisProblemTypeServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisProblemTypeServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisProblemTypeServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisProblemTypeServiceImpl.java
index ea4623b..27ab33e 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisProblemTypeServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisProblemTypeServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 问题件类型 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisProblemType;
-import com.xdadan.erp.emis.mapper.EmisProblemTypeMapper;
-import com.xdadan.erp.emis.service.IEmisProblemTypeService;
+import com.xdadan.erp.oms2c.domain.EmisProblemType;
+import com.xdadan.erp.oms2c.mapper.EmisProblemTypeMapper;
+import com.xdadan.erp.oms2c.service.IEmisProblemTypeService;
 
 /**
  * 问题件类型Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteDispAreaServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisQuoteDispAreaServiceImpl.java
similarity index 90%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteDispAreaServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisQuoteDispAreaServiceImpl.java
index c3afd5d..0172601 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteDispAreaServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisQuoteDispAreaServiceImpl.java
@@ -8,16 +8,16 @@
  * @Description: <p> 派件区域 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
-import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.oms2c.service.EmisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisQuoteDispArea;
-import com.xdadan.erp.emis.mapper.EmisQuoteDispAreaMapper;
-import com.xdadan.erp.emis.service.IEmisQuoteDispAreaService;
+import com.xdadan.erp.oms2c.domain.EmisQuoteDispArea;
+import com.xdadan.erp.oms2c.mapper.EmisQuoteDispAreaMapper;
+import com.xdadan.erp.oms2c.service.IEmisQuoteDispAreaService;
 
 /**
  * 派件区域Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteExpressionServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisQuoteExpressionServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteExpressionServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisQuoteExpressionServiceImpl.java
index 84cd254..5a836e1 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteExpressionServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisQuoteExpressionServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 费用计算表达式 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisQuoteExpression;
-import com.xdadan.erp.emis.mapper.EmisQuoteExpressionMapper;
-import com.xdadan.erp.emis.service.IEmisQuoteExpressionService;
+import com.xdadan.erp.oms2c.domain.EmisQuoteExpression;
+import com.xdadan.erp.oms2c.mapper.EmisQuoteExpressionMapper;
+import com.xdadan.erp.oms2c.service.IEmisQuoteExpressionService;
 
 /**
  * 费用计算表达式Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisQuotePriceServiceImpl.java
similarity index 90%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisQuotePriceServiceImpl.java
index 2818f66..a499491 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisQuotePriceServiceImpl.java
@@ -8,20 +8,20 @@
  * @Description: <p> 费用报价 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.xdadan.erp.emis.domain.EmisQuoteExpression;
-import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
-import com.xdadan.erp.emis.mapper.EmisQuoteExpressionMapper;
+import com.xdadan.erp.oms2c.domain.EmisQuoteExpression;
+import com.xdadan.erp.oms2c.domain.enumtype.EmisBizErrorType;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.mapper.EmisQuoteExpressionMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisQuotePrice;
-import com.xdadan.erp.emis.mapper.EmisQuotePriceMapper;
-import com.xdadan.erp.emis.service.IEmisQuotePriceService;
+import com.xdadan.erp.oms2c.domain.EmisQuotePrice;
+import com.xdadan.erp.oms2c.mapper.EmisQuotePriceMapper;
+import com.xdadan.erp.oms2c.service.IEmisQuotePriceService;
 import org.springframework.transaction.annotation.Transactional;
 
  /**
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteSendAreaServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisQuoteSendAreaServiceImpl.java
similarity index 90%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteSendAreaServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisQuoteSendAreaServiceImpl.java
index a992186..5f2f65a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteSendAreaServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisQuoteSendAreaServiceImpl.java
@@ -8,16 +8,16 @@
  * @Description: <p> 寄件区域 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
-import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.oms2c.service.EmisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisQuoteSendArea;
-import com.xdadan.erp.emis.mapper.EmisQuoteSendAreaMapper;
-import com.xdadan.erp.emis.service.IEmisQuoteSendAreaService;
+import com.xdadan.erp.oms2c.domain.EmisQuoteSendArea;
+import com.xdadan.erp.oms2c.mapper.EmisQuoteSendAreaMapper;
+import com.xdadan.erp.oms2c.service.IEmisQuoteSendAreaService;
 
 /**
  * 寄件区域Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisRegionServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisRegionServiceImpl.java
similarity index 90%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisRegionServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisRegionServiceImpl.java
index dd98a85..08d63ff 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisRegionServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisRegionServiceImpl.java
@@ -8,20 +8,20 @@
  * @Description: <p> 四级省市区镇表 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
 import com.alibaba.fastjson.JSONObject;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
-import com.xdadan.erp.emis.domain.vo.AddressParseResult;
-import com.xdadan.erp.emis.service.EmisBaseService;
-import com.xdadan.erp.emis.utils.WaybillHelper;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.vo.AddressParseResult;
+import com.xdadan.erp.oms2c.service.EmisBaseService;
+import com.xdadan.erp.oms2c.utils.WaybillHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisRegion;
-import com.xdadan.erp.emis.mapper.EmisRegionMapper;
-import com.xdadan.erp.emis.service.IEmisRegionService;
+import com.xdadan.erp.oms2c.domain.EmisRegion;
+import com.xdadan.erp.oms2c.mapper.EmisRegionMapper;
+import com.xdadan.erp.oms2c.service.IEmisRegionService;
 
 /**
  * 四级省市区镇表Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteAccountServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisSiteAccountServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteAccountServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisSiteAccountServiceImpl.java
index 9d58f55..181e154 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteAccountServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisSiteAccountServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 网点结算账户 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisSiteAccount;
-import com.xdadan.erp.emis.mapper.EmisSiteAccountMapper;
-import com.xdadan.erp.emis.service.IEmisSiteAccountService;
+import com.xdadan.erp.oms2c.domain.EmisSiteAccount;
+import com.xdadan.erp.oms2c.mapper.EmisSiteAccountMapper;
+import com.xdadan.erp.oms2c.service.IEmisSiteAccountService;
 
 /**
  * 网点结算账户Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisSiteServiceImpl.java
similarity index 88%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisSiteServiceImpl.java
index f8343b0..87271d0 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisSiteServiceImpl.java
@@ -8,19 +8,19 @@
  * @Description: <p> 网点 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
-import com.xdadan.erp.emis.domain.EmisDestination;
-import com.xdadan.erp.emis.domain.EmisRegion;
-import com.xdadan.erp.emis.mapper.EmisDestinationMapper;
-import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.oms2c.domain.EmisDestination;
+import com.xdadan.erp.oms2c.domain.EmisRegion;
+import com.xdadan.erp.oms2c.mapper.EmisDestinationMapper;
+import com.xdadan.erp.oms2c.service.EmisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisSite;
-import com.xdadan.erp.emis.mapper.EmisSiteMapper;
-import com.xdadan.erp.emis.service.IEmisSiteService;
+import com.xdadan.erp.oms2c.domain.EmisSite;
+import com.xdadan.erp.oms2c.mapper.EmisSiteMapper;
+import com.xdadan.erp.oms2c.service.IEmisSiteService;
 import org.springframework.transaction.annotation.Transactional;
 
  /**
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteSettleRecordServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisSiteSettleRecordServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteSettleRecordServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisSiteSettleRecordServiceImpl.java
index db1fee1..4dcdd8a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteSettleRecordServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisSiteSettleRecordServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 网点账户结算记录 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisSiteSettleRecord;
-import com.xdadan.erp.emis.mapper.EmisSiteSettleRecordMapper;
-import com.xdadan.erp.emis.service.IEmisSiteSettleRecordService;
+import com.xdadan.erp.oms2c.domain.EmisSiteSettleRecord;
+import com.xdadan.erp.oms2c.mapper.EmisSiteSettleRecordMapper;
+import com.xdadan.erp.oms2c.service.IEmisSiteSettleRecordService;
 
 /**
  * 网点账户结算记录Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisSpecialCalcWeightServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisSpecialCalcWeightServiceImpl.java
similarity index 89%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisSpecialCalcWeightServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisSpecialCalcWeightServiceImpl.java
index f38a64f..ca83f80 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisSpecialCalcWeightServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisSpecialCalcWeightServiceImpl.java
@@ -8,17 +8,17 @@
  * @Description: <p> 特殊取重 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
-import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.enumtype.EmisBizErrorType;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisSpecialCalcWeight;
-import com.xdadan.erp.emis.mapper.EmisSpecialCalcWeightMapper;
-import com.xdadan.erp.emis.service.IEmisSpecialCalcWeightService;
+import com.xdadan.erp.oms2c.domain.EmisSpecialCalcWeight;
+import com.xdadan.erp.oms2c.mapper.EmisSpecialCalcWeightMapper;
+import com.xdadan.erp.oms2c.service.IEmisSpecialCalcWeightService;
 
 /**
  * 特殊取重Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsPackDtlServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsPackDtlServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsPackDtlServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsPackDtlServiceImpl.java
index 4a3b42b..5c5a2ab 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsPackDtlServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsPackDtlServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> TMS合包明细 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisTmsPackDtl;
-import com.xdadan.erp.emis.mapper.EmisTmsPackDtlMapper;
-import com.xdadan.erp.emis.service.IEmisTmsPackDtlService;
+import com.xdadan.erp.oms2c.domain.EmisTmsPackDtl;
+import com.xdadan.erp.oms2c.mapper.EmisTmsPackDtlMapper;
+import com.xdadan.erp.oms2c.service.IEmisTmsPackDtlService;
 
 /**
  * TMS合包明细Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsPackServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsPackServiceImpl.java
similarity index 89%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsPackServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsPackServiceImpl.java
index 59287e9..52d2f7a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsPackServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsPackServiceImpl.java
@@ -8,16 +8,15 @@
  * @Description: <p> TMS合包 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
-import com.xdadan.erp.oms.common.core.redis.RedissonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisTmsPack;
-import com.xdadan.erp.emis.mapper.EmisTmsPackMapper;
-import com.xdadan.erp.emis.service.IEmisTmsPackService;
+import com.xdadan.erp.oms2c.domain.EmisTmsPack;
+import com.xdadan.erp.oms2c.mapper.EmisTmsPackMapper;
+import com.xdadan.erp.oms2c.service.IEmisTmsPackService;
 
 /**
  * TMS合包Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanPicInfoServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsScanPicInfoServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanPicInfoServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsScanPicInfoServiceImpl.java
index ade45b7..aa55451 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanPicInfoServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsScanPicInfoServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> TMS扫描图片信息 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisTmsScanPicInfo;
-import com.xdadan.erp.emis.mapper.EmisTmsScanPicInfoMapper;
-import com.xdadan.erp.emis.service.IEmisTmsScanPicInfoService;
+import com.xdadan.erp.oms2c.domain.EmisTmsScanPicInfo;
+import com.xdadan.erp.oms2c.mapper.EmisTmsScanPicInfoMapper;
+import com.xdadan.erp.oms2c.service.IEmisTmsScanPicInfoService;
 
 /**
  * TMS扫描图片信息Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsScanRecordServiceImpl.java
similarity index 97%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsScanRecordServiceImpl.java
index d9243eb..965903e 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -8,29 +8,28 @@
  * @Description: <p> TMS扫描记录 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
-import java.math.BigDecimal;
 import java.util.*;
 
 import com.xdadan.erp.oms.common.core.domain.entity.SysUser;
 import com.xdadan.erp.oms.common.utils.DateUtils;
-import com.xdadan.erp.emis.domain.*;
-import com.xdadan.erp.emis.domain.enumtype.ScanType;
-import com.xdadan.erp.emis.domain.enumtype.WaybillAttachType;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
-import com.xdadan.erp.emis.domain.stat.ScanStatDataInfo;
-import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
-import com.xdadan.erp.emis.domain.vo.scan.ScanResult;
-import com.xdadan.erp.emis.domain.vo.scan.ScanResultItem;
-import com.xdadan.erp.emis.mapper.EmisTmsPackDtlMapper;
-import com.xdadan.erp.emis.mapper.EmisTmsScanPicInfoMapper;
-import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.oms2c.domain.*;
+import com.xdadan.erp.oms2c.domain.enumtype.ScanType;
+import com.xdadan.erp.oms2c.domain.enumtype.WaybillAttachType;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.stat.ScanStatDataInfo;
+import com.xdadan.erp.oms2c.domain.vo.scan.ScanInfo;
+import com.xdadan.erp.oms2c.domain.vo.scan.ScanResult;
+import com.xdadan.erp.oms2c.domain.vo.scan.ScanResultItem;
+import com.xdadan.erp.oms2c.mapper.EmisTmsPackDtlMapper;
+import com.xdadan.erp.oms2c.mapper.EmisTmsScanPicInfoMapper;
+import com.xdadan.erp.oms2c.service.EmisBaseService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.mapper.EmisTmsScanRecordMapper;
-import com.xdadan.erp.emis.service.IEmisTmsScanRecordService;
+import com.xdadan.erp.oms2c.mapper.EmisTmsScanRecordMapper;
+import com.xdadan.erp.oms2c.service.IEmisTmsScanRecordService;
 import org.springframework.transaction.annotation.Transactional;
 
  /**
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsSiteBatchDtlServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsSiteBatchDtlServiceImpl.java
index 84ea314..13ad30a 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsSiteBatchDtlServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 一级网点TMS组批次明细 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisTmsSiteBatchDtl;
-import com.xdadan.erp.emis.mapper.EmisTmsSiteBatchDtlMapper;
-import com.xdadan.erp.emis.service.IEmisTmsSiteBatchDtlService;
+import com.xdadan.erp.oms2c.domain.EmisTmsSiteBatchDtl;
+import com.xdadan.erp.oms2c.mapper.EmisTmsSiteBatchDtlMapper;
+import com.xdadan.erp.oms2c.service.IEmisTmsSiteBatchDtlService;
 
 /**
  * 一级网点TMS组批次明细Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchLoadingServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsSiteBatchLoadingServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchLoadingServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsSiteBatchLoadingServiceImpl.java
index d7e5dda..adeca01 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchLoadingServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsSiteBatchLoadingServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 一级网点TMS组批次配置 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisTmsSiteBatchLoading;
-import com.xdadan.erp.emis.mapper.EmisTmsSiteBatchLoadingMapper;
-import com.xdadan.erp.emis.service.IEmisTmsSiteBatchLoadingService;
+import com.xdadan.erp.oms2c.domain.EmisTmsSiteBatchLoading;
+import com.xdadan.erp.oms2c.mapper.EmisTmsSiteBatchLoadingMapper;
+import com.xdadan.erp.oms2c.service.IEmisTmsSiteBatchLoadingService;
 
 /**
  * 一级网点TMS组批次配置Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsSiteBatchServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsSiteBatchServiceImpl.java
index b7fb13c..1755605 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsSiteBatchServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 一级网点TMS组批次 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisTmsSiteBatch;
-import com.xdadan.erp.emis.mapper.EmisTmsSiteBatchMapper;
-import com.xdadan.erp.emis.service.IEmisTmsSiteBatchService;
+import com.xdadan.erp.oms2c.domain.EmisTmsSiteBatch;
+import com.xdadan.erp.oms2c.mapper.EmisTmsSiteBatchMapper;
+import com.xdadan.erp.oms2c.service.IEmisTmsSiteBatchService;
 
 /**
  * 一级网点TMS组批次Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsTransPlanDtlServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsTransPlanDtlServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsTransPlanDtlServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsTransPlanDtlServiceImpl.java
index 87f0fca..1df6fa3 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsTransPlanDtlServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsTransPlanDtlServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> TMS承运线路计划明细 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisTmsTransPlanDtl;
-import com.xdadan.erp.emis.mapper.EmisTmsTransPlanDtlMapper;
-import com.xdadan.erp.emis.service.IEmisTmsTransPlanDtlService;
+import com.xdadan.erp.oms2c.domain.EmisTmsTransPlanDtl;
+import com.xdadan.erp.oms2c.mapper.EmisTmsTransPlanDtlMapper;
+import com.xdadan.erp.oms2c.service.IEmisTmsTransPlanDtlService;
 
 /**
  * TMS承运线路计划明细Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsTransPlanServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsTransPlanServiceImpl.java
similarity index 90%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsTransPlanServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsTransPlanServiceImpl.java
index 4ac6780..22654ca 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsTransPlanServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTmsTransPlanServiceImpl.java
@@ -8,18 +8,18 @@
  * @Description: <p> TMS承运线路计划 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.xdadan.erp.emis.domain.EmisTmsTransPlanDtl;
-import com.xdadan.erp.emis.mapper.EmisTmsTransPlanDtlMapper;
+import com.xdadan.erp.oms2c.domain.EmisTmsTransPlanDtl;
+import com.xdadan.erp.oms2c.mapper.EmisTmsTransPlanDtlMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisTmsTransPlan;
-import com.xdadan.erp.emis.mapper.EmisTmsTransPlanMapper;
-import com.xdadan.erp.emis.service.IEmisTmsTransPlanService;
+import com.xdadan.erp.oms2c.domain.EmisTmsTransPlan;
+import com.xdadan.erp.oms2c.mapper.EmisTmsTransPlanMapper;
+import com.xdadan.erp.oms2c.service.IEmisTmsTransPlanService;
 import org.springframework.transaction.annotation.Transactional;
 
  /**
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransLineServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTransLineServiceImpl.java
similarity index 93%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransLineServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTransLineServiceImpl.java
index 82fd636..86c1937 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransLineServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTransLineServiceImpl.java
@@ -8,7 +8,7 @@
  * @Description: <p> 线路 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
@@ -16,9 +16,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisTransLine;
-import com.xdadan.erp.emis.mapper.EmisTransLineMapper;
-import com.xdadan.erp.emis.service.IEmisTransLineService;
+import com.xdadan.erp.oms2c.domain.EmisTransLine;
+import com.xdadan.erp.oms2c.mapper.EmisTransLineMapper;
+import com.xdadan.erp.oms2c.service.IEmisTransLineService;
 
 /**
  * 线路Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransProductServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTransProductServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransProductServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTransProductServiceImpl.java
index 905f71d..fe04700 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransProductServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisTransProductServiceImpl.java
@@ -8,18 +8,17 @@
  * @Description: <p> 运输产品类型 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.xdadan.erp.emis.domain.EmisTransLine;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisTransProduct;
-import com.xdadan.erp.emis.mapper.EmisTransProductMapper;
-import com.xdadan.erp.emis.service.IEmisTransProductService;
+import com.xdadan.erp.oms2c.domain.EmisTransProduct;
+import com.xdadan.erp.oms2c.mapper.EmisTransProductMapper;
+import com.xdadan.erp.oms2c.service.IEmisTransProductService;
 
 /**
  * 运输产品类型Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWarehouseInBatchServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWarehouseInBatchServiceImpl.java
index 2c8a49e..b00309b 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWarehouseInBatchServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 进仓单批次 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisWarehouseInBatch;
-import com.xdadan.erp.emis.mapper.EmisWarehouseInBatchMapper;
-import com.xdadan.erp.emis.service.IEmisWarehouseInBatchService;
+import com.xdadan.erp.oms2c.domain.EmisWarehouseInBatch;
+import com.xdadan.erp.oms2c.mapper.EmisWarehouseInBatchMapper;
+import com.xdadan.erp.oms2c.service.IEmisWarehouseInBatchService;
 
 /**
  * 进仓单批次Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInDtlServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWarehouseInDtlServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInDtlServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWarehouseInDtlServiceImpl.java
index 9399971..b22d439 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInDtlServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWarehouseInDtlServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 进仓单明细 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisWarehouseInDtl;
-import com.xdadan.erp.emis.mapper.EmisWarehouseInDtlMapper;
-import com.xdadan.erp.emis.service.IEmisWarehouseInDtlService;
+import com.xdadan.erp.oms2c.domain.EmisWarehouseInDtl;
+import com.xdadan.erp.oms2c.mapper.EmisWarehouseInDtlMapper;
+import com.xdadan.erp.oms2c.service.IEmisWarehouseInDtlService;
 
 /**
  * 进仓单明细Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWarehouseInServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWarehouseInServiceImpl.java
index efdeb31..dc62380 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWarehouseInServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 进仓单 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisWarehouseIn;
-import com.xdadan.erp.emis.mapper.EmisWarehouseInMapper;
-import com.xdadan.erp.emis.service.IEmisWarehouseInService;
+import com.xdadan.erp.oms2c.domain.EmisWarehouseIn;
+import com.xdadan.erp.oms2c.mapper.EmisWarehouseInMapper;
+import com.xdadan.erp.oms2c.service.IEmisWarehouseInService;
 
 /**
  * 进仓单Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAttachmentServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillAttachmentServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAttachmentServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillAttachmentServiceImpl.java
index e1dd466..270e612 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAttachmentServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillAttachmentServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 运单附件 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisWaybillAttachment;
-import com.xdadan.erp.emis.mapper.EmisWaybillAttachmentMapper;
-import com.xdadan.erp.emis.service.IEmisWaybillAttachmentService;
+import com.xdadan.erp.oms2c.domain.EmisWaybillAttachment;
+import com.xdadan.erp.oms2c.mapper.EmisWaybillAttachmentMapper;
+import com.xdadan.erp.oms2c.service.IEmisWaybillAttachmentService;
 
 /**
  * 运单附件Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillCargoServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillCargoServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillCargoServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillCargoServiceImpl.java
index 4515c3c..50b5269 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillCargoServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillCargoServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 运单货物 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisWaybillCargo;
-import com.xdadan.erp.emis.mapper.EmisWaybillCargoMapper;
-import com.xdadan.erp.emis.service.IEmisWaybillCargoService;
+import com.xdadan.erp.oms2c.domain.EmisWaybillCargo;
+import com.xdadan.erp.oms2c.mapper.EmisWaybillCargoMapper;
+import com.xdadan.erp.oms2c.service.IEmisWaybillCargoService;
 
 /**
  * 运单货物Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillFeeitemServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillFeeitemServiceImpl.java
similarity index 92%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillFeeitemServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillFeeitemServiceImpl.java
index 58a764c..5a1548b 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillFeeitemServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillFeeitemServiceImpl.java
@@ -8,14 +8,14 @@
  * @Description: <p> 运单费用条目 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisWaybillFeeitem;
-import com.xdadan.erp.emis.mapper.EmisWaybillFeeitemMapper;
-import com.xdadan.erp.emis.service.IEmisWaybillFeeitemService;
+import com.xdadan.erp.oms2c.domain.EmisWaybillFeeitem;
+import com.xdadan.erp.oms2c.mapper.EmisWaybillFeeitemMapper;
+import com.xdadan.erp.oms2c.service.IEmisWaybillFeeitemService;
 
 /**
  * 运单费用条目Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemFaqServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillProblemFaqServiceImpl.java
similarity index 90%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemFaqServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillProblemFaqServiceImpl.java
index 6c357e9..825167b 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemFaqServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillProblemFaqServiceImpl.java
@@ -8,19 +8,19 @@
  * @Description: <p> 问题件FAG 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.Date;
 import java.util.List;
 
-import com.xdadan.erp.emis.domain.EmisWaybillProblemInfo;
-import com.xdadan.erp.emis.mapper.EmisWaybillProblemInfoMapper;
-import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.oms2c.domain.EmisWaybillProblemInfo;
+import com.xdadan.erp.oms2c.mapper.EmisWaybillProblemInfoMapper;
+import com.xdadan.erp.oms2c.service.EmisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisWaybillProblemFaq;
-import com.xdadan.erp.emis.mapper.EmisWaybillProblemFaqMapper;
-import com.xdadan.erp.emis.service.IEmisWaybillProblemFaqService;
+import com.xdadan.erp.oms2c.domain.EmisWaybillProblemFaq;
+import com.xdadan.erp.oms2c.mapper.EmisWaybillProblemFaqMapper;
+import com.xdadan.erp.oms2c.service.IEmisWaybillProblemFaqService;
 
 /**
  * 问题件FAGService业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillProblemInfoServiceImpl.java
similarity index 91%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillProblemInfoServiceImpl.java
index 1aeaeb3..5d5a615 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillProblemInfoServiceImpl.java
@@ -8,17 +8,17 @@
  * @Description: <p> 问题件 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.Date;
 import java.util.List;
 
-import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.oms2c.service.EmisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisWaybillProblemInfo;
-import com.xdadan.erp.emis.mapper.EmisWaybillProblemInfoMapper;
-import com.xdadan.erp.emis.service.IEmisWaybillProblemInfoService;
+import com.xdadan.erp.oms2c.domain.EmisWaybillProblemInfo;
+import com.xdadan.erp.oms2c.mapper.EmisWaybillProblemInfoMapper;
+import com.xdadan.erp.oms2c.service.IEmisWaybillProblemInfoService;
 
 /**
  * 问题件Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillServiceImpl.java
similarity index 98%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillServiceImpl.java
index ac2c3a9..f6fd6b3 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillServiceImpl.java
@@ -8,37 +8,31 @@
  * @Description: <p> 运单列表 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.*;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.googlecode.aviator.AviatorEvaluator;
-import com.xdadan.erp.oms.common.core.domain.AjaxResult;
 import com.xdadan.erp.oms.common.utils.DateUtils;
 import com.xdadan.erp.oms.common.utils.DictUtils;
-import com.xdadan.erp.emis.domain.*;
-import com.xdadan.erp.emis.domain.enumtype.ScanType;
-import com.xdadan.erp.emis.domain.enumtype.TransType;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
-import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
-import com.xdadan.erp.emis.domain.vo.*;
-import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
-import com.xdadan.erp.emis.mapper.EmisRegionMapper;
-import com.xdadan.erp.emis.mapper.EmisTransLineMapper;
-import com.xdadan.erp.emis.service.*;
-import com.xdadan.erp.emis.utils.WaybillHelper;
-import com.xdadan.erp.system.service.ISysUserService;
+import com.xdadan.erp.oms2c.domain.*;
+import com.xdadan.erp.oms2c.domain.enumtype.ScanType;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.enumtype.EmisBizErrorType;
+import com.xdadan.erp.oms2c.domain.vo.*;
+import com.xdadan.erp.oms2c.domain.vo.scan.ScanInfo;
+import com.xdadan.erp.oms2c.mapper.EmisTransLineMapper;
+import com.xdadan.erp.oms2c.service.*;
+import com.xdadan.erp.oms2c.utils.WaybillHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.mapper.EmisWaybillMapper;
+import com.xdadan.erp.oms2c.mapper.EmisWaybillMapper;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillTransferServiceImpl.java
similarity index 90%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillTransferServiceImpl.java
index 81c3886..89d68e8 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/EmisWaybillTransferServiceImpl.java
@@ -8,16 +8,15 @@
  * @Description: <p> 运单转件表 实体类 </p>
  */
 
-package com.xdadan.erp.emis.service.impl;
+package com.xdadan.erp.oms2c.service.impl;
 
 import java.util.List;
 
-import com.xdadan.erp.emis.service.IEmisTmsScanRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisWaybillTransfer;
-import com.xdadan.erp.emis.mapper.EmisWaybillTransferMapper;
-import com.xdadan.erp.emis.service.IEmisWaybillTransferService;
+import com.xdadan.erp.oms2c.domain.EmisWaybillTransfer;
+import com.xdadan.erp.oms2c.mapper.EmisWaybillTransferMapper;
+import com.xdadan.erp.oms2c.service.IEmisWaybillTransferService;
 
 /**
  * 运单转件表Service业务层处理
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/ScanDataHelper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/ScanDataHelper.java
new file mode 100644
index 0000000..6b921de
--- /dev/null
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/impl/ScanDataHelper.java
@@ -0,0 +1,5 @@
+package com.xdadan.erp.oms2c.service.impl;
+
+public class ScanDataHelper {
+
+}
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/print/IXddTplPrint.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/print/IXddTplPrint.java
similarity index 90%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/print/IXddTplPrint.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/print/IXddTplPrint.java
index 1fe00c4..05e0fbc 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/print/IXddTplPrint.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/print/IXddTplPrint.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.service.print;
+package com.xdadan.erp.oms2c.service.print;
 
 import com.xdadan.erp.oms.common.core.domain.AjaxResult;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/print/ItemCell.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/print/ItemCell.java
similarity index 97%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/print/ItemCell.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/print/ItemCell.java
index 241e6a9..6c37bd0 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/print/ItemCell.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/print/ItemCell.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.service.print;
+package com.xdadan.erp.oms2c.service.print;
 
 import com.itextpdf.text.Element;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/print/XddBasePrint.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/print/XddBasePrint.java
similarity index 98%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/print/XddBasePrint.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/print/XddBasePrint.java
index 3309032..8101315 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/print/XddBasePrint.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/print/XddBasePrint.java
@@ -1,9 +1,9 @@
-package com.xdadan.erp.emis.service.print;
+package com.xdadan.erp.oms2c.service.print;
 
 import com.itextpdf.text.*;
 import com.itextpdf.text.pdf.*;
 import com.itextpdf.xmp.impl.Base64;
-import com.xdadan.erp.emis.utils.BarcodeZxingUtil;
+import com.xdadan.erp.oms2c.utils.BarcodeZxingUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/print/ZPLConveterUtil.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/print/ZPLConveterUtil.java
similarity index 99%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/print/ZPLConveterUtil.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/print/ZPLConveterUtil.java
index 4b8041d..99c49e4 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/print/ZPLConveterUtil.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/print/ZPLConveterUtil.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.service.print;
+package com.xdadan.erp.oms2c.service.print;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/print/tanex/TanexTplPrintImpl.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/print/tanex/TanexTplPrintImpl.java
similarity index 97%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/service/print/tanex/TanexTplPrintImpl.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/print/tanex/TanexTplPrintImpl.java
index aa12d97..eaa841d 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/service/print/tanex/TanexTplPrintImpl.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/service/print/tanex/TanexTplPrintImpl.java
@@ -1,12 +1,12 @@
-package com.xdadan.erp.emis.service.print.tanex;
+package com.xdadan.erp.oms2c.service.print.tanex;
 
 import com.alibaba.fastjson.JSON;
 import com.itextpdf.text.Element;
 import com.xdadan.erp.oms.common.core.domain.AjaxResult;
-import com.xdadan.erp.emis.service.print.IXddTplPrint;
-import com.xdadan.erp.emis.service.print.ItemCell;
-import com.xdadan.erp.emis.service.print.XddBasePrint;
-import com.xdadan.erp.emis.utils.sensitive.Convert;
+import com.xdadan.erp.oms2c.service.print.IXddTplPrint;
+import com.xdadan.erp.oms2c.service.print.ItemCell;
+import com.xdadan.erp.oms2c.service.print.XddBasePrint;
+import com.xdadan.erp.oms2c.utils.sensitive.Convert;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/BarcodeZxingUtil.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/BarcodeZxingUtil.java
similarity index 99%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/BarcodeZxingUtil.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/BarcodeZxingUtil.java
index 1450cdb..7ecc89b 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/BarcodeZxingUtil.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/BarcodeZxingUtil.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.utils;
+package com.xdadan.erp.oms2c.utils;
 
 import com.google.zxing.*;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/Calculator.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/Calculator.java
similarity index 99%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/Calculator.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/Calculator.java
index 7fa251d..7e53dc2 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/Calculator.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/Calculator.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.utils;
+package com.xdadan.erp.oms2c.utils;
 
 
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/DecimalAcquisition.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/DecimalAcquisition.java
similarity index 99%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/DecimalAcquisition.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/DecimalAcquisition.java
index e1fa3a0..21e4faf 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/DecimalAcquisition.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/DecimalAcquisition.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.utils;
+package com.xdadan.erp.oms2c.utils;
 
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/PhoneNumberUtils.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/PhoneNumberUtils.java
similarity index 50%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/PhoneNumberUtils.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/PhoneNumberUtils.java
index ec202c0..723e0cf 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/PhoneNumberUtils.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/PhoneNumberUtils.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.utils;
+package com.xdadan.erp.oms2c.utils;
 
 public class PhoneNumberUtils {
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/PhoneRegularExp.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/PhoneRegularExp.java
similarity index 98%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/PhoneRegularExp.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/PhoneRegularExp.java
index a1044cc..7e9da58 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/PhoneRegularExp.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/PhoneRegularExp.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.utils;
+package com.xdadan.erp.oms2c.utils;
 
 public enum PhoneRegularExp {
     //国际手机 区号
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/PrintUtils.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/PrintUtils.java
similarity index 96%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/PrintUtils.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/PrintUtils.java
index 8dd607c..d8db91f 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/PrintUtils.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/PrintUtils.java
@@ -1,13 +1,9 @@
-package com.xdadan.erp.emis.utils;
+package com.xdadan.erp.oms2c.utils;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.xdadan.erp.oms.common.constant.Constants;
-import com.xdadan.erp.oms.common.core.domain.AjaxResult;
-import com.xdadan.erp.oms.common.core.redis.RedisCache;
 import com.xdadan.erp.oms.common.utils.HTTPHelperV3;
 import com.xdadan.erp.oms.common.utils.StringUtils;
-import com.xdadan.erp.oms.common.utils.spring.SpringUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/ThumbnailsUtils.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/ThumbnailsUtils.java
similarity index 98%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/ThumbnailsUtils.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/ThumbnailsUtils.java
index d60e8f6..7184742 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/ThumbnailsUtils.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/ThumbnailsUtils.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.utils;
+package com.xdadan.erp.oms2c.utils;
 
 import net.coobird.thumbnailator.Thumbnails;
 import org.slf4j.Logger;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/WaybillHelper.java
similarity index 97%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/WaybillHelper.java
index 78f724c..44faa34 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/WaybillHelper.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.utils;
+package com.xdadan.erp.oms2c.utils;
 
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
@@ -6,13 +6,11 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.serializer.ValueFilter;
-import com.xdadan.erp.oms.common.utils.DBUtil;
 import com.xdadan.erp.oms.common.utils.HTTPHelperV3;
 import com.xdadan.erp.oms.common.utils.StringUtils;
-import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
-import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.oms2c.domain.enumtype.EmisBizErrorType;
+import com.xdadan.erp.oms2c.domain.exception.EmisBizError;
 
-import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/sensitive/Convert.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/sensitive/Convert.java
similarity index 98%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/sensitive/Convert.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/sensitive/Convert.java
index a61483c..eb85286 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/sensitive/Convert.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/sensitive/Convert.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.utils.sensitive;
+package com.xdadan.erp.oms2c.utils.sensitive;
 
 public class Convert {
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/sensitive/FieldConfig.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/sensitive/FieldConfig.java
similarity index 96%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/sensitive/FieldConfig.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/sensitive/FieldConfig.java
index 5433d82..6d4911b 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/sensitive/FieldConfig.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/sensitive/FieldConfig.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.utils.sensitive;
+package com.xdadan.erp.oms2c.utils.sensitive;
 
 import java.util.function.Function;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/sensitive/FieldType.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/sensitive/FieldType.java
similarity index 97%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/sensitive/FieldType.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/sensitive/FieldType.java
index e3f7719..38c45ed 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/sensitive/FieldType.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/sensitive/FieldType.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.utils.sensitive;
+package com.xdadan.erp.oms2c.utils.sensitive;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/sensitive/Sensitive.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/sensitive/Sensitive.java
similarity index 86%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/sensitive/Sensitive.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/sensitive/Sensitive.java
index e8326a9..12a574c 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/sensitive/Sensitive.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/sensitive/Sensitive.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.utils.sensitive;
+package com.xdadan.erp.oms2c.utils.sensitive;
 
 import java.lang.annotation.*;
 
diff --git a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/sensitive/SensitiveUtil.java b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/sensitive/SensitiveUtil.java
similarity index 99%
rename from emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/sensitive/SensitiveUtil.java
rename to emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/sensitive/SensitiveUtil.java
index 40aa0c5..87a89cd 100644
--- a/emis-oms2c/src/main/java/com/xdadan/erp/emis/utils/sensitive/SensitiveUtil.java
+++ b/emis-oms2c/src/main/java/com/xdadan/erp/oms2c/utils/sensitive/SensitiveUtil.java
@@ -1,4 +1,4 @@
-package com.xdadan.erp.emis.utils.sensitive;
+package com.xdadan.erp.oms2c.utils.sensitive;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
diff --git a/emis-oms2c/src/main/resources/mapper/EmisBaseMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisBaseMapper.xml
index 5be762c..30fe755 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisBaseMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisBaseMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisBaseMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisBaseMapper">
 
     <resultMap type="BaseEntity" id="EmisBaseResult">
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisBrandMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisBrandMapper.xml
index fae8569..414d98b 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisBrandMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisBrandMapper.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisBrandMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisBrandMapper">
 
-<!--    com.xdadan.erp.emis.mapper.EmisBaseMapper.-->
+<!--    com.xdadan.erp.oms2c.mapper.EmisBaseMapper.-->
 
-    <resultMap type="EmisBrand" id="EmisBrandResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisBrand" id="EmisBrandResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="code"    column="code"    />
         <result property="name"    column="name"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisContinentMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisContinentMapper.xml
index 5242464..8e48150 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisContinentMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisContinentMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisContinentMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisContinentMapper">
 
-    <resultMap type="EmisContinent" id="EmisContinentResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisContinent" id="EmisContinentResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
         <result property="nameEn"    column="name_en"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisCountryAreaMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisCountryAreaMapper.xml
index 3728aa2..e07359f 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisCountryAreaMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisCountryAreaMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisCountryAreaMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisCountryAreaMapper">
 
-    <resultMap type="EmisCountryArea" id="EmisCountryAreaResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisCountryArea" id="EmisCountryAreaResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
         <result property="nameEn"    column="name_en"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisCountryMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisCountryMapper.xml
index b32e81e..b9e0eae 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisCountryMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisCountryMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisCountryMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisCountryMapper">
 
-    <resultMap type="EmisCountry" id="EmisCountryResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisCountry" id="EmisCountryResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
         <result property="nameEn"    column="name_en"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisCustomerAccountMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisCustomerAccountMapper.xml
index 1f2e2ba..6e7a028 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisCustomerAccountMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisCustomerAccountMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisCustomerAccountMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisCustomerAccountMapper">
     
-    <resultMap type="EmisCustomerAccount" id="EmisCustomerAccountResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisCustomerAccount" id="EmisCustomerAccountResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="accCode"    column="acc_code"    />
         <result property="curMoney"    column="cur_money"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisCustomerAddressMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisCustomerAddressMapper.xml
index 1241085..ae8a79f 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisCustomerAddressMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisCustomerAddressMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisCustomerAddressMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisCustomerAddressMapper">
 
-    <resultMap type="EmisCustomerAddress" id="EmisCustomerAddressResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisCustomerAddress" id="EmisCustomerAddressResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="userId"    column="user_id"    />
         <result property="customerCode"    column="customer_code"    />
@@ -29,11 +29,11 @@
         <result property="useSiteCode"    column="use_site_code"    />
 
 
-        <association property="countryName"    column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
-        <association property="provinceName"    column="province" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
-        <association property="cityName"    column="city" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
-        <association property="countyName"    column="county" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
-        <association property="useSiteName"    column="use_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectGroupSiteNameByCode"/>
+        <association property="countryName"    column="country" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectCountryNameByCode"/>
+        <association property="provinceName"    column="province" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectRegionNameByCode"/>
+        <association property="cityName"    column="city" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectRegionNameByCode"/>
+        <association property="countyName"    column="county" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectRegionNameByCode"/>
+        <association property="useSiteName"    column="use_site_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectGroupSiteNameByCode"/>
 
     </resultMap>
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisCustomerSettleBillMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisCustomerSettleBillMapper.xml
index d1540d0..fe634c9 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisCustomerSettleBillMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisCustomerSettleBillMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisCustomerSettleBillMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisCustomerSettleBillMapper">
     
-    <resultMap type="EmisCustomerSettleBill" id="EmisCustomerSettleBillResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisCustomerSettleBill" id="EmisCustomerSettleBillResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="settleBillNo"    column="settle_bill_no"    />
         <result property="settleDateScope"    column="settle_date_scope"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisCustomerUserMapper.xml
index 5f617a1..20183e7 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisCustomerUserMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisCustomerUserMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisCustomerUserMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisCustomerUserMapper">
 
-    <resultMap type="EmisCustomerUser" id="EmisCustomerUserResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisCustomerUser" id="EmisCustomerUserResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="customerCode"    column="customer_code"    />
         <result property="customerName"    column="customer_name"    />
@@ -59,15 +59,15 @@
         <result property="custName"    column="customer_name"    />
 
 
-        <association property="countryName"    column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
-        <association property="provinceName"    column="province" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
-        <association property="cityName"    column="city" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
-        <association property="countyName"    column="county" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
+        <association property="countryName"    column="country" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectCountryNameByCode"/>
+        <association property="provinceName"    column="province" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectRegionNameByCode"/>
+        <association property="cityName"    column="city" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectRegionNameByCode"/>
+        <association property="countyName"    column="county" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectRegionNameByCode"/>
 
-        <association property="ownerSiteName"    column="owner_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="ownerSiteName"    column="owner_site" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"/>
 
-        <association property="payeeName"    column="payee" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
-        <association property="salesmenName"    column="salesmen" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
+        <association property="payeeName"    column="payee" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectEmpNameByCode"/>
+        <association property="salesmenName"    column="salesmen" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectEmpNameByCode"/>
 <!--        <association property="opEmpName"    column="op_emp_code" select="selectEmpNameByCode"/>-->
 
         <association property="lastOrderTime"    column="customer_code" select="selectLastOrderTimeByCustomerCode"/>
diff --git a/emis-oms2c/src/main/resources/mapper/EmisDestinationMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisDestinationMapper.xml
index 0684421..8992f34 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisDestinationMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisDestinationMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisDestinationMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisDestinationMapper">
 
-    <resultMap type="EmisDestination" id="EmisDestinationResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisDestination" id="EmisDestinationResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="destCode"    column="dest_code"    />
         <result property="destName"    column="dest_name"    />
@@ -20,11 +20,11 @@
         <result property="isHinterland"    column="is_hinterland"    />
         <result property="countryAreaId"    column="country_area_id"    />
 
-        <association property="lineName"    column="line_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
-        <association property="countryName"    column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
+        <association property="lineName"    column="line_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectLineNameByCode"/>
+        <association property="countryName"    column="country" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectCountryNameByCode"/>
 
-        <association property="siteName"    column="site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
-        <association property="countryAreaName"    column="country_area_id" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryAreaNameById"/>
+        <association property="siteName"    column="site_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="countryAreaName"    column="country_area_id" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectCountryAreaNameById"/>
     </resultMap>
 
 <!--    <association property="provinceName"    column="province" select="selectRegionNameByCode"/>-->
diff --git a/emis-oms2c/src/main/resources/mapper/EmisElectronicPagApplyMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisElectronicPagApplyMapper.xml
index ebb8063..c1bb8d9 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisElectronicPagApplyMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisElectronicPagApplyMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisElectronicPagApplyMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisElectronicPagApplyMapper">
 
-    <resultMap type="EmisElectronicPagApply" id="EmisElectronicPagApplyResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisElectronicPagApply" id="EmisElectronicPagApplyResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="prefix"    column="prefix"    />
         <result property="applySeq"    column="apply_seq"    />
@@ -31,20 +31,20 @@
         <result property="provideFlag"    column="provide_flag"    />
 
 
-        <association property="createByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
-        <association property="updateByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
-        <association property="createSiteName" column="create_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
-        <association property="updateSiteName" column="update_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
+        <association property="createByName" column="create_by" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
+        <association property="updateByName" column="create_by" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
+        <association property="createSiteName" column="create_site" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
+        <association property="updateSiteName" column="update_site" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
 
 
-        <association property="applySiteName"    column="apply_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
-        <association property="sendSiteName"    column="send_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
-        <association property="cancelSiteName"    column="cancel_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
-        <association property="userSiteName"    column="user_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="applySiteName"    column="apply_site_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="sendSiteName"    column="send_site_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="cancelSiteName"    column="cancel_site_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="userSiteName"    column="user_site_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"/>
 
-        <association property="applyManName"    column="apply_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
-        <association property="sendManName"    column="send_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
-        <association property="cancelManName"    column="cancel_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
+        <association property="applyManName"    column="apply_man_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectEmpNameByCode"/>
+        <association property="sendManName"    column="send_man_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectEmpNameByCode"/>
+        <association property="cancelManName"    column="cancel_man_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectEmpNameByCode"/>
 
     </resultMap>
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisElectronicPagMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisElectronicPagMapper.xml
index 0fcc3bb..12100da 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisElectronicPagMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisElectronicPagMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisElectronicPagMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisElectronicPagMapper">
 
-    <resultMap type="EmisElectronicPag" id="EmisElectronicPagResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisElectronicPag" id="EmisElectronicPagResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="prefix"    column="prefix"    />
         <result property="startNo"    column="start_no"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisElectronicSitePagMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisElectronicSitePagMapper.xml
index 9b19b97..386ba78 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisElectronicSitePagMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisElectronicSitePagMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisElectronicSitePagMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisElectronicSitePagMapper">
 
-    <resultMap type="EmisElectronicSitePag" id="EmisElectronicSitePagResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisElectronicSitePag" id="EmisElectronicSitePagResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="prefix"    column="prefix"    />
         <result property="startNo"    column="start_no"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisFeeTypeMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisFeeTypeMapper.xml
index 7da26a5..42d6c07 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisFeeTypeMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisFeeTypeMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisFeeTypeMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisFeeTypeMapper">
     
-    <resultMap type="EmisFeeType" id="EmisFeeTypeResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisFeeType" id="EmisFeeTypeResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="feeTypeCode"    column="fee_type_code"    />
         <result property="feeTypeName"    column="fee_type_name"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisGoodsMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisGoodsMapper.xml
index ec1f1e0..6ba5a72 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisGoodsMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisGoodsMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisGoodsMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisGoodsMapper">
 
-    <resultMap type="EmisGoods" id="EmisGoodsResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisGoods" id="EmisGoodsResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="goodsCode"    column="goods_code"    />
         <result property="goodsName"    column="goods_name"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisMaterialMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisMaterialMapper.xml
index a8e323b..3323961 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisMaterialMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisMaterialMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisMaterialMapper" >
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisMaterialMapper" >
     
-    <resultMap type="EmisMaterial" id="EmisMaterialResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisMaterial" id="EmisMaterialResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="materialCode"    column="material_code"    />
         <result property="materialName"    column="material_name"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisMonthpayAccountMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisMonthpayAccountMapper.xml
index da9ce3d..3698400 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisMonthpayAccountMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisMonthpayAccountMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisMonthpayAccountMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisMonthpayAccountMapper">
     
-    <resultMap type="EmisMonthpayAccount" id="EmisMonthpayAccountResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisMonthpayAccount" id="EmisMonthpayAccountResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="custNo"    column="cust_no"    />
         <result property="custName"    column="cust_name"    />
@@ -49,14 +49,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sendAddress"    column="send_address"    />
 
 
-        <association property="countryName"    column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
-        <association property="provinceName"    column="province" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
-        <association property="cityName"    column="city" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
-        <association property="countyName"    column="county" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
+        <association property="countryName"    column="country" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectCountryNameByCode"/>
+        <association property="provinceName"    column="province" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectRegionNameByCode"/>
+        <association property="cityName"    column="city" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectRegionNameByCode"/>
+        <association property="countyName"    column="county" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectRegionNameByCode"/>
 
-        <association property="payeeName"    column="payee" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
-        <association property="salesmenName"    column="salesmen" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
-        <association property="ownerSiteName"    column="owner_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="payeeName"    column="payee" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectEmpNameByCode"/>
+        <association property="salesmenName"    column="salesmen" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectEmpNameByCode"/>
+        <association property="ownerSiteName"    column="owner_site" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"/>
 
     </resultMap>
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisMonthpayUseApplyMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisMonthpayUseApplyMapper.xml
index 10b4b90..0199090 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisMonthpayUseApplyMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisMonthpayUseApplyMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisMonthpayUseApplyMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisMonthpayUseApplyMapper">
     
-    <resultMap type="EmisMonthpayUseApply" id="EmisMonthpayUseApplyResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisMonthpayUseApply" id="EmisMonthpayUseApplyResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="custNo"    column="cust_no"    />
         <result property="customerCode"    column="customer_code"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisNotCalcAgingMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisNotCalcAgingMapper.xml
index 52cf24c..923de61 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisNotCalcAgingMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisNotCalcAgingMapper.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisNotCalcAgingMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisNotCalcAgingMapper">
 
-    <resultMap type="EmisNotCalcAging" id="EmisNotCalcAgingResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisNotCalcAging" id="EmisNotCalcAgingResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="country"    column="country"    />
         <result property="noCalcDay"    column="no_calc_day"    />
         <result property="status"    column="status"    />
 
 
-        <association property="countryName"    column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectGroupCountryNameByCode"/>
+        <association property="countryName"    column="country" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectGroupCountryNameByCode"/>
 
     </resultMap>
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisPrintTplMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisPrintTplMapper.xml
index ddceed0..66d33b8 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisPrintTplMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisPrintTplMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisPrintTplMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisPrintTplMapper">
 
-    <resultMap type="EmisPrintTpl" id="EmisPrintTplResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisPrintTpl" id="EmisPrintTplResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="code"    column="code"    />
         <result property="name"    column="name"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisPrintTplRelMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisPrintTplRelMapper.xml
index 73fef8a..d480ea5 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisPrintTplRelMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisPrintTplRelMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisPrintTplRelMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisPrintTplRelMapper">
     
-    <resultMap type="EmisPrintTplRel" id="EmisPrintTplRelResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisPrintTplRel" id="EmisPrintTplRelResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="merchId"    column="merch_id"    />
         <result property="tplId"    column="tpl_id"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisProblemTypeMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisProblemTypeMapper.xml
index 83e8145..ac13101 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisProblemTypeMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisProblemTypeMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisProblemTypeMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisProblemTypeMapper">
 
-    <resultMap type="EmisProblemType" id="EmisProblemTypeResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisProblemType" id="EmisProblemTypeResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="typeCode"    column="type_code"    />
         <result property="typeName"    column="type_name"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml
index 0b6aac1..4cfc586 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisQuoteDispAreaMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisQuoteDispAreaMapper">
 
-    <resultMap type="EmisQuoteDispArea" id="EmisQuoteDispAreaResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisQuoteDispArea" id="EmisQuoteDispAreaResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="areaId"    column="area_id"    />
         <result property="areaName"    column="area_name"    />
         <result property="useSiteCode"    column="use_site_code"    />
@@ -17,7 +17,7 @@
         <result property="status"    column="status"    />
 
 
-        <association property="useSite"    column="use_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="useSite"    column="use_site_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"/>
 
     </resultMap>
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisQuoteExpressionMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisQuoteExpressionMapper.xml
index 2fc98cf..b5925c3 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisQuoteExpressionMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisQuoteExpressionMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisQuoteExpressionMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisQuoteExpressionMapper">
     
-    <resultMap type="EmisQuoteExpression" id="EmisQuoteExpressionResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisQuoteExpression" id="EmisQuoteExpressionResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="quoteId"    column="quote_id"    />
         <result property="quoteSequence"    column="quote_sequence"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisQuotePriceMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisQuotePriceMapper.xml
index c56e295..4585e0d 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisQuotePriceMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisQuotePriceMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisQuotePriceMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisQuotePriceMapper">
 
-    <resultMap type="EmisQuotePrice" id="EmisQuotePriceResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisQuotePrice" id="EmisQuotePriceResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="quoteId"    column="quote_id"    />
         <result property="quoteCode"    column="quote_code"    />
         <result property="quoteName"    column="quote_name"    />
@@ -40,12 +40,12 @@
         <result property="priorityLevel"    column="priority_level"    />
 
 
-        <association property="prodName"    column="prod_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProdNameByCode"/>
-        <association property="transLine"    column="trans_line_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
-        <association property="useSiteName"    column="use_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
-        <association property="customerName"    column="customer_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCustomerNameByCode"/>
-        <association property="custName"    column="cust_no" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCustNameByCustNo"/>
-        <association property="exprList"    column="quote_id" select="com.xdadan.erp.emis.mapper.EmisQuoteExpressionMapper.selectExprListByQuoteId"/>
+        <association property="prodName"    column="prod_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectProdNameByCode"/>
+        <association property="transLine"    column="trans_line_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectLineNameByCode"/>
+        <association property="useSiteName"    column="use_site_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="customerName"    column="customer_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectCustomerNameByCode"/>
+        <association property="custName"    column="cust_no" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectCustNameByCustNo"/>
+        <association property="exprList"    column="quote_id" select="com.xdadan.erp.oms2c.mapper.EmisQuoteExpressionMapper.selectExprListByQuoteId"/>
 
     </resultMap>
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml
index 74e03fe..9665421 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisQuoteSendAreaMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisQuoteSendAreaMapper">
 
-    <resultMap type="EmisQuoteSendArea" id="EmisQuoteSendAreaResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisQuoteSendArea" id="EmisQuoteSendAreaResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="areaId"    column="area_id"    />
         <result property="areaName"    column="area_name"    />
 
@@ -18,7 +18,7 @@
         <result property="status"    column="status"    />
 
 
-        <association property="useSite"    column="use_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="useSite"    column="use_site_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"/>
 
     </resultMap>
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisRegionMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisRegionMapper.xml
index a7c4882..107b7bb 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisRegionMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisRegionMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisRegionMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisRegionMapper">
 
-    <resultMap type="EmisRegion" id="EmisRegionResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisRegion" id="EmisRegionResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="regionCode"    column="region_code"    />
         <result property="regionName"    column="region_name"    />
@@ -21,7 +21,7 @@
 
 
 <!--        <result property="countryName"    column="country_name"    />-->
-        <association property="countryName"    column="country_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
+        <association property="countryName"    column="country_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectCountryNameByCode"/>
 
     </resultMap>
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisSiteAccountMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisSiteAccountMapper.xml
index e7b63f9..1c23080 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisSiteAccountMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisSiteAccountMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisSiteAccountMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisSiteAccountMapper">
     
-    <resultMap type="EmisSiteAccount" id="EmisSiteAccountResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisSiteAccount" id="EmisSiteAccountResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="accCode"    column="acc_code"    />
         <result property="siteNameCode"    column="site_name_code"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisSiteMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisSiteMapper.xml
index 003658b..25cc15d 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisSiteMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisSiteMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisSiteMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisSiteMapper">
 
-    <resultMap type="EmisSite" id="EmisSiteResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisSite" id="EmisSiteResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="siteCode"    column="site_code"    />
         <result property="siteName"    column="site_name"    />
@@ -124,14 +124,14 @@
         <result property="blWarehouseIn"    column="bl_warehouse_in"    />
 
 
-        <association property="countryName"    column="country_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
-        <association property="provinceName"    column="province" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
-        <association property="cityName"    column="city" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
-        <association property="countyName"    column="county" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
-        <association property="townName"    column="town" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
-        <association property="parentSiteName"    column="parent_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
-        <association property="superiorFinanceCenterName"    column="superior_finance_center_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
-        <association property="logoTypeName"    column="logo_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectBrandNameByCode"/>
+        <association property="countryName"    column="country_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectCountryNameByCode"/>
+        <association property="provinceName"    column="province" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectRegionNameByCode"/>
+        <association property="cityName"    column="city" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectRegionNameByCode"/>
+        <association property="countyName"    column="county" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectRegionNameByCode"/>
+        <association property="townName"    column="town" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectRegionNameByCode"/>
+        <association property="parentSiteName"    column="parent_site_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="superiorFinanceCenterName"    column="superior_finance_center_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="logoTypeName"    column="logo_type" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectBrandNameByCode"/>
 
     </resultMap>
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml
index 071d9b6..96456c1 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisSiteSettleRecordMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisSiteSettleRecordMapper">
     
-    <resultMap type="EmisSiteSettleRecord" id="EmisSiteSettleRecordResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisSiteSettleRecord" id="EmisSiteSettleRecordResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="accCode"    column="acc_code"    />
         <result property="billCode"    column="bill_code"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
index 9338101..80a56f8 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisSpecialCalcWeightMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisSpecialCalcWeightMapper">
     
-    <resultMap type="EmisSpecialCalcWeight" id="EmisSpecialCalcWeightResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisSpecialCalcWeight" id="EmisSpecialCalcWeightResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="prodCode"    column="prod_code"    />
         <result property="status"    column="status"    />
@@ -15,9 +15,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="endDate"    column="end_date"    />
 
 
-        <association property="lineCode"    column="prod_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineProdByProdCode"/>
-        <association property="lineName"    column="prod_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByProdCode"/>
-        <association property="prodName"    column="prod_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProdNameByCode"/>
+        <association property="lineCode"    column="prod_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectLineProdByProdCode"/>
+        <association property="lineName"    column="prod_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectLineNameByProdCode"/>
+        <association property="prodName"    column="prod_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectProdNameByCode"/>
 
     </resultMap>
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisTmsPackDtlMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
index 39feeb7..8661e28 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisTmsPackDtlMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisTmsPackDtlMapper">
 
-    <resultMap type="EmisTmsPackDtl" id="BaseEmisTmsPackDtlResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisTmsPackDtl" id="BaseEmisTmsPackDtlResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="packNo"    column="pack_no"    />
         <result property="billCode"    column="bill_code"    />
@@ -20,7 +20,7 @@
     <resultMap id="EmisTmsPackDtlResult" type="EmisTmsPackDtl" extends="BaseEmisTmsPackDtlResult"  >
         <association property="waybillDetail"
                      column="bill_code"
-                     select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
+                     select="com.xdadan.erp.oms2c.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
                      fetchType="lazy"
         />
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisTmsPackMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisTmsPackMapper.xml
index 4c75eba..aa9cd9f 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisTmsPackMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisTmsPackMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisTmsPackMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisTmsPackMapper">
 
-    <resultMap type="EmisTmsPack" id="EmisTmsPackResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisTmsPack" id="EmisTmsPackResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="packNo"    column="pack_no"    />
         <result property="packName"    column="pack_name"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisTmsScanPicInfoMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisTmsScanPicInfoMapper.xml
index 4b06b57..4d6b502 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisTmsScanPicInfoMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisTmsScanPicInfoMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisTmsScanPicInfoMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisTmsScanPicInfoMapper">
     
-    <resultMap type="EmisTmsScanPicInfo" id="EmisTmsScanPicInfoResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisTmsScanPicInfo" id="EmisTmsScanPicInfoResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="billCode"    column="bill_code"    />
         <result property="scanType"    column="scan_type"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 7eae469..af8f1d9 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisTmsScanRecordMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisTmsScanRecordMapper">
 
-    <resultMap type="EmisTmsScanRecord" id="BaseEmisTmsScanRecordResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisTmsScanRecord" id="BaseEmisTmsScanRecordResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="billCode"    column="bill_code"    />
         <result property="orderSn"    column="order_sn"    />
@@ -53,7 +53,7 @@
     <resultMap type="EmisTmsScanRecord" extends="BaseEmisTmsScanRecordResult" id="EmisTmsScanRecordResult" >
         <association property="waybillDetail"
                      column="bill_code"
-                     select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
+                     select="com.xdadan.erp.oms2c.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
                      fetchType="lazy"
         />
 
@@ -75,7 +75,7 @@
 
         <association property="scanSiteName"
                      column="scan_site_code"
-                     select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"
+                     select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"
                      fetchType="lazy"
 
         />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
index 712d346..2708d48 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisTmsSiteBatchDtlMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisTmsSiteBatchDtlMapper">
 
-    <resultMap type="EmisTmsSiteBatchDtl" id="BaseEmisTmsSiteBatchDtlResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisTmsSiteBatchDtl" id="BaseEmisTmsSiteBatchDtlResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="billCode"    column="bill_code"    />
         <result property="batchNo"    column="batch_no"    />
@@ -19,7 +19,7 @@
     <resultMap id="EmisTmsSiteBatchDtlResult" type="EmisTmsSiteBatchDtl" extends="BaseEmisTmsSiteBatchDtlResult"  >
         <association property="waybillDetail"
                      column="bill_code"
-                     select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
+                     select="com.xdadan.erp.oms2c.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
                      fetchType="lazy"
         />
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisTmsSiteBatchLoadingMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisTmsSiteBatchLoadingMapper.xml
index 34f9d16..cd8c651 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisTmsSiteBatchLoadingMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisTmsSiteBatchLoadingMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisTmsSiteBatchLoadingMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisTmsSiteBatchLoadingMapper">
 
-    <resultMap type="EmisTmsSiteBatchLoading" id="EmisTmsSiteBatchLoadingResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisTmsSiteBatchLoading" id="EmisTmsSiteBatchLoadingResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="batchNo"    column="batch_no"    />
         <result property="posNo"    column="pos_no"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
index 866bb26..991d749 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisTmsSiteBatchMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisTmsSiteBatchMapper">
 
-    <resultMap type="EmisTmsSiteBatch" id="EmisTmsSiteBatchResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisTmsSiteBatch" id="EmisTmsSiteBatchResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="batchNo"    column="batch_no"    />
         <result property="batchName"    column="batch_name"    />
@@ -35,12 +35,12 @@
         <result property="totalWeight"    column="total_weight"    />
         <result property="opMan"    column="op_man"    />
 
-        <association property="productTypeName"    column="product_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProdNameByCode"/>
-        <association property="transLineTypeName"    column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
+        <association property="productTypeName"    column="product_type" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectProdNameByCode"/>
+        <association property="transLineTypeName"    column="trans_line_type" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectLineNameByCode"/>
 
         <!--   个性化查询     -->
-        <association property="sendCountryName"    column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectFromCountryNameByLineCode"/>
-        <association property="destCountryName"    column="dest_country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
+        <association property="sendCountryName"    column="trans_line_type" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectFromCountryNameByLineCode"/>
+        <association property="destCountryName"    column="dest_country" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectCountryNameByCode"/>
 
     </resultMap>
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
index f9217e2..fefa810 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisTmsTransPlanDtlMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisTmsTransPlanDtlMapper">
 
-    <resultMap type="EmisTmsTransPlanDtl" id="EmisTmsTransPlanDtlResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisTmsTransPlanDtl" id="EmisTmsTransPlanDtlResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="planId"    column="plan_id"    />
         <result property="stepName"    column="step_name"    />
@@ -16,8 +16,8 @@
         <result property="status"    column="status"    />
 
 
-        <association property="startSiteName"    column="start_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectGroupSiteNameByCode"/>
-        <association property="destSiteName"    column="dest_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectGroupSiteNameByCode"/>
+        <association property="startSiteName"    column="start_site" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectGroupSiteNameByCode"/>
+        <association property="destSiteName"    column="dest_site" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectGroupSiteNameByCode"/>
 
     </resultMap>
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisTmsTransPlanMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
index 3aa04b0..a1dd5c6 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisTmsTransPlanMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisTmsTransPlanMapper">
 
-    <resultMap type="EmisTmsTransPlan" id="EmisTmsTransPlanResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisTmsTransPlan" id="EmisTmsTransPlanResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="planCode"    column="plan_code"    />
         <result property="planName"    column="plan_name"    />
@@ -13,12 +13,12 @@
         <result property="status"    column="status"    />
 
 
-        <association property="productTypeName"    column="product_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProdNameByCode"/>
-        <association property="transLineTypeName"    column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
+        <association property="productTypeName"    column="product_type" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectProdNameByCode"/>
+        <association property="transLineTypeName"    column="trans_line_type" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectLineNameByCode"/>
 
         <!--   个性化查询     -->
-        <association property="fromCountryName"    column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectFromCountryNameByLineCode"/>
-        <association property="countryName"    column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectDestCountryNameByLineCode"/>
+        <association property="fromCountryName"    column="trans_line_type" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectFromCountryNameByLineCode"/>
+        <association property="countryName"    column="trans_line_type" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectDestCountryNameByLineCode"/>
 
         <association property="totalEstCostDay"    column="id" select="selectTotalEstCostDayByPlanId"/>
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisTransLineMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisTransLineMapper.xml
index da819df..c7cd804 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisTransLineMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisTransLineMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisTransLineMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisTransLineMapper">
 
-    <resultMap type="EmisTransLine" id="EmisTransLineResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisTransLine" id="EmisTransLineResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="lineCode"    column="line_code"    />
         <result property="lineName"    column="line_name"    />
@@ -24,9 +24,9 @@
         <result property="transType"    column="trans_type"    />
         <result property="orderNum"    column="order_num"    />
 
-        <association property="fromCountryName"    column="from_country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
-        <association property="countryName"    column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
-        <association property="logoTypeName"    column="logo_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectBrandNameByCode"/>
+        <association property="fromCountryName"    column="from_country" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectCountryNameByCode"/>
+        <association property="countryName"    column="country" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectCountryNameByCode"/>
+        <association property="logoTypeName"    column="logo_type" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectBrandNameByCode"/>
 
 
     </resultMap>
diff --git a/emis-oms2c/src/main/resources/mapper/EmisTransProductMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisTransProductMapper.xml
index ba1bf73..c7c2d5c 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisTransProductMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisTransProductMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisTransProductMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisTransProductMapper">
 
-    <resultMap type="EmisTransProduct" id="EmisTransProductResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisTransProduct" id="EmisTransProductResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="prodCode"    column="prod_code"    />
         <result property="prodName"    column="prod_name"    />
@@ -21,8 +21,8 @@
         <result property="maxAging"    column="max_aging"    />
         <result property="orderNum"    column="order_num"    />
 
-        <association property="transLine"    column="trans_line_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
-        <association property="countryName"    column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
+        <association property="transLine"    column="trans_line_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectLineNameByCode"/>
+        <association property="countryName"    column="country" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectCountryNameByCode"/>
 
     </resultMap>
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
index 8dfcf2e..b4413ff 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisWarehouseInBatchMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisWarehouseInBatchMapper">
     
-    <resultMap type="EmisWarehouseInBatch" id="EmisWarehouseInBatchResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisWarehouseInBatch" id="EmisWarehouseInBatchResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="serialNo"    column="serial_no"    />
         <result property="inNo"    column="in_no"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisWarehouseInDtlMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisWarehouseInDtlMapper.xml
index 5aa0028..d803698 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisWarehouseInDtlMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisWarehouseInDtlMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisWarehouseInDtlMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisWarehouseInDtlMapper">
     
-    <resultMap type="EmisWarehouseInDtl" id="EmisWarehouseInDtlResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisWarehouseInDtl" id="EmisWarehouseInDtlResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="inNo"    column="in_no"    />
         <result property="inChildNo"    column="in_child_no"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisWarehouseInMapper.xml
index c641652..895c1d9 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisWarehouseInMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisWarehouseInMapper">
     
-    <resultMap type="EmisWarehouseIn" id="EmisWarehouseInResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisWarehouseIn" id="EmisWarehouseInResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="serialNo"    column="serial_no"    />
         <result property="inNo"    column="in_no"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
index 5af924f..9f0c3c1 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillAttachmentMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisWaybillAttachmentMapper">
 
-    <resultMap type="EmisWaybillAttachment" id="EmisWaybillAttachmentResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisWaybillAttachment" id="EmisWaybillAttachmentResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="waybillId"    column="waybill_id"    />
         <result property="billCode"    column="bill_code"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisWaybillCargoMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisWaybillCargoMapper.xml
index 0a0ca82..0c1b48e 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisWaybillCargoMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisWaybillCargoMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillCargoMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisWaybillCargoMapper">
 
-    <resultMap type="EmisWaybillCargo" id="EmisWaybillCargoResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisWaybillCargo" id="EmisWaybillCargoResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="waybillId"    column="waybill_id"    />
         <result property="goodsCode"    column="goods_code"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisWaybillFeeitemMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisWaybillFeeitemMapper.xml
index c3f3fc8..578cf56 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisWaybillFeeitemMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisWaybillFeeitemMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillFeeitemMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisWaybillFeeitemMapper">
 
-    <resultMap type="EmisWaybillFeeitem" id="EmisWaybillFeeitemResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisWaybillFeeitem" id="EmisWaybillFeeitemResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="waybillId"    column="waybill_id"    />
         <result property="feeCode"    column="fee_code"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisWaybillMapper.xml
index 5ff823c..6211ed8 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisWaybillMapper">
 
-    <resultMap type="EmisWaybill" id="BaseEmisWaybillResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisWaybill" id="BaseEmisWaybillResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="orderSn"    column="order_sn"    />
         <result property="custOrderId"    column="cust_order_id"    />
@@ -207,7 +207,7 @@
 
     <resultMap id="EmisWaybillResult" extends="BaseEmisWaybillResult" type="EmisWaybill">
         <!-- 获取订单最后一条扫描记录 -->
-        <association property="lastScanRecord"  column="bill_code" select="com.xdadan.erp.emis.mapper.EmisTmsScanRecordMapper.selectLastRecordByBillCode"/>
+        <association property="lastScanRecord"  column="bill_code" select="com.xdadan.erp.oms2c.mapper.EmisTmsScanRecordMapper.selectLastRecordByBillCode"/>
     </resultMap>
 
     <!--   获取运单统计条数-->
diff --git a/emis-oms2c/src/main/resources/mapper/EmisWaybillProblemFaqMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisWaybillProblemFaqMapper.xml
index e3db1c1..c0f1e48 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisWaybillProblemFaqMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisWaybillProblemFaqMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillProblemFaqMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisWaybillProblemFaqMapper">
     
-    <resultMap type="EmisWaybillProblemFaq" id="EmisWaybillProblemFaqResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisWaybillProblemFaq" id="EmisWaybillProblemFaqResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="probId"    column="prob_id"    />
         <result property="billCode"    column="bill_code"    />
diff --git a/emis-oms2c/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
index 6de3df5..282201f 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillProblemInfoMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisWaybillProblemInfoMapper">
 
-    <resultMap type="EmisWaybillProblemInfo" id="EmisWaybillProblemInfoResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisWaybillProblemInfo" id="EmisWaybillProblemInfoResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="billCode"    column="bill_code"    />
         <result property="problemType"    column="problem_type"    />
@@ -31,12 +31,12 @@
         <result property="blSee"    column="bl_see"    />
         <result property="filePath"    column="file_path"    />
 
-        <association property="problemTypeName"    column="problem_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProblemTypeNameById"/>
-        <association property="sendSiteName"    column="send_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
-        <association property="registerSiteName"    column="register_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
-        <association property="registerManName"    column="register_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
-        <association property="reversionSiteName"    column="register_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
-        <association property="registerManDeptName"    column="register_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectDeptNameByEmpCode"/>
+        <association property="problemTypeName"    column="problem_type" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectProblemTypeNameById"/>
+        <association property="sendSiteName"    column="send_site_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="registerSiteName"    column="register_site_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="registerManName"    column="register_man_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectEmpNameByCode"/>
+        <association property="reversionSiteName"    column="register_site_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="registerManDeptName"    column="register_man_code" select="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.selectDeptNameByEmpCode"/>
 
     </resultMap>
 
diff --git a/emis-oms2c/src/main/resources/mapper/EmisWaybillTransferMapper.xml b/emis-oms2c/src/main/resources/mapper/EmisWaybillTransferMapper.xml
index 8c8c67c..acdbe37 100644
--- a/emis-oms2c/src/main/resources/mapper/EmisWaybillTransferMapper.xml
+++ b/emis-oms2c/src/main/resources/mapper/EmisWaybillTransferMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillTransferMapper">
+<mapper namespace="com.xdadan.erp.oms2c.mapper.EmisWaybillTransferMapper">
     
-    <resultMap type="EmisWaybillTransfer" id="BaseEmisWaybillTransferResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisWaybillTransfer" id="BaseEmisWaybillTransferResult" extends="com.xdadan.erp.oms2c.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="billCode"    column="bill_code"    />
         <result property="transferBillCode"    column="transfer_bill_code"    />
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap id="EmisWaybillTransferResult" type="EmisWaybillTransfer" extends="BaseEmisWaybillTransferResult"  >
         <association property="waybillDetail"
                      column="bill_code"
-                     select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
+                     select="com.xdadan.erp.oms2c.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
                      fetchType="lazy"
         />