aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-02 09:10:24 +08:00
parent a0f490a9cd
commit 88c57e582c
32 changed files with 350 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
View File

@ -37,7 +37,6 @@ public class EmisWaybill extends BaseEntity
{
private static final long serialVersionUID = 1L;
/* id */
private Long id;
/* 订单号 */
@ -286,6 +285,8 @@ public class EmisWaybill extends BaseEntity
private String takePieceEmployeeCode;
/* 发件网点代码 */
private String sendSiteCode;
/* 发件财务中心代码 */
private String sendCenterCode;
/* 发货时间 - 取本地时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendDate;
@ -336,13 +337,15 @@ public class EmisWaybill extends BaseEntity
private String blAcceptMessage;
/* 是否生成子单 1-是 0-否 */
private String blGenSubbill;
/* 签收人 */
/* 签收状态 字典 */
private String blSign;
/* 签收人(客户) */
private String signMan;
/* 签收人代码 */
/* 签收员代码 */
private String signManCode;
/* 签收站点代码 */
private String signSiteCode;
/* 签收时间 */
/* sign_date */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date signDate;
/* 揽收图片备注 */
@ -362,6 +365,8 @@ public class EmisWaybill extends BaseEntity
private String orderRemark;
/* 数据来源 */
private String dataFrom;
/* 是否敏感物 */
private String blSpecialGoods;

30
emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/SendStatDataInfo.java Normal file
View File

@ -0,0 +1,30 @@
package com.xdadan.erp.emis.domain.stat;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 寄件录单统计
*/
@Data
public class SendStatDataInfo implements Serializable {
private static final long serialVersionUID = 1L;
/* 录单日期 yyyy-mm-dd */
private String sendDay;
private String sendDay;
// 扫描记录数,已签收数量
private Integer scanCount;
private Integer signCount;
private String billCodeStr;
private String scanSiteCode;
private String scanSiteName;
}

27
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisBaseMapper.java Normal file
View File

@ -0,0 +1,27 @@
/**
* @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: <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;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xdadan.erp.common.core.domain.BaseEntity;
import java.util.List;
/**
* @ClassName EmisBaseMapper
* @Description <p> 公共 Mapper 接口 </p>
* @author linfso
* @date 2023-12-14 13:02:47
*/
public interface EmisBaseMapper extends BaseMapper<BaseEntity>
{
}

108
emis-biz/src/main/resources/mapper/EmisBaseMapper.xml Normal file
View File

@ -0,0 +1,108 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xdadan.erp.emis.mapper.EmisBaseMapper">
<resultMap type="EmisCountry" id="EmisCommonResult">
<result property="remark" column="remark" />
<result property="tenantId" column="tenant_id" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="createByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="updateByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="createSiteName" column="create_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<association property="updateSiteName" column="update_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
</resultMap>
<!-- 查询国家名称 -->
<select id="selectCountryNameByCode" parameterType="String" resultType="string">
select a.name from emis_country a where a.code = #{code} limit 1
</select>
<!-- 查询国家名称(多个) -->
<select id="selectGroupCountryNameByCode" parameterType="String" resultType="string">
select GROUP_CONCAT(name) from emis_country where FIND_IN_SET(`code`,#{code})
</select>
<!-- 查询区域名称 -->
<select id="selectRegionNameByCode" parameterType="String" resultType="string">
select a.region_name from emis_region a where a.region_code = #{code} limit 1
</select>
<!-- 查询站点名称 -->
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
select a.site_name from emis_site a where a.site_code = #{code} limit 1
</select>
<!-- 查询多个站点名称 -->
<select id="selectGroupSiteNameByCode" parameterType="String" resultType="string">
select group_concat(a.site_name) as site_name from emis_site a where a.del_flag='0' and FIND_IN_SET(a.site_code, #{code}) limit 1
</select>
<!-- 查询国家区域名称 -->
<select id="selectCountryAreaNameById" parameterType="long" resultType="string">
select a.name from emis_country_area a where a.id = #{id} limit 1
</select>
<!-- 查询线路名称 -->
<select id="selectLineNameByCode" parameterType="String" resultType="string">
select a.line_name from emis_trans_line a where a.line_code = #{code} limit 1
</select>
<!-- 查询多个产品名称 -->
<select id="selectProdNameByCode" parameterType="String" resultType="string">
select group_concat(a.prod_name) from emis_trans_product a where FIND_IN_SET(a.prod_code, #{code}) limit 1
</select>
<!-- 根据产品查线路名称 -->
<select id="selectLineNameByProdCode" parameterType="String" resultType="string">
select a.line_name from emis_trans_line a,emis_trans_product b where a.line_code=b.trans_line_code and b.prod_code = #{code} limit 1
</select>
<!-- 根据产品查线路编号 -->
<select id="selectLineProdByProdCode" parameterType="string" resultType="string">
select trans_line_code from emis_trans_product a where del_flag='0' and prod_code=#{code} limit 1
</select>
<!--目的地名称-->
<select id="selectDestNameByCode" parameterType="String" resultType="string">
select a.dest_name from emis_destination a where a.dest_code = #{code} and a.del_flag='0' limit 1
</select>
<!-- 查询客户名称(code) -->
<select id="selectCustomerNameByCode" parameterType="String" resultType="string">
select a.customer_name from emis_customer_user a where a.customer_code = #{code} limit 1
</select>
<!-- 查询月结客户名称(月结编码) -->
<select id="selectCustNameByCustNo" parameterType="String" resultType="string">
select a.customer_name from emis_customer_user a where a.monthly_pay_code = #{code} limit 1
</select>
<!-- 查询员工(emp_code) -->
<select id="selectEmpNameByCode" parameterType="String" resultType="string">
select a.emp_name from sys_user a where a.emp_code = #{code} limit 1
</select>
<!-- 查询员工(user_id) -->
<select id="selectEmpNameByUserId" parameterType="String" resultType="string">
select a.emp_name from sys_user a where a.user_id = #{id} limit 1
</select>
<!-- 查询品牌名称-->
<select id="selectBrandNameByCode" parameterType="String" resultType="string">
select a.name from emis_brand a where a.code = #{code} limit 1
</select>
</mapper>

21
emis-biz/src/main/resources/mapper/EmisBrandMapper.xml
View File

@ -5,7 +5,7 @@
<mapper namespace="com.xdadan.erp.emis.mapper.EmisBrandMapper">
<resultMap type="EmisBrand" id="EmisBrandResult">
<resultMap type="EmisBrand" id="EmisBrandResult" extends="com.xdadan.erp.emis.mapper.EmisBaseResult">
<result property="id" column="id" />
<result property="code" column="code" />
<result property="name" column="name" />
@ -15,15 +15,16 @@
<result property="status" column="status" />
<result property="brandImg" column="brand_img" />
<result property="orderNum" column="order_num" />
<result property="remark" column="remark" />
<result property="tenantId" column="tenant_id" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<!-- <result property="remark" column="remark" />-->
<!-- <result property="tenantId" column="tenant_id" />-->
<!-- <result property="delFlag" column="del_flag" />-->
<!-- <result property="createBy" column="create_by" />-->
<!-- <result property="createTime" column="create_time" />-->
<!-- <result property="updateBy" column="update_by" />-->
<!-- <result property="updateTime" column="update_time" />-->
<!-- <result property="createSite" column="create_site" />-->
<!-- <result property="updateSite" column="update_site" />-->
</resultMap>
<sql id="selectEmisBrandVo">

1
emis-biz/src/main/resources/mapper/EmisContinentMapper.xml
View File

@ -20,6 +20,7 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectEmisContinentVo">

2
emis-biz/src/main/resources/mapper/EmisCountryAreaMapper.xml
View File

@ -19,6 +19,8 @@
<result property="updateTime" column="update_time" />
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
</resultMap>
<sql id="selectEmisCountryAreaVo">

6
emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
View File

@ -24,6 +24,12 @@
<result property="updateTime" column="update_time" />
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="createByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="updateByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="createSiteName" column="create_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<association property="updateSiteName" column="update_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
</resultMap>
<sql id="selectEmisCountryVo">

22
emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
View File

@ -36,10 +36,16 @@
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="countryName" column="country" select="selectCountryNameByCode"/>
<association property="provinceName" column="province" select="selectRegionNameByCode"/>
<association property="cityName" column="city" select="selectRegionNameByCode"/>
<association property="countyName" column="county" select="selectRegionNameByCode"/>
<association property="createByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="updateByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="createSiteName" column="create_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<association property="updateSiteName" column="update_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<association property="countryName" column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
<association property="provinceName" column="province" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="cityName" column="city" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="countyName" column="county" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
</resultMap>
<sql id="selectEmisCustomerAddressVo">
@ -47,14 +53,6 @@
</sql>
<select id="selectCountryNameByCode" parameterType="String" resultType="string">
select a.name from emis_country a where a.code = #{code} limit 1
</select>
<select id="selectRegionNameByCode" parameterType="String" resultType="string">
select a.region_name from emis_region a where a.region_code = #{code} limit 1
</select>
<select id="selectEmisCustomerAddressList" parameterType="EmisCustomerAddress" resultMap="EmisCustomerAddressResult">
<include refid="selectEmisCustomerAddressVo"/>
<where>

39
emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
View File

@ -61,18 +61,25 @@
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="createByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="updateByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="createSiteName" column="create_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<association property="updateSiteName" column="update_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<result property="custNo" column="monthly_pay_code" />
<result property="custName" column="customer_name" />
<association property="countryName" column="country" select="selectCountryNameByCode"/>
<association property="provinceName" column="province" select="selectRegionNameByCode"/>
<association property="cityName" column="city" select="selectRegionNameByCode"/>
<association property="countyName" column="county" select="selectRegionNameByCode"/>
<association property="ownerSiteName" column="owner_site" select="selectSiteNameByCode"/>
<association property="countryName" column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
<association property="provinceName" column="province" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="cityName" column="city" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="countyName" column="county" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="payeeName" column="payee" select="selectEmpNameByCode"/>
<association property="salesmenName" column="salesmen" select="selectEmpNameByCode"/>
<association property="ownerSiteName" column="owner_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="payeeName" column="payee" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<association property="salesmenName" column="salesmen" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<!-- <association property="opEmpName" column="op_emp_code" select="selectEmpNameByCode"/>-->
<association property="lastOrderTime" column="customer_code" select="selectLastOrderTimeByCustomerCode"/>
@ -80,29 +87,11 @@
</resultMap>
<select id="selectCountryNameByCode" parameterType="String" resultType="string">
select a.name from emis_country a where a.code = #{code} limit 1
</select>
<select id="selectLastOrderTimeByCustomerCode" parameterType="String" resultType="date">
select send_date from emis_waybill where customer_code=#{code} order by send_date desc limit 1;
</select>
<select id="selectRegionNameByCode" parameterType="String" resultType="string">
select a.region_name from emis_region a where a.region_code = #{code} limit 1
</select>
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
select a.site_name from emis_site a where a.site_code = #{code} limit 1
</select>
<select id="selectEmpNameByCode" parameterType="String" resultType="string">
select a.emp_name from sys_user a where a.emp_code = #{code} limit 1
</select>
<sql id="selectEmisCustomerUserVo">
select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, status, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_user
</sql>

34
emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
View File

@ -29,11 +29,17 @@
<result property="updateSite" column="update_site" />
<result property="updateTime" column="update_time" />
<association property="lineName" column="line_code" select="selectLineNameByCode"/>
<association property="countryName" column="country" select="selectCountryNameByCode"/>
<association property="createByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="updateByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="createSiteName" column="create_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<association property="updateSiteName" column="update_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<association property="siteName" column="site_code" select="selectSiteNameByCode"/>
<association property="countryAreaName" column="country_area_id" select="selectCountryAreaNameById"/>
<association property="lineName" column="line_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
<association property="countryName" column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
<association property="siteName" column="site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="countryAreaName" column="country_area_id" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryAreaNameById"/>
</resultMap>
<!-- <association property="provinceName" column="province" select="selectRegionNameByCode"/>-->
@ -45,26 +51,6 @@
select id, dest_code, dest_name, dest_name_en, status, line_code, country, site_code, province, city, county, town, is_hinterland, country_area_id, remark, tenant_id, del_flag, create_by, create_site, create_time, update_by, update_site, update_time from emis_destination
</sql>
<select id="selectCountryNameByCode" parameterType="String" resultType="string">
select a.name from emis_country a where a.code = #{code} limit 1
</select>
<select id="selectLineNameByCode" parameterType="String" resultType="string">
select a.line_name from emis_trans_line a where a.line_code = #{code} limit 1
</select>
<select id="selectRegionNameByCode" parameterType="String" resultType="string">
select a.region_name from emis_region a where a.region_code = #{code} limit 1
</select>
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
select a.site_name from emis_site a where a.site_code = #{code} limit 1
</select>
<select id="selectCountryAreaNameById" parameterType="long" resultType="string">
select a.name from emis_country_area a where a.id = #{id} limit 1
</select>
<select id="selectEmisDestinationList" parameterType="EmisDestination" resultMap="EmisDestinationResult">
<include refid="selectEmisDestinationVo"/>

42
emis-biz/src/main/resources/mapper/EmisElectronicPagApplyMapper.xml
View File

@ -38,38 +38,30 @@
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="createByName" column="create_by" select="selectEmpNameByUserId"/>
<association property="updateByName" column="update_by" select="selectEmpNameByUserId"/>
<association property="createSiteName" column="create_site" select="selectSiteNameByCode"/>
<association property="updateSiteName" column="update_site" select="selectSiteNameByCode"/>
<association property="createByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="updateByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="createSiteName" column="create_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<association property="updateSiteName" column="update_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<association property="applySiteName" column="apply_site_code" select="selectSiteNameByCode"/>
<association property="sendSiteName" column="send_site_code" select="selectSiteNameByCode"/>
<association property="cancelSiteName" column="cancel_site_code" select="selectSiteNameByCode"/>
<association property="userSiteName" column="user_site_code" select="selectSiteNameByCode"/>
<association property="createByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId"/>
<association property="updateByName" column="update_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId"/>
<association property="createSiteName" column="create_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="updateSiteName" column="update_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="applyManName" column="apply_man_code" select="selectEmpNameByCode"/>
<association property="sendManName" column="send_man_code" select="selectEmpNameByCode"/>
<association property="cancelManName" column="cancel_man_code" select="selectEmpNameByCode"/>
<association property="applySiteName" column="apply_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="sendSiteName" column="send_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="cancelSiteName" column="cancel_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="userSiteName" column="user_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="applyManName" column="apply_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<association property="sendManName" column="send_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<association property="cancelManName" column="cancel_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
</resultMap>
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
select a.site_name from emis_site a where a.site_code = #{code} limit 1
</select>
<select id="selectEmpNameByUserId" parameterType="String" resultType="string">
select a.emp_name from sys_user a where a.user_id = #{id} limit 1
</select>
<select id="selectEmpNameByCode" parameterType="String" resultType="string">
select a.emp_name from sys_user a where a.emp_code = #{code} limit 1
</select>
<sql id="selectEmisElectronicPagApplyVo">
select id, prefix, apply_seq, apply_date, provide_type, material_code, material_name, apply_man_code, apply_site_code, apply_count, unit_money, sum_money, bl_send, send_date, send_man_code, send_site_code, send_center_man_code, send_center_site_code, bl_cancel, cancel_man_code, cancel_date, cancel_site_code, user_site_code, provide_flag, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_electronic_pag_apply
</sql>

6
emis-biz/src/main/resources/mapper/EmisElectronicPagMapper.xml
View File

@ -26,6 +26,12 @@
<result property="remark" column="remark" />
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="createByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="updateByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="createSiteName" column="create_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<association property="updateSiteName" column="update_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
</resultMap>
<sql id="selectEmisElectronicPagVo">

6
emis-biz/src/main/resources/mapper/EmisElectronicSitePagMapper.xml
View File

@ -31,6 +31,12 @@
<result property="remark" column="remark" />
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="createByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="updateByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="createSiteName" column="create_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<association property="updateSiteName" column="update_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
</resultMap>
<sql id="selectEmisElectronicSitePagVo">

6
emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml
View File

@ -69,6 +69,12 @@
<result property="updateTime" column="update_time" />
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="createByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="updateByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="createSiteName" column="create_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<association property="updateSiteName" column="update_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
</resultMap>
<sql id="selectEmisGoodsVo">

6
emis-biz/src/main/resources/mapper/EmisMaterialMapper.xml
View File

@ -31,6 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" />
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="createByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="updateByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="createSiteName" column="create_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<association property="updateSiteName" column="update_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
</resultMap>
<sql id="selectEmisMaterialVo">

38
emis-biz/src/main/resources/mapper/EmisMonthpayAccountMapper.xml
View File

@ -56,42 +56,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="createByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="updateByName" column="create_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByUserId" fetchType="lazy"/>
<association property="createSiteName" column="create_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<association property="updateSiteName" column="update_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" fetchType="lazy"/>
<association property="countryName" column="country" select="selectCountryNameByCode"/>
<association property="provinceName" column="province" select="selectRegionNameByCode"/>
<association property="cityName" column="city" select="selectRegionNameByCode"/>
<association property="countyName" column="county" select="selectRegionNameByCode"/>
<association property="payeeName" column="payee" select="selectEmpNameByCode"/>
<association property="salesmenName" column="salesmen" select="selectEmpNameByCode"/>
<association property="marketManName" column="market_man" select="selectEmpNameByCode"/>
<association property="ownerSiteName" column="owner_site" select="selectSiteNameByCode"/>
<association property="countryName" column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
<association property="provinceName" column="province" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="cityName" column="city" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="countyName" column="county" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="payeeName" column="payee" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<association property="salesmenName" column="salesmen" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<association property="ownerSiteName" column="owner_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
</resultMap>
<sql id="selectEmisMonthpayAccountVo">
select id, cust_no, cust_name, cust_name_en, customer_code, user_type, company, lic_no, biz_info, cust_level, country, province, city, county, address, sex, owner_site, contact, phone, email, status, payee, salesmen, market_man, invitation_info, contract_type, order_num, contract_content, contract_change_content, contract_startdate, contract_enddate, contract_signdate, contract_senddate, contract_recievedate, express_name, express_billcode, bank, account_no, invoice_address, financial_contact, sender, send_address, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_monthpay_account
</sql>
<select id="selectCountryNameByCode" parameterType="String" resultType="string">
select a.name from emis_country a where a.code = #{code} limit 1
</select>
<select id="selectRegionNameByCode" parameterType="String" resultType="string">
select a.region_name from emis_region a where a.region_code = #{code} limit 1
</select>
<select id="selectEmpNameByCode" parameterType="String" resultType="string">
select a.emp_name from sys_user a where a.emp_code = #{code} limit 1
</select>
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
select a.site_name from emis_site a where a.site_code = #{code} limit 1
</select>
<select id="selectEmisMonthpayAccountList" parameterType="EmisMonthpayAccount" resultMap="EmisMonthpayAccountResult">
<include refid="selectEmisMonthpayAccountVo"/>

5
emis-biz/src/main/resources/mapper/EmisNotCalcAgingMapper.xml
View File

@ -19,7 +19,7 @@
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="countryName" column="country" select="selectGroupCountryNameByCode"/>
<association property="countryName" column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectGroupCountryNameByCode"/>
</resultMap>
@ -27,9 +27,6 @@
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
</sql>
<select id="selectGroupCountryNameByCode" parameterType="String" resultType="string">
select GROUP_CONCAT(name) from emis_country where FIND_IN_SET(`code`,#{code})
</select>
<select id="getNotCalcAgingDays" resultType="integer">
select count(distinct no_calc_day) from emis_not_calc_aging where ( FIND_IN_SET('-1',country) or FIND_IN_SET(#{recieveCountry},country) or FIND_IN_SET(#{sendCountry},country) ) and no_calc_day <![CDATA[ >= ]]> #{startDate} and no_calc_day <![CDATA[ <= ]]> #{endDate}

5
emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml
View File

@ -25,7 +25,7 @@
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="useSite" column="use_site_code" select="selectSiteNameByCode"/>
<association property="useSite" column="use_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
</resultMap>
@ -33,9 +33,6 @@
select area_id, area_name, use_site, use_site_code, area_site, area_site_code, area_site_id, fee_type, area_type, sync, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_disp_area
</sql>
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
select a.site_name from emis_site a where a.site_code = #{code} limit 1
</select>
<select id="selectEmisQuoteDispAreaList" parameterType="EmisQuoteDispArea" resultMap="EmisQuoteDispAreaResult">
<include refid="selectEmisQuoteDispAreaVo"/>

7
emis-biz/src/main/resources/mapper/EmisQuoteExpressionMapper.xml
View File

@ -60,6 +60,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by quote_sequence asc
</select>
<select id="selectExprListByQuoteId" parameterType="integer" resultMap="EmisQuoteExpressionResult">
select id, quote_id, quote_sequence, use_site_code, use_site, start_weight, end_weight, initial_weight, additional_weight, condition_expression, calculate_expression, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_quote_expression a
where a.quote_id = #{quoteId} and a.del_flag!='1'
</select>
<select id="selectEmisQuoteExpressionById" parameterType="Long" resultMap="EmisQuoteExpressionResult">
select id, quote_id, quote_sequence, use_site_code, use_site, start_weight, end_weight, initial_weight, additional_weight, condition_expression, calculate_expression, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_quote_expression a

56
emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
View File

@ -48,59 +48,15 @@
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="prodName" column="prod_code" select="selectProdNameByCode"/>
<association property="transLine" column="trans_line_code" select="selectLineNameByCode"/>
<association property="useSiteName" column="use_site_code" select="selectSiteNameByCode"/>
<association property="customerName" column="customer_code" select="selectCustomerNameByCode"/>
<association property="custName" column="cust_no" select="selectCustNameByCustNo"/>
<association property="exprList" column="quote_id" select="selectExprListByQuoteId"/>
<association property="prodName" column="prod_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProdNameByCode"/>
<association property="transLine" column="trans_line_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
<association property="useSiteName" column="use_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="customerName" column="customer_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCustomerNameByCode"/>
<association property="custName" column="cust_no" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCustNameByCustNo"/>
<association property="exprList" column="quote_id" select="com.xdadan.erp.emis.mapper.EmisQuoteExpressionMapper.selectExprListByQuoteId"/>
</resultMap>
<resultMap type="EmisQuoteExpression" id="EmisQuoteExpressionResult">
<result property="id" column="id" />
<result property="quoteId" column="quote_id" />
<result property="quoteSequence" column="quote_sequence" />
<result property="useSiteCode" column="use_site_code" />
<result property="useSite" column="use_site" />
<result property="startWeight" column="start_weight" />
<result property="endWeight" column="end_weight" />
<result property="initialWeight" column="initial_weight" />
<result property="additionalWeight" column="additional_weight" />
<result property="conditionExpression" column="condition_expression" />
<result property="calculateExpression" column="calculate_expression" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="tenantId" column="tenant_id" />
</resultMap>
<select id="selectProdNameByCode" parameterType="String" resultType="string">
select group_concat(a.prod_name) from emis_trans_product a where FIND_IN_SET(a.prod_code, #{code}) limit 1
</select>
<select id="selectLineNameByCode" parameterType="String" resultType="string">
select a.line_name from emis_trans_line a where a.line_code = #{code} limit 1
</select>
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
select a.site_name from emis_site a where a.site_code = #{code} limit 1
</select>
<select id="selectCustomerNameByCode" parameterType="String" resultType="string">
select a.customer_name from emis_customer_user a where a.customer_code = #{code} limit 1
</select>
<select id="selectCustNameByCustNo" parameterType="String" resultType="string">
select a.customer_name from emis_customer_user a where a.monthly_pay_code = #{code} limit 1
</select>
<select id="selectExprListByQuoteId" parameterType="integer" resultMap="EmisQuoteExpressionResult">
select id, quote_id, quote_sequence, start_weight, end_weight, initial_weight, additional_weight, condition_expression, calculate_expression, status, remark
from emis_quote_expression a
where a.quote_id = #{quoteId} and a.del_flag!='1'
</select>
<sql id="selectEmisQuotePriceVo">
select quote_id, quote_code, quote_name, quote_type, customer_code, cust_no, use_site_code, trans_line_code, fee_type, prod_code, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_name, disp_area_site, disp_area_site_code, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_code, send_area_site_id, carries_number, discards_number, least_price, price_type, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_price

5
emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml
View File

@ -26,7 +26,7 @@
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="useSite" column="use_site_code" select="selectSiteNameByCode"/>
<association property="useSite" column="use_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
</resultMap>
@ -34,9 +34,6 @@
select area_id, area_name, use_site, use_site_code, area_site, area_site_code, area_site_id, fee_type, area_type, sync, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_send_area
</sql>
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
select a.site_name from emis_site a where a.site_code = #{code} limit 1
</select>
<select id="selectEmisQuoteSendAreaList" parameterType="EmisQuoteSendArea" resultMap="EmisQuoteSendAreaResult">
<include refid="selectEmisQuoteSendAreaVo"/>

5
emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
View File

@ -29,7 +29,7 @@
<result property="updateSite" column="update_site" />
<!-- <result property="countryName" column="country_name" />-->
<association property="countryName" column="country_code" select="selectCountryNameByCode"/>
<association property="countryName" column="country_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
</resultMap>
@ -37,9 +37,6 @@
select id, region_code, region_name, region_name_en, region_type, short_name, parent_code, area_id, area_name, country_code, country_name, zip_code, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_region
</sql>
<select id="selectCountryNameByCode" parameterType="String" resultType="string">
select a.name from emis_country a where a.code = #{code} limit 1
</select>
<select id="selectEmisRegionList" parameterType="EmisRegion" resultMap="EmisRegionResult">
<include refid="selectEmisRegionVo"/>

37
emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
View File

@ -132,14 +132,14 @@
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="countryName" column="country_code" select="selectCountryNameByCode"/>
<association property="provinceName" column="province" select="selectRegionNameByCode"/>
<association property="cityName" column="city" select="selectRegionNameByCode"/>
<association property="countyName" column="county" select="selectRegionNameByCode"/>
<association property="townName" column="town" select="selectRegionNameByCode"/>
<association property="parentSiteName" column="parent_site_code" select="selectSiteNameByCode"/>
<association property="superiorFinanceCenterName" column="superior_finance_center_code" select="selectSiteNameByCode"/>
<association property="logoTypeName" column="logo_type" select="selectBrandNameByCode"/>
<association property="countryName" column="country_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
<association property="provinceName" column="province" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="cityName" column="city" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="countyName" column="county" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="townName" column="town" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="parentSiteName" column="parent_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="superiorFinanceCenterName" column="superior_finance_center_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="logoTypeName" column="logo_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectBrandNameByCode"/>
</resultMap>
@ -147,27 +147,6 @@
select id, site_code, site_name, site_name_en, parent_site_code, default_currency, cut_off_time, superior_finance_center_code, site_type, scope_type, default_destination_name_code, default_send_place, country_code, province, city, county, town, area_code, area_name, range_name, phone, principal, manager, manager_phone, sale_phone, exigence_phone, fax, site_levels, site_desc, dispatch_range, not_dispatch_range, public_remark, private_remark, order_num, financial_account, tb_ser_name, tb_ser_tel, tb_ser_ww, car_start_time, car_end_time, bl_web, join_time, maps_coordinate, specservice_range, qq, email, service_quality, sales_quality, levels, warehouse_name, site_limite, jy_mobile, jy_pwd, bl_not_input, stop_date, bl_allow_agent_money, bl_allow_topayment, goods_payment_limited, topayment_limited, bl_rec, bl_disp, bl_come, bl_open_taobao, bl_arbitration_department, bl_allow_agent_sign, bl_message, bl_provide, bl_projectclient, bl_vip_site, bl_dispatch_zt, bl_billto_account, account_code, address, disp_delivery_mode, trans_type_id, trans_type_name, org_id, org_name, data_from, site_area, bl_allow_disp_agent_money, disp_goods_payment_limited, disp_delivery_site, disp_delivery_site_code, vendor_name, credit_code, bl_cargo_service, bl_handling_service, pickup_center_site_code, bl_disp_good, bl_push_jd, push_date, reason, site_pos, distribute_code, bl_push_site, logo_type, size_code2, size_code3, audit_status, audit_date, audit_man_code, audit_site_code, bl_class, bl_material, soon_piece_type, province_area, second_area, second_area_code, province_area_code, bl_disp_good_name, bl_not_rec, bl_not_disp, bl_not_cash_out, status, increment_service, bl_warehouse_in, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_site
</sql>
<select id="selectCountryNameByCode" parameterType="String" resultType="string">
select a.name from emis_country a where a.code = #{code} limit 1
</select>
<select id="selectRegionNameByCode" parameterType="String" resultType="string">
select a.region_name from emis_region a where a.region_code = #{code} limit 1
</select>
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
select a.site_name from emis_site a where a.site_code = #{code} limit 1
</select>
<select id="selectBrandNameByCode" parameterType="String" resultType="string">
select a.name from emis_brand a where a.code = #{code} limit 1
</select>
<select id="selectEmpNameByCode" parameterType="String" resultType="string">
select a.emp_name from sys_user a where a.emp_code = #{code} limit 1
</select>
<select id="selectEmisSiteList" parameterType="EmisSite" resultMap="EmisSiteResult">
<include refid="selectEmisSiteVo"/>

16
emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
View File

@ -22,23 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<association property="lineCode" column="prod_code" select="selectLineProdByProdCode"/>
<association property="lineName" column="prod_code" select="selectLineNameByProdCode"/>
<association property="prodName" column="prod_code" select="selectProdNameByCode"/>
<association property="lineCode" column="prod_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineProdByProdCode"/>
<association property="lineName" column="prod_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByProdCode"/>
<association property="prodName" column="prod_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProdNameByCode"/>
</resultMap>
<select id="selectLineNameByProdCode" parameterType="String" resultType="string">
select a.line_name from emis_trans_line a,emis_trans_product b where a.line_code=b.trans_line_code and b.prod_code = #{code} limit 1
</select>
<select id="selectProdNameByCode" parameterType="String" resultType="string">
select prod_name from emis_trans_product where prod_code=#{code} limit 1
</select>
<select id="selectLineProdByProdCode" parameterType="string" resultType="string">
select trans_line_code from emis_trans_product a where del_flag='0' and prod_code=#{code} limit 1
</select>
<sql id="selectEmisSpecialCalcWeightVo">
select id, prod_code, prod_name, status, carry_type, begin_weight, end_weight, begin_date, end_date, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_special_calc_weight

10
emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
View File

@ -87,16 +87,13 @@
<association property="scanSiteName"
column="scan_site_code"
select="selectSiteNameByCode"
select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"
fetchType="lazy"
/>
</resultMap>
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
select a.site_name from emis_site a where a.site_code = #{code} limit 1
</select>
<!-- 根据获取签收数量统计 -->
<select id="selectSignCountByBillCodeStr" parameterType="string" resultType="int">
@ -156,8 +153,6 @@
</select>
<!-- 获取物流轨迹 -->
<select id="selectTraceListByBillCode" parameterType="string" resultMap="EmisTmsScanRecordResult">
<include refid="selectEmisTmsScanRecordVo"/>
@ -165,8 +160,7 @@
order by create_time desc;
</select>
<!-- 获取最后一条记录 -->
<!-- 获取订单最后一条扫描记录 -->
<select id="selectLastRecordByBillCode" parameterType="string" resultMap="EmisTmsScanRecordResult">
select id, bill_code, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
from emis_tms_scan_record a

8
emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
View File

@ -23,15 +23,11 @@
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="startSiteName" column="start_site" select="selectSiteNameByCode"/>
<association property="destSiteName" column="dest_site" select="selectSiteNameByCode"/>
<association property="startSiteName" column="start_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectGroupSiteNameByCode"/>
<association property="destSiteName" column="dest_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectGroupSiteNameByCode"/>
</resultMap>
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
select group_concat(a.site_name) as site_name from emis_site a where a.del_flag='0' and FIND_IN_SET(a.site_code, #{code}) limit 1
</select>
<select id="selectEmisTmsTransPlanDtlList_tmp" parameterType="EmisTmsTransPlanDtl" resultMap="EmisTmsTransPlanDtlResult">
select 1 as id, 1 as plan_id, a.site_code as start_site , a.site_code as dest_site

13
emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
View File

@ -20,11 +20,11 @@
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="productTypeName" column="product_type" select="selectProdNameByCode"/>
<association property="transLineTypeName" column="trans_line_type" select="selectLineNameByCode"/>
<association property="productTypeName" column="product_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProdNameByCode"/>
<association property="transLineTypeName" column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
<!-- 个性化查询 -->
<association property="totalEstCostDay" column="id" select="selectTotalEstCostDayByPlanId"/>
<association property="fromCountryName" column="trans_line_type" select="selectFromCountryNameByLineCode"/>
<association property="countryName" column="trans_line_type" select="selectCountryNameByLineCode"/>
@ -43,13 +43,6 @@
select sum(a.est_cost_day) as est_cost_day from emis_tms_trans_plan_dtl a where a.del_flag='0' and a.plan_id = #{id} limit 1
</select>
<select id="selectProdNameByCode" parameterType="String" resultType="string">
select group_concat(a.prod_name) from emis_trans_product a where a.del_flag='0' and FIND_IN_SET(a.prod_code, #{code}) limit 1
</select>
<select id="selectLineNameByCode" parameterType="String" resultType="string">
select a.line_name from emis_trans_line a where a.del_flag='0' and a.line_code = #{code} limit 1
</select>
<sql id="selectEmisTmsTransPlanVo">

14
emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml
View File

@ -33,22 +33,14 @@
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="fromCountryName" column="from_country" select="selectCountryNameByCode"/>
<association property="countryName" column="country" select="selectCountryNameByCode"/>
<association property="logoTypeName" column="logo_type" select="selectBrandNameByCode"/>
<association property="fromCountryName" column="from_country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
<association property="countryName" column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
<association property="logoTypeName" column="logo_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectBrandNameByCode"/>
</resultMap>
<select id="selectCountryNameByCode" parameterType="String" resultType="string">
select a.name from emis_country a where a.code = #{code}
</select>
<select id="selectBrandNameByCode" parameterType="String" resultType="string">
select a.name from emis_brand a where a.code = #{code}
</select>
<sql id="selectEmisTransLineVo">
select id, line_code, line_name, line_name_en, meter_rate, status, site_audit_man, site_audit_man_code, market_man, market_man_code, operate_man, operate_man_code, from_country, country, apply_scope, logo_type, trans_type, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_trans_line
</sql>

14
emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
View File

@ -30,21 +30,11 @@
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="transLine" column="trans_line_code" select="selectLineNameByCode"/>
<association property="countryName" column="country" select="selectCountryNameByCode"/>
<association property="transLine" column="trans_line_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
<association property="countryName" column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
</resultMap>
<select id="selectCountryNameByCode" parameterType="String" resultType="string">
select a.name from emis_country a where a.code = #{code} limit 1
</select>
<select id="selectLineNameByCode" parameterType="String" resultType="string">
select a.line_name from emis_trans_line a where a.line_code = #{code} limit 1
</select>
<sql id="selectEmisTransProductVo">
select id, prod_code, prod_name, prod_name_en, status, country, trans_line_code, trans_line, carry_type, trans_type, aging_desc, aging_flag, min_aging, max_aging, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_trans_product
</sql>

90
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -126,6 +126,7 @@
<result property="registerManCode" column="register_man_code" />
<result property="takePieceEmployeeCode" column="take_piece_employee_code" />
<result property="sendSiteCode" column="send_site_code" />
<result property="sendCenterCode" column="send_center_code" />
<result property="sendDate" column="send_date" />
<result property="dispatchManCode" column="dispatch_man_code" />
<result property="dispatchDate" column="dispatch_date" />
@ -150,6 +151,7 @@
<result property="blMessage" column="bl_message" />
<result property="blAcceptMessage" column="bl_accept_message" />
<result property="blGenSubbill" column="bl_gen_subbill" />
<result property="blSign" column="bl_sign" />
<result property="signMan" column="sign_man" />
<result property="signManCode" column="sign_man_code" />
<result property="signSiteCode" column="sign_site_code" />
@ -162,6 +164,7 @@
<result property="paymentRemark" column="payment_remark" />
<result property="orderRemark" column="order_remark" />
<result property="dataFrom" column="data_from" />
<result property="blSpecialGoods" column="bl_special_goods" />
<result property="remark" column="remark" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
@ -171,84 +174,43 @@
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="receiveCountryName" column="receive_country" select="selectCountryNameByCode"/>
<association property="receiveProvinceName" column="receive_province" select="selectRegionNameByCode"/>
<association property="receiveCityName" column="receive_city" select="selectRegionNameByCode"/>
<association property="receiveCountyName" column="receive_county" select="selectRegionNameByCode"/>
<association property="receiveCountryName" column="receive_country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
<association property="receiveProvinceName" column="receive_province" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="receiveCityName" column="receive_city" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="receiveCountyName" column="receive_county" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="sendCountryName" column="send_country" select="selectCountryNameByCode"/>
<association property="sendProvinceName" column="send_province" select="selectRegionNameByCode"/>
<association property="sendCityName" column="send_city" select="selectRegionNameByCode"/>
<association property="sendCountyName" column="send_county" select="selectRegionNameByCode"/>
<association property="sendCountryName" column="send_country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
<association property="sendProvinceName" column="send_province" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="sendCityName" column="send_city" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="sendCountyName" column="send_county" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="productTypeName" column="product_type" select="selectProdNameByCode"/>
<association property="transLineTypeName" column="trans_line_type" select="selectLineNameByCode"/>
<association property="productTypeName" column="product_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProdNameByCode"/>
<association property="transLineTypeName" column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
<association property="sendSiteName" column="send_site_code" select="selectSiteNameByCode"/>
<association property="sendSiteName" column="send_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="dispatchUnderlingSiteName" column="dispatch_underling_site_code" select="selectSiteNameByCode"/>
<association property="destinationName" column="destination_code" select="selectDestNameByCode"/>
<association property="dispatchUnderlingSiteName" column="dispatch_underling_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="destinationName" column="destination_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectDestNameByCode"/>
<association property="dispatchSiteName" column="dispatch_site_code" select="selectSiteNameByCode"/>
<association property="dispatchManName" column="dispatch_man_code" select="selectEmpNameByCode"/>
<association property="dispatchSiteName" column="dispatch_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="dispatchManName" column="dispatch_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<association property="printSiteName" column="print_site" select="selectSiteNameByCode"/>
<association property="printManName" column="print_man_code" select="selectEmpNameByCode"/>
<association property="printSiteName" column="print_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="printManName" column="print_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<association property="takePieceEmployeeName" column="take_piece_employee_code" select="selectEmpNameByCode"/>
<association property="operateEmployeeName" column="operate_employee_code" select="selectEmpNameByCode"/>
<association property="takePieceEmployeeName" column="take_piece_employee_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<association property="operateEmployeeName" column="operate_employee_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<association property="registerSiteName" column="register_site_code" select="selectSiteNameByCode"/>
<association property="registerManName" column="register_man_code" select="selectEmpNameByCode"/>
<association property="registerSiteName" column="register_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="registerManName" column="register_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
</resultMap>
<resultMap id="EmisWaybillResult" extends="BaseEmisWaybillResult" type="EmisWaybill">
<association property="lastScanRecord" column="bill_code" select="selectLastRecordByBillCode"/>
</resultMap>
<!-- 获取订单最后一条扫描记录 -->
<select id="selectLastRecordByBillCode" parameterType="string" resultMap="com.xdadan.erp.emis.mapper.EmisTmsScanRecordMapper.BaseEmisTmsScanRecordResult">
select id, bill_code, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
from emis_tms_scan_record a
where a.bill_code = #{billCode} limit 1
</select>
<select id="selectDestNameByCode" parameterType="String" resultType="string">
select a.dest_name from emis_destination a where a.dest_code = #{code} and a.del_flag='0' limit 1
</select>
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
select a.site_name from emis_site a where a.site_code = #{code} and a.del_flag='0' limit 1
</select>
<select id="selectCountryNameByCode" parameterType="String" resultType="string">
select a.name from emis_country a where a.code = #{code} and a.del_flag='0' limit 1
</select>
<select id="selectRegionNameByCode" parameterType="String" resultType="string">
select a.region_name from emis_region a where a.region_code = #{code} and a.del_flag='0' limit 1
</select>
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
select a.site_name from emis_site a where a.site_code = #{code} and a.del_flag='0' limit 1
</select>
<select id="selectEmpNameByCode" parameterType="String" resultType="string">
select a.emp_name from sys_user a where a.emp_code = #{code} and a.del_flag='0' limit 1
</select>
<select id="selectProdNameByCode" parameterType="String" resultType="string">
select a.prod_name from emis_trans_product a where a.prod_code = #{code} and a.del_flag='0' limit 1
</select>
<select id="selectLineNameByCode" parameterType="String" resultType="string">
select a.line_name from emis_trans_line a where a.line_code = #{code} and a.del_flag='0' limit 1
</select>
<association property="lastScanRecord" column="bill_code" select="com.xdadan.erp.emis.mapper.EmisTmsScanRecordMapper.selectLastRecordByBillCode"/>
</resultMap>
<sql id="selectEmisWaybillVo">

2
emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
View File

@ -26,6 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="remark" column="remark" />
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
</resultMap>
<sql id="selectEmisWaybillTransferVo">