md

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("服务器异常，联系客服");
-        }
-    }
 
 }

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

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));
-    }
 }

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));
-//    }
 }

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)
     {

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

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

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

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));
-    }
 }

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));
-    }
 }

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));
-    }
 }

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("获取失败");
-
-    }
-
 
 
 

emis-oms2c/src/main/java/com/xdadan/erp/emis/service/impl/ScanDataHelper.java

@@ -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 {
-
-}

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;
 
 

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;
 
 

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;
 
 

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;
 
 

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;
 
 

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;

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;
 
 

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;
 

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;
 
 

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;

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;

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;

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;
 
 

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;
 
 

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;
 
 

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;
 

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;
 

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;
 

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;
 
 

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;
 
 

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;
 
 

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;
 
 

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;
 
 

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;

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;
 
 

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;
 
 

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;
 

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;
 
 

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;
 
 

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;

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;

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;
 

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;
 
 

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;

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;

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;
 

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;
 
 

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;

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;
 
 

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;
 
 

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;
 
 

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;
 

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;

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;
 
 

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;

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;
 
 

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;
 
 

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;
 
 

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;
 
 

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;
 

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;

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;
 

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;
 
 /**
  * 付款状态

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 {
 

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 {
 

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 {
 

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

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 {
 

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,非表结构

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;
 
 /**
  * 寄件录单统计

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;
 

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;

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;

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;

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;

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;
 

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;

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;

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;
 

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;
 
 /**
   扫描信息

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;
 
 /**

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

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

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>

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>

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

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>

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

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>

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>

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>

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>

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;

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;

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>

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

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>