diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cTransLineController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cTransLineController.java index cbaffe3..61f9162 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cTransLineController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cTransLineController.java @@ -56,7 +56,10 @@ public class Oms2cTransLineController extends BaseController /** * 查询线路列表 -- 精简 */ - @JacksonFilter(include= {"id","lineCode","lineName","lineNameEn","meterRate",},value= EmisTransLine.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + @JacksonFilter(include= {"id","lineCode","lineName","lineNameEn","meterRate","transType", + "fromCountry", + "country", + },value= EmisTransLine.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @RequestMapping("/listSimple") public TableDataInfo listSimple(EmisTransLine emisTransLine) { diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java index c34be47..9dd322a 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java @@ -79,6 +79,12 @@ public class Oms2cWaybillController extends BaseController } + @Log(title = "OMSExcel草稿方式下单", businessType = BusinessType.INSERT) + @PostMapping(value = "/draftSubmitOrder") + public AjaxResult draftSubmitOrder(@RequestBody EmisWaybill emisWaybillSave){ + return this.iRpcWaybillSvc.draftSubmitOrderByOms(emisWaybillSave); + } + /** * 使用远程调用注意：统一使用api中心进行运费试算 * @param waybillOrder diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisBrandMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisBrandMapper.java deleted file mode 100644 index 9a947e0..0000000 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisBrandMapper.java +++ /dev/null @@ -1,72 +0,0 @@ -/** - * @Project: emis - * @Title: EmisBrandMapper.java - * @author linfso - * @date 2023-12-14 13:02:47 - * @Copyright: ShangHai Doitinfo 2022 All rights reserved. - * @version v1.0 - * @Description:

品牌 Mapper 接口

- * Warning : This file is generate by ai tools,don't edit!!! - */ -package com.xdadan.erp.oms.mapper; - -import java.util.List; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.xdadan.erp.oms.domain.EmisBrand; - -/** - * @ClassName EmisBrandMapper - * @Description

品牌 Mapper 接口

- * @author linfso - * @date 2023-12-14 13:02:47 - */ -//@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class) -public interface EmisBrandMapper extends BaseMapper -{ - /** - * 主键查询 - * @param id - * @return - */ - public EmisBrand selectEmisBrandById(Long id); - - /** - * 查询列表 - * - * @param emisBrand - * @return 集合 - */ - public List selectEmisBrandList(EmisBrand emisBrand); - - /** - * 新增 - * - * @param emisBrand - * @return - */ - public int insertEmisBrand(EmisBrand emisBrand); - - /** - * 修改 - * - * @param emisBrand - * @return - */ - public int updateEmisBrand(EmisBrand emisBrand); - - /** - * 删除 - * - * @param id 主键 - * @return 结果 - */ - public int deleteEmisBrandById(Long id); - - /** - * 批量删除 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteEmisBrandByIds(Long[] ids); -} diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisContinentMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisContinentMapper.java deleted file mode 100644 index 13dc622..0000000 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisContinentMapper.java +++ /dev/null @@ -1,70 +0,0 @@ -/** - * @Project: emis - * @Title: EmisContinentMapper.java - * @author linfso - * @date 2023-11-16 16:18:40 - * @Copyright: ShangHai Doitinfo 2022 All rights reserved. - * @version v1.0 - * @Description:

地球洲 Mapper 接口

- * Warning : This file is generate by ai tools,don't edit!!! - */ -package com.xdadan.erp.oms.mapper; - -import java.util.List; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.xdadan.erp.oms.domain.EmisContinent; -/** - * @ClassName EmisContinentMapper - * @Description

地球洲 Mapper 接口

- * @author linfso - * @date 2023-11-16 16:18:40 - */ -public interface EmisContinentMapper extends BaseMapper -{ - /** - * 主键查询 - * @param id - * @return - */ - public EmisContinent selectEmisContinentById(Integer id); - - /** - * 查询列表 - * - * @param emisContinent - * @return 集合 - */ - public List selectEmisContinentList(EmisContinent emisContinent); - - /** - * 新增 - * - * @param emisContinent - * @return - */ - public int insertEmisContinent(EmisContinent emisContinent); - - /** - * 修改 - * - * @param emisContinent - * @return - */ - public int updateEmisContinent(EmisContinent emisContinent); - - /** - * 删除 - * - * @param id 主键 - * @return 结果 - */ - public int deleteEmisContinentById(Integer id); - - /** - * 批量删除 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteEmisContinentByIds(Integer[] ids); -} diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCountryAreaMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCountryAreaMapper.java deleted file mode 100644 index 45faa3b..0000000 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCountryAreaMapper.java +++ /dev/null @@ -1,70 +0,0 @@ -/** - * @Project: emis - * @Title: EmisCountryAreaMapper.java - * @author linfso - * @date 2023-11-16 16:18:40 - * @Copyright: ShangHai Doitinfo 2022 All rights reserved. - * @version v1.0 - * @Description:

国家大区表 Mapper 接口

- * Warning : This file is generate by ai tools,don't edit!!! - */ -package com.xdadan.erp.oms.mapper; - -import java.util.List; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.xdadan.erp.oms.domain.EmisCountryArea; -/** - * @ClassName EmisCountryAreaMapper - * @Description

国家大区表 Mapper 接口

- * @author linfso - * @date 2023-11-16 16:18:40 - */ -public interface EmisCountryAreaMapper extends BaseMapper -{ - /** - * 主键查询 - * @param id - * @return - */ - public EmisCountryArea selectEmisCountryAreaById(Long id); - - /** - * 查询列表 - * - * @param emisCountryArea - * @return 集合 - */ - public List selectEmisCountryAreaList(EmisCountryArea emisCountryArea); - - /** - * 新增 - * - * @param emisCountryArea - * @return - */ - public int insertEmisCountryArea(EmisCountryArea emisCountryArea); - - /** - * 修改 - * - * @param emisCountryArea - * @return - */ - public int updateEmisCountryArea(EmisCountryArea emisCountryArea); - - /** - * 删除 - * - * @param id 主键 - * @return 结果 - */ - public int deleteEmisCountryAreaById(Long id); - - /** - * 批量删除 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteEmisCountryAreaByIds(Long[] ids); -} diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCustomerAccountMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCustomerAccountMapper.java deleted file mode 100644 index dba41c6..0000000 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCustomerAccountMapper.java +++ /dev/null @@ -1,70 +0,0 @@ -/** - * @Project: emis - * @Title: EmisCustomerAccountMapper.java - * @author linfso - * @date 2024-04-24 05:05:21 - * @Copyright: ShangHai Doitinfo 2022 All rights reserved. - * @version v1.0 - * @Description:

快递用户结算账户 Mapper 接口

- * Warning : This file is generate by ai tools,don't edit!!! - */ -package com.xdadan.erp.oms.mapper; - -import java.util.List; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.xdadan.erp.oms.domain.EmisCustomerAccount; -/** - * @ClassName EmisCustomerAccountMapper - * @Description

快递用户结算账户 Mapper 接口

- * @author linfso - * @date 2024-04-24 05:05:21 - */ -public interface EmisCustomerAccountMapper extends BaseMapper -{ - /** - * 主键查询 - * @param id - * @return - */ - public EmisCustomerAccount selectEmisCustomerAccountById(Long id); - - /** - * 查询列表 - * - * @param emisCustomerAccount - * @return 集合 - */ - public List selectEmisCustomerAccountList(EmisCustomerAccount emisCustomerAccount); - - /** - * 新增 - * - * @param emisCustomerAccount - * @return - */ - public int insertEmisCustomerAccount(EmisCustomerAccount emisCustomerAccount); - - /** - * 修改 - * - * @param emisCustomerAccount - * @return - */ - public int updateEmisCustomerAccount(EmisCustomerAccount emisCustomerAccount); - - /** - * 删除 - * - * @param id 主键 - * @return 结果 - */ - public int deleteEmisCustomerAccountById(Long id); - - /** - * 批量删除 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteEmisCustomerAccountByIds(Long[] ids); -} diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCustomerSettleBillMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCustomerSettleBillMapper.java deleted file mode 100644 index a25092b..0000000 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCustomerSettleBillMapper.java +++ /dev/null @@ -1,70 +0,0 @@ -/** - * @Project: emis - * @Title: EmisCustomerSettleBillMapper.java - * @author linfso - * @date 2024-04-24 05:05:21 - * @Copyright: ShangHai Doitinfo 2022 All rights reserved. - * @version v1.0 - * @Description:

快递用户结算账单 Mapper 接口

- * Warning : This file is generate by ai tools,don't edit!!! - */ -package com.xdadan.erp.oms.mapper; - -import java.util.List; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.xdadan.erp.oms.domain.EmisCustomerSettleBill; -/** - * @ClassName EmisCustomerSettleBillMapper - * @Description

快递用户结算账单 Mapper 接口

- * @author linfso - * @date 2024-04-24 05:05:21 - */ -public interface EmisCustomerSettleBillMapper extends BaseMapper -{ - /** - * 主键查询 - * @param id - * @return - */ - public EmisCustomerSettleBill selectEmisCustomerSettleBillById(Long id); - - /** - * 查询列表 - * - * @param emisCustomerSettleBill - * @return 集合 - */ - public List selectEmisCustomerSettleBillList(EmisCustomerSettleBill emisCustomerSettleBill); - - /** - * 新增 - * - * @param emisCustomerSettleBill - * @return - */ - public int insertEmisCustomerSettleBill(EmisCustomerSettleBill emisCustomerSettleBill); - - /** - * 修改 - * - * @param emisCustomerSettleBill - * @return - */ - public int updateEmisCustomerSettleBill(EmisCustomerSettleBill emisCustomerSettleBill); - - /** - * 删除 - * - * @param id 主键 - * @return 结果 - */ - public int deleteEmisCustomerSettleBillById(Long id); - - /** - * 批量删除 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteEmisCustomerSettleBillByIds(Long[] ids); -} diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisNotCalcAgingMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisNotCalcAgingMapper.java deleted file mode 100644 index 94d3c3e..0000000 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisNotCalcAgingMapper.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * @Project: emis - * @Title: EmisNotCalcAgingMapper.java - * @author linfso - * @date 2024-01-10 07:21:31 - * @Copyright: ShangHai Doitinfo 2022 All rights reserved. - * @version v1.0 - * @Description:

不计时效维护 Mapper 接口

- * Warning : This file is generate by ai tools,don't edit!!! - */ -package com.xdadan.erp.oms.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.xdadan.erp.oms.domain.EmisNotCalcAging; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -/** - * @ClassName EmisNotCalcAgingMapper - * @Description

不计时效维护 Mapper 接口

- * @author linfso - * @date 2024-01-10 07:21:31 - */ -public interface EmisNotCalcAgingMapper extends BaseMapper -{ - /** - * 主键查询 - * @param id - * @return - */ - public EmisNotCalcAging selectEmisNotCalcAgingById(Long id); - - /** - * 查询列表 - * - * @param emisNotCalcAging - * @return 集合 - */ - public List selectEmisNotCalcAgingList(EmisNotCalcAging emisNotCalcAging); - - /** - * 新增 - * - * @param emisNotCalcAging - * @return - */ - public int insertEmisNotCalcAging(EmisNotCalcAging emisNotCalcAging); - - /** - * 修改 - * - * @param emisNotCalcAging - * @return - */ - public int updateEmisNotCalcAging(EmisNotCalcAging emisNotCalcAging); - - /** - * 删除 - * - * @param id 主键 - * @return 结果 - */ - public int deleteEmisNotCalcAgingById(Long id); - - /** - * 批量删除 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteEmisNotCalcAgingByIds(Long[] ids); - - - public int getNotCalcAgingDays(@Param("recieveCountry") String recieveCountry, @Param("sendCountry") String sendCountry, @Param("startDate") Date startDate, @Param("endDate") Date endDate); -} diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisPrintTplMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisPrintTplMapper.java deleted file mode 100644 index 7ed201b..0000000 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisPrintTplMapper.java +++ /dev/null @@ -1,73 +0,0 @@ -/** - * @Project: emis - * @Title: EmisPrintTplMapper.java - * @author linfso - * @date 2024-05-12 11:28:34 - * @Copyright: ShangHai Doitinfo 2022 All rights reserved. - * @version v1.0 - * @Description:

快递打印模板 Mapper 接口

- * Warning : This file is generate by ai tools,don't edit!!! - */ -package com.xdadan.erp.oms.mapper; - -import java.util.List; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.xdadan.erp.oms.domain.EmisPrintTpl; -/** - * @ClassName EmisPrintTplMapper - * @Description

快递打印模板 Mapper 接口

- * @author linfso - * @date 2024-05-12 11:28:34 - */ -public interface EmisPrintTplMapper extends BaseMapper -{ - /** - * 主键查询 - * @param id - * @return - */ - public EmisPrintTpl selectEmisPrintTplById(Long id); - - /** - * 查询列表 - * - * @param emisPrintTpl - * @return 集合 - */ - public List selectEmisPrintTplList(EmisPrintTpl emisPrintTpl); - - /** - * 新增 - * - * @param emisPrintTpl - * @return - */ - public int insertEmisPrintTpl(EmisPrintTpl emisPrintTpl); - - /** - * 修改 - * - * @param emisPrintTpl - * @return - */ - public int updateEmisPrintTpl(EmisPrintTpl emisPrintTpl); - - /** - * 删除 - * - * @param id 主键 - * @return 结果 - */ - public int deleteEmisPrintTplById(Long id); - - /** - * 批量删除 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteEmisPrintTplByIds(Long[] ids); - - - public List selectPrintTplListByPrinter(EmisPrintTpl emisPrintTpl); -} diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisPrintTplRelMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisPrintTplRelMapper.java deleted file mode 100644 index eac577c..0000000 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisPrintTplRelMapper.java +++ /dev/null @@ -1,70 +0,0 @@ -/** - * @Project: emis - * @Title: EmisPrintTplRelMapper.java - * @author linfso - * @date 2024-05-12 11:28:34 - * @Copyright: ShangHai Doitinfo 2022 All rights reserved. - * @version v1.0 - * @Description:

快递商户关联表 Mapper 接口

- * Warning : This file is generate by ai tools,don't edit!!! - */ -package com.xdadan.erp.oms.mapper; - -import java.util.List; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.xdadan.erp.oms.domain.EmisPrintTplRel; -/** - * @ClassName EmisPrintTplRelMapper - * @Description

快递商户关联表 Mapper 接口

- * @author linfso - * @date 2024-05-12 11:28:34 - */ -public interface EmisPrintTplRelMapper extends BaseMapper -{ - /** - * 主键查询 - * @param id - * @return - */ - public EmisPrintTplRel selectEmisPrintTplRelById(Long id); - - /** - * 查询列表 - * - * @param emisPrintTplRel - * @return 集合 - */ - public List selectEmisPrintTplRelList(EmisPrintTplRel emisPrintTplRel); - - /** - * 新增 - * - * @param emisPrintTplRel - * @return - */ - public int insertEmisPrintTplRel(EmisPrintTplRel emisPrintTplRel); - - /** - * 修改 - * - * @param emisPrintTplRel - * @return - */ - public int updateEmisPrintTplRel(EmisPrintTplRel emisPrintTplRel); - - /** - * 删除 - * - * @param id 主键 - * @return 结果 - */ - public int deleteEmisPrintTplRelById(Long id); - - /** - * 批量删除 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteEmisPrintTplRelByIds(Long[] ids); -} diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisProblemTypeMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisProblemTypeMapper.java deleted file mode 100644 index faf375a..0000000 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisProblemTypeMapper.java +++ /dev/null @@ -1,70 +0,0 @@ -/** - * @Project: emis - * @Title: EmisProblemTypeMapper.java - * @author linfso - * @date 2024-01-11 05:46:42 - * @Copyright: ShangHai Doitinfo 2022 All rights reserved. - * @version v1.0 - * @Description:

问题件类型 Mapper 接口

- * Warning : This file is generate by ai tools,don't edit!!! - */ -package com.xdadan.erp.oms.mapper; - -import java.util.List; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.xdadan.erp.oms.domain.EmisProblemType; -/** - * @ClassName EmisProblemTypeMapper - * @Description

问题件类型 Mapper 接口

- * @author linfso - * @date 2024-01-11 05:46:42 - */ -public interface EmisProblemTypeMapper extends BaseMapper -{ - /** - * 主键查询 - * @param id - * @return - */ - public EmisProblemType selectEmisProblemTypeById(Integer id); - - /** - * 查询列表 - * - * @param emisProblemType - * @return 集合 - */ - public List selectEmisProblemTypeList(EmisProblemType emisProblemType); - - /** - * 新增 - * - * @param emisProblemType - * @return - */ - public int insertEmisProblemType(EmisProblemType emisProblemType); - - /** - * 修改 - * - * @param emisProblemType - * @return - */ - public int updateEmisProblemType(EmisProblemType emisProblemType); - - /** - * 删除 - * - * @param id 主键 - * @return 结果 - */ - public int deleteEmisProblemTypeById(Integer id); - - /** - * 批量删除 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteEmisProblemTypeByIds(Integer[] ids); -} diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisTmsScanRecordMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisTmsScanRecordMapper.java deleted file mode 100644 index 0e0938d..0000000 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisTmsScanRecordMapper.java +++ /dev/null @@ -1,84 +0,0 @@ -/** - * @Project: emis - * @Title: EmisTmsScanRecordMapper.java - * @author linfso - * @date 2024-03-01 08:54:59 - * @Copyright: ShangHai Doitinfo 2022 All rights reserved. - * @version v1.0 - * @Description:

TMS扫描记录 Mapper 接口

- * Warning : This file is generate by ai tools,don't edit!!! - */ -package com.xdadan.erp.oms.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.xdadan.erp.oms.domain.EmisTmsScanRecord; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -/** - * @ClassName EmisTmsScanRecordMapper - * @Description

TMS扫描记录 Mapper 接口

- * @author linfso - * @date 2024-03-01 08:54:59 - */ -public interface EmisTmsScanRecordMapper extends BaseMapper -{ - /** - * 主键查询 - * @param id - * @return - */ - public EmisTmsScanRecord selectEmisTmsScanRecordById(Long id); - - /** - * 查询列表 - * - * @param emisTmsScanRecord - * @return 集合 - */ - public List selectEmisTmsScanRecordList(EmisTmsScanRecord emisTmsScanRecord); - - /** - * 新增 - * - * @param emisTmsScanRecord - * @return - */ - public int insertEmisTmsScanRecord(EmisTmsScanRecord emisTmsScanRecord); - - /** - * 修改 - * - * @param emisTmsScanRecord - * @return - */ - public int updateEmisTmsScanRecord(EmisTmsScanRecord emisTmsScanRecord); - - /** - * 删除 - * - * @param id 主键 - * @return 结果 - */ - public int deleteEmisTmsScanRecordById(Long id); - - /** - * 批量删除 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteEmisTmsScanRecordByIds(Long[] ids); - - - public int checkSiteScanUnique(@Param("billCode") String billCode, @Param("scanType") String scanType, @Param("scanSiteCode") String scanSiteCode, @Param("scanDate") Date scanDate); - - - public List selectTraceListByBillCode(String billCode); - - - - -} diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java index a9ca3a7..8e53c5a 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java @@ -2,6 +2,7 @@ package com.xdadan.erp.oms.service.svc; import com.xdadan.erp.oms.common.core.domain.AjaxResult; +import com.xdadan.erp.oms.domain.EmisWaybill; import com.xdadan.erp.oms.domain.vo.WaybillOrder; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -41,4 +42,7 @@ public interface IRpcWaybillSvc { public AjaxResult getWaybillDetailByOms(@RequestParam("billCode")String billCode,@RequestParam("orderSn") String orderSn); + @PostMapping(value = "/draftSubmitOrderByOms") + public AjaxResult draftSubmitOrderByOms(@RequestBody EmisWaybill emisWaybillSave); + } \ No newline at end of file diff --git a/emis-oms-biz/src/main/resources/mapper/EmisNotCalcAgingMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisNotCalcAgingMapper.xml deleted file mode 100644 index 88eb221..0000000 --- a/emis-oms-biz/src/main/resources/mapper/EmisNotCalcAgingMapper.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - select id, country, country_name, no_calc_day, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_not_calc_aging - - - - - - - - - - - - insert into emis_not_calc_aging - - id, - country, - country_name, - no_calc_day, - status, - remark, - tenant_id, - del_flag, - create_by, - create_time, - update_by, - update_time, - create_site, - update_site, - - - #{id}, - #{country}, - #{countryName}, - #{noCalcDay}, - #{status}, - #{remark}, - #{tenantId}, - #{delFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{createSite}, - #{updateSite}, - - - - - update emis_not_calc_aging - - country = #{country}, - country_name = #{countryName}, - no_calc_day = #{noCalcDay}, - status = #{status}, - remark = #{remark}, - tenant_id = #{tenantId}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - create_site = #{createSite}, - update_site = #{updateSite}, - - where id = #{id} - - - - delete from emis_not_calc_aging where id = #{id} - - - - delete from emis_not_calc_aging where id in - - #{id} - - - \ No newline at end of file diff --git a/emis-oms-biz/src/main/resources/mapper/EmisPrintTplMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisPrintTplMapper.xml deleted file mode 100644 index 2f394d4..0000000 --- a/emis-oms-biz/src/main/resources/mapper/EmisPrintTplMapper.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - select id, code, name, version, is_public, merch_id, express_type, tpl_data, tpl_pdf_data, tpl_pic_url, order_num, status, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_print_tpl - - - - - - - - - - insert into emis_print_tpl - - id, - code, - name, - version, - is_public, - merch_id, - express_type, - tpl_data, - tpl_enc_data, - tpl_pdf_data, - tpl_pic_url, - order_num, - status, - del_flag, - create_by, - create_time, - update_by, - update_time, - remark, - create_site, - update_site, - - - #{id}, - #{code}, - #{name}, - #{version}, - #{isPublic}, - #{merchId}, - #{expressType}, - #{tplData}, - #{tplEncData}, - #{tplPdfData}, - #{tplPicUrl}, - #{orderNum}, - #{status}, - #{delFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{createSite}, - #{updateSite}, - - - - - update emis_print_tpl - - code = #{code}, - name = #{name}, - version = #{version}, - is_public = #{isPublic}, - merch_id = #{merchId}, - express_type = #{expressType}, - tpl_data = #{tplData}, - tpl_enc_data = #{tplEncData}, - tpl_pdf_data = #{tplPdfData}, - tpl_pic_url = #{tplPicUrl}, - order_num = #{orderNum}, - status = #{status}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - create_site = #{createSite}, - update_site = #{updateSite}, - - where id = #{id} - - - - delete from emis_print_tpl where id = #{id} - - - - delete from emis_print_tpl where id in - - #{id} - - - \ No newline at end of file diff --git a/emis-oms-biz/src/main/resources/mapper/EmisPrintTplRelMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisPrintTplRelMapper.xml deleted file mode 100644 index f26518e..0000000 --- a/emis-oms-biz/src/main/resources/mapper/EmisPrintTplRelMapper.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - select id, merch_id, tpl_id, tpl_code, tpl_name, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_print_tpl_rel - - - - - - - - insert into emis_print_tpl_rel - - id, - merch_id, - tpl_id, - tpl_code, - tpl_name, - del_flag, - create_by, - create_time, - update_by, - update_time, - remark, - create_site, - update_site, - - - #{id}, - #{merchId}, - #{tplId}, - #{tplCode}, - #{tplName}, - #{delFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{createSite}, - #{updateSite}, - - - - - update emis_print_tpl_rel - - merch_id = #{merchId}, - tpl_id = #{tplId}, - tpl_code = #{tplCode}, - tpl_name = #{tplName}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - create_site = #{createSite}, - update_site = #{updateSite}, - - where id = #{id} - - - - delete from emis_print_tpl_rel where id = #{id} - - - - delete from emis_print_tpl_rel where id in - - #{id} - - - \ No newline at end of file diff --git a/emis-oms-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml deleted file mode 100644 index 6ffc225..0000000 --- a/emis-oms-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - select id, type_code, type_name, type_name_en, is_send_sms, object_type, delay_day, status, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time,create_site,update_site from emis_problem_type - - - - - - - - - - insert into emis_problem_type - - id, - type_code, - type_name, - type_name_en, - is_send_sms, - object_type, - delay_day, - status, - order_num, - remark, - tenant_id, - del_flag, - create_by, - create_time, - update_by, - update_time, - create_site, - update_site, - - - #{id}, - #{typeCode}, - #{typeName}, - #{typeNameEn}, - #{isSendSms}, - #{objectType}, - #{delayDay}, - #{status}, - #{orderNum}, - #{remark}, - #{tenantId}, - #{delFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{createSite}, - #{updateSite}, - - - - - update emis_problem_type - - type_code = #{typeCode}, - type_name = #{typeName}, - type_name_en = #{typeNameEn}, - is_send_sms = #{isSendSms}, - object_type = #{objectType}, - delay_day = #{delayDay}, - status = #{status}, - order_num = #{orderNum}, - remark = #{remark}, - tenant_id = #{tenantId}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - create_site = #{createSite}, - update_site = #{updateSite}, - - where id = #{id} - - - - delete from emis_problem_type where id = #{id} - - - - delete from emis_problem_type where id in - - #{id} - - - \ No newline at end of file