md
This commit is contained in:
parent
758a445d43
commit
1ace91a1c4
@ -16,11 +16,12 @@ import java.util.List;
|
|||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
|
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
|
||||||
import com.xdadan.erp.emis.domain.EmisBrand;
|
import com.xdadan.erp.common.core.domain.entity.SysUser;
|
||||||
import com.xdadan.erp.emis.domain.EmisWaybill;
|
import com.xdadan.erp.emis.domain.*;
|
||||||
import com.xdadan.erp.emis.domain.exception.EmisBizError;
|
import com.xdadan.erp.emis.domain.exception.EmisBizError;
|
||||||
import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
|
import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
|
||||||
import com.xdadan.erp.emis.domain.vo.scan.ScanResult;
|
import com.xdadan.erp.emis.domain.vo.scan.ScanResult;
|
||||||
|
import com.xdadan.erp.emis.service.IEmisTmsTransPlanDtlService;
|
||||||
import com.xdadan.erp.emis.service.IEmisWaybillService;
|
import com.xdadan.erp.emis.service.IEmisWaybillService;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@ -42,7 +43,6 @@ import com.xdadan.erp.common.core.page.TableDataInfo;
|
|||||||
import com.xdadan.erp.common.enums.BusinessType;
|
import com.xdadan.erp.common.enums.BusinessType;
|
||||||
import com.xdadan.erp.common.utils.poi.ExcelUtil;
|
import com.xdadan.erp.common.utils.poi.ExcelUtil;
|
||||||
|
|
||||||
import com.xdadan.erp.emis.domain.EmisTmsScanRecord;
|
|
||||||
import com.xdadan.erp.emis.service.IEmisTmsScanRecordService;
|
import com.xdadan.erp.emis.service.IEmisTmsScanRecordService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -61,6 +61,9 @@ public class EmisTmsScanRecordController extends BaseController
|
|||||||
@Autowired
|
@Autowired
|
||||||
private IEmisWaybillService emisWaybillService;
|
private IEmisWaybillService emisWaybillService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IEmisTmsTransPlanDtlService emisTmsTransPlanDtlService;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取可扫描的运单
|
* 获取可扫描的运单
|
||||||
@ -94,10 +97,20 @@ public class EmisTmsScanRecordController extends BaseController
|
|||||||
return AjaxResult.error("扫描异常,联系客服");
|
return AjaxResult.error("扫描异常,联系客服");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/getNextStationList")
|
||||||
|
@JacksonFilter(include= {"startSiteName","destSiteName"},value= EmisTmsTransPlanDtl.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
|
||||||
|
public TableDataInfo getNextStationList()
|
||||||
|
{
|
||||||
|
startPage();
|
||||||
|
EmisTmsTransPlanDtl queryObj = new EmisTmsTransPlanDtl();
|
||||||
|
queryObj.setStartSite(getLoginUser().getUser().getOwnerSiteCode());
|
||||||
|
List<EmisTmsTransPlanDtl> list = emisTmsTransPlanDtlService.selectEmisTmsTransPlanDtlList(queryObj);
|
||||||
|
return getDataTable(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取可扫描的运单
|
* 获取可扫描的运单
|
||||||
|
|||||||
@ -13,6 +13,9 @@ package com.xdadan.erp.web.emis;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
|
||||||
|
import com.xdadan.erp.common.core.domain.entity.SysUser;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
@ -60,6 +63,9 @@ public class EmisTmsTransPlanController extends BaseController
|
|||||||
return getDataTable(list);
|
return getDataTable(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 导出TMS承运线路计划列表
|
* 导出TMS承运线路计划列表
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -143,9 +143,5 @@ public class EmisGoods extends BaseEntity
|
|||||||
private String portCode;
|
private String portCode;
|
||||||
/* 排序 */
|
/* 排序 */
|
||||||
private Integer orderNum;
|
private Integer orderNum;
|
||||||
/* 创建站点 */
|
|
||||||
private String createSite;
|
|
||||||
/* 更新站点 */
|
|
||||||
private String updateSite;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
* @Project: emis
|
* @Project: emis
|
||||||
* @Title: EmisTmsTransPlan.java
|
* @Title: EmisTmsTransPlan.java
|
||||||
* @author linfso
|
* @author linfso
|
||||||
* @date 2024-03-01 08:55:00
|
* @date 2024-05-08 00:59:10
|
||||||
* @Copyright: ShangHai Duta 2022 All rights reserved.
|
* @Copyright: ShangHai Duta 2022 All rights reserved.
|
||||||
* @version v1.0
|
* @version v1.0
|
||||||
* @Description: <p> TMS承运线路计划 实体类 </p>
|
* @Description: <p> TMS承运线路计划 实体类 </p>
|
||||||
@ -26,7 +26,7 @@ import lombok.Data;
|
|||||||
* @ClassName EmisTmsTransPlan
|
* @ClassName EmisTmsTransPlan
|
||||||
* @Description TMS承运线路计划
|
* @Description TMS承运线路计划
|
||||||
* @author linfso
|
* @author linfso
|
||||||
* @date 2024-03-01 08:55:00
|
* @date 2024-05-08 00:59:10
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class EmisTmsTransPlan extends BaseEntity
|
public class EmisTmsTransPlan extends BaseEntity
|
||||||
@ -45,9 +45,5 @@ public class EmisTmsTransPlan extends BaseEntity
|
|||||||
private String productType;
|
private String productType;
|
||||||
/* 状态 1-启用 0-不启用 */
|
/* 状态 1-启用 0-不启用 */
|
||||||
private String status;
|
private String status;
|
||||||
/* 创建站点代码 */
|
|
||||||
private String createSiteCode;
|
|
||||||
/* 修改站点代码 */
|
|
||||||
private String modifySiteCode;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
* @Project: emis
|
* @Project: emis
|
||||||
* @Title: EmisTmsTransPlanDtl.java
|
* @Title: EmisTmsTransPlanDtl.java
|
||||||
* @author linfso
|
* @author linfso
|
||||||
* @date 2024-03-01 08:55:00
|
* @date 2024-05-08 00:43:59
|
||||||
* @Copyright: ShangHai Duta 2022 All rights reserved.
|
* @Copyright: ShangHai Duta 2022 All rights reserved.
|
||||||
* @version v1.0
|
* @version v1.0
|
||||||
* @Description: <p> TMS承运线路计划明细 实体类 </p>
|
* @Description: <p> TMS承运线路计划明细 实体类 </p>
|
||||||
@ -26,7 +26,7 @@ import lombok.Data;
|
|||||||
* @ClassName EmisTmsTransPlanDtl
|
* @ClassName EmisTmsTransPlanDtl
|
||||||
* @Description TMS承运线路计划明细
|
* @Description TMS承运线路计划明细
|
||||||
* @author linfso
|
* @author linfso
|
||||||
* @date 2024-03-01 08:55:00
|
* @date 2024-05-08 00:43:59
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class EmisTmsTransPlanDtl extends BaseEntity
|
public class EmisTmsTransPlanDtl extends BaseEntity
|
||||||
@ -38,9 +38,9 @@ public class EmisTmsTransPlanDtl extends BaseEntity
|
|||||||
/* 计划id */
|
/* 计划id */
|
||||||
private Long planId;
|
private Long planId;
|
||||||
/* 起始网点 */
|
/* 起始网点 */
|
||||||
private String startSiteCode;
|
private String startSite;
|
||||||
/* 目的网点 */
|
/* 目的网点 */
|
||||||
private String destSiteCode;
|
private String destSite;
|
||||||
/* 运输方式 陆运,空运海运 */
|
/* 运输方式 陆运,空运海运 */
|
||||||
private String transType;
|
private String transType;
|
||||||
/* 预估运输时间 day */
|
/* 预估运输时间 day */
|
||||||
@ -49,9 +49,9 @@ public class EmisTmsTransPlanDtl extends BaseEntity
|
|||||||
private Integer orderNum;
|
private Integer orderNum;
|
||||||
/* 状态 1-启用 0-不启用 */
|
/* 状态 1-启用 0-不启用 */
|
||||||
private String status;
|
private String status;
|
||||||
/* 创建站点代码 */
|
|
||||||
private String createSiteCode;
|
// 非数据库字段
|
||||||
/* 修改站点代码 */
|
private String startSiteName;
|
||||||
private String modifySiteCode;
|
private String destSiteName;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -46,9 +46,6 @@ public class EmisWarehouseIn extends BaseEntity
|
|||||||
private Date superiorDate;
|
private Date superiorDate;
|
||||||
/* 序号 */
|
/* 序号 */
|
||||||
private String serialNumber;
|
private String serialNumber;
|
||||||
/* 创建站点 */
|
|
||||||
private String createSite;
|
|
||||||
/* 更新站点 */
|
|
||||||
private String updateSite;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -343,10 +343,7 @@ public class EmisWaybill extends BaseEntity
|
|||||||
private String billPicDispatchRmk;
|
private String billPicDispatchRmk;
|
||||||
/* 时区偏差 */
|
/* 时区偏差 */
|
||||||
private String timezoneOffset;
|
private String timezoneOffset;
|
||||||
/* 创建网点 */
|
|
||||||
private String createSite;
|
|
||||||
/* 更新网点 */
|
|
||||||
private String updateSite;
|
|
||||||
|
|
||||||
private List<EmisWaybillCargo> cargoList;
|
private List<EmisWaybillCargo> cargoList;
|
||||||
private List<EmisWaybillFeeitem> feeitemList;
|
private List<EmisWaybillFeeitem> feeitemList;
|
||||||
|
|||||||
@ -7,51 +7,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<resultMap type="EmisTmsTransPlanDtl" id="EmisTmsTransPlanDtlResult">
|
<resultMap type="EmisTmsTransPlanDtl" id="EmisTmsTransPlanDtlResult">
|
||||||
<result property="id" column="id" />
|
<result property="id" column="id" />
|
||||||
<result property="planId" column="plan_id" />
|
<result property="planId" column="plan_id" />
|
||||||
<result property="startSiteCode" column="start_site_code" />
|
<result property="startSite" column="start_site" />
|
||||||
<result property="destSiteCode" column="dest_site_code" />
|
<result property="destSite" column="dest_site" />
|
||||||
<result property="transType" column="trans_type" />
|
<result property="transType" column="trans_type" />
|
||||||
<result property="estCostDay" column="est_cost_day" />
|
<result property="estCostDay" column="est_cost_day" />
|
||||||
<result property="orderNum" column="order_num" />
|
<result property="orderNum" column="order_num" />
|
||||||
<result property="status" column="status" />
|
<result property="status" column="status" />
|
||||||
<result property="createSiteCode" column="create_site_code" />
|
|
||||||
<result property="modifySiteCode" column="modify_site_code" />
|
|
||||||
<result property="delFlag" column="del_flag" />
|
<result property="delFlag" column="del_flag" />
|
||||||
<result property="createBy" column="create_by" />
|
<result property="createBy" column="create_by" />
|
||||||
<result property="createTime" column="create_time" />
|
<result property="createTime" column="create_time" />
|
||||||
<result property="updateBy" column="update_by" />
|
<result property="updateBy" column="update_by" />
|
||||||
<result property="updateTime" column="update_time" />
|
<result property="updateTime" column="update_time" />
|
||||||
<result property="remark" column="remark" />
|
<result property="remark" column="remark" />
|
||||||
|
<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"/>
|
||||||
|
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectEmisTmsTransPlanDtlVo">
|
<sql id="selectEmisTmsTransPlanDtlVo">
|
||||||
select id, plan_id, start_site_code, dest_site_code, trans_type, est_cost_day, order_num, status, create_site_code, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_tms_trans_plan_dtl
|
select id, plan_id, start_site, dest_site, trans_type, est_cost_day, order_num, status, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_tms_trans_plan_dtl
|
||||||
</sql>
|
</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="selectEmisTmsTransPlanDtlList" parameterType="EmisTmsTransPlanDtl" resultMap="EmisTmsTransPlanDtlResult">
|
<select id="selectEmisTmsTransPlanDtlList" parameterType="EmisTmsTransPlanDtl" resultMap="EmisTmsTransPlanDtlResult">
|
||||||
<include refid="selectEmisTmsTransPlanDtlVo"/>
|
<include refid="selectEmisTmsTransPlanDtlVo"/>
|
||||||
<where>
|
<where>
|
||||||
<if test="id != null "> and id = #{id}</if>
|
<if test="id != null "> and id = #{id}</if>
|
||||||
<if test="planId != null "> and plan_id = #{planId}</if>
|
<if test="planId != null "> and plan_id = #{planId}</if>
|
||||||
<if test="startSiteCode != null and startSiteCode != ''"> and start_site_code like concat('%', #{startSiteCode}, '%')</if>
|
<if test="startSite != null and startSite != ''"> and start_site like concat('%', #{startSite}, '%')</if>
|
||||||
<if test="destSiteCode != null and destSiteCode != ''"> and dest_site_code like concat('%', #{destSiteCode}, '%')</if>
|
<if test="destSite != null and destSite != ''"> and dest_site like concat('%', #{destSite}, '%')</if>
|
||||||
<if test="transType != null and transType != ''"> and trans_type like concat('%', #{transType}, '%')</if>
|
<if test="transType != null and transType != ''"> and trans_type like concat('%', #{transType}, '%')</if>
|
||||||
<if test="estCostDay != null and estCostDay != ''"> and est_cost_day like concat('%', #{estCostDay}, '%')</if>
|
<if test="estCostDay != null and estCostDay != ''"> and est_cost_day like concat('%', #{estCostDay}, '%')</if>
|
||||||
<if test="orderNum != null "> and order_num = #{orderNum}</if>
|
<if test="orderNum != null "> and order_num = #{orderNum}</if>
|
||||||
<if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
|
<if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
|
||||||
<if test="createSiteCode != null and createSiteCode != ''"> and create_site_code like concat('%', #{createSiteCode}, '%')</if>
|
|
||||||
<if test="modifySiteCode != null and modifySiteCode != ''"> and modify_site_code like concat('%', #{modifySiteCode}, '%')</if>
|
|
||||||
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
|
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
|
||||||
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
|
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
|
||||||
<if test="createTime != null "> and create_time = #{createTime}</if>
|
<if test="createTime != null "> and create_time = #{createTime}</if>
|
||||||
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
|
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
|
||||||
<if test="updateTime != null "> and update_time = #{updateTime}</if>
|
<if test="updateTime != null "> and update_time = #{updateTime}</if>
|
||||||
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
|
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
|
||||||
|
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
|
||||||
|
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
|
||||||
</where>
|
</where>
|
||||||
order by create_time desc
|
order by create_time desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectEmisTmsTransPlanDtlById" parameterType="Long" resultMap="EmisTmsTransPlanDtlResult">
|
<select id="selectEmisTmsTransPlanDtlById" parameterType="Long" resultMap="EmisTmsTransPlanDtlResult">
|
||||||
select id, plan_id, start_site_code, dest_site_code, trans_type, est_cost_day, order_num, status, create_site_code, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark
|
select id, plan_id, start_site, dest_site, trans_type, est_cost_day, order_num, status, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site
|
||||||
from emis_tms_trans_plan_dtl a
|
from emis_tms_trans_plan_dtl a
|
||||||
where a.id = #{id}
|
where a.id = #{id}
|
||||||
</select>
|
</select>
|
||||||
@ -61,38 +69,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
<if test="id != null">id,</if>
|
<if test="id != null">id,</if>
|
||||||
<if test="planId != null">plan_id,</if>
|
<if test="planId != null">plan_id,</if>
|
||||||
<if test="startSiteCode != null and startSiteCode != ''">start_site_code,</if>
|
<if test="startSite != null and startSite != ''">start_site,</if>
|
||||||
<if test="destSiteCode != null and destSiteCode != ''">dest_site_code,</if>
|
<if test="destSite != null and destSite != ''">dest_site,</if>
|
||||||
<if test="transType != null and transType != ''">trans_type,</if>
|
<if test="transType != null and transType != ''">trans_type,</if>
|
||||||
<if test="estCostDay != null and estCostDay != ''">est_cost_day,</if>
|
<if test="estCostDay != null and estCostDay != ''">est_cost_day,</if>
|
||||||
<if test="orderNum != null">order_num,</if>
|
<if test="orderNum != null">order_num,</if>
|
||||||
<if test="status != null and status != ''">status,</if>
|
<if test="status != null and status != ''">status,</if>
|
||||||
<if test="createSiteCode != null and createSiteCode != ''">create_site_code,</if>
|
|
||||||
<if test="modifySiteCode != null and modifySiteCode != ''">modify_site_code,</if>
|
|
||||||
<if test="delFlag != null and delFlag != ''">del_flag,</if>
|
<if test="delFlag != null and delFlag != ''">del_flag,</if>
|
||||||
<if test="createBy != null and createBy != ''">create_by,</if>
|
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||||
<if test="createTime != null">create_time,</if>
|
<if test="createTime != null">create_time,</if>
|
||||||
<if test="updateBy != null and updateBy != ''">update_by,</if>
|
<if test="updateBy != null and updateBy != ''">update_by,</if>
|
||||||
<if test="updateTime != null">update_time,</if>
|
<if test="updateTime != null">update_time,</if>
|
||||||
<if test="remark != null and remark != ''">remark,</if>
|
<if test="remark != null and remark != ''">remark,</if>
|
||||||
|
<if test="createSite != null and createSite != ''">create_site,</if>
|
||||||
|
<if test="updateSite != null and updateSite != ''">update_site,</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="id != null">#{id},</if>
|
<if test="id != null">#{id},</if>
|
||||||
<if test="planId != null">#{planId},</if>
|
<if test="planId != null">#{planId},</if>
|
||||||
<if test="startSiteCode != null and startSiteCode != ''">#{startSiteCode},</if>
|
<if test="startSite != null and startSite != ''">#{startSite},</if>
|
||||||
<if test="destSiteCode != null and destSiteCode != ''">#{destSiteCode},</if>
|
<if test="destSite != null and destSite != ''">#{destSite},</if>
|
||||||
<if test="transType != null and transType != ''">#{transType},</if>
|
<if test="transType != null and transType != ''">#{transType},</if>
|
||||||
<if test="estCostDay != null and estCostDay != ''">#{estCostDay},</if>
|
<if test="estCostDay != null and estCostDay != ''">#{estCostDay},</if>
|
||||||
<if test="orderNum != null">#{orderNum},</if>
|
<if test="orderNum != null">#{orderNum},</if>
|
||||||
<if test="status != null and status != ''">#{status},</if>
|
<if test="status != null and status != ''">#{status},</if>
|
||||||
<if test="createSiteCode != null and createSiteCode != ''">#{createSiteCode},</if>
|
|
||||||
<if test="modifySiteCode != null and modifySiteCode != ''">#{modifySiteCode},</if>
|
|
||||||
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
|
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
|
||||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||||
<if test="createTime != null">#{createTime},</if>
|
<if test="createTime != null">#{createTime},</if>
|
||||||
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
|
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
|
||||||
<if test="updateTime != null">#{updateTime},</if>
|
<if test="updateTime != null">#{updateTime},</if>
|
||||||
<if test="remark != null and remark != ''">#{remark},</if>
|
<if test="remark != null and remark != ''">#{remark},</if>
|
||||||
|
<if test="createSite != null and createSite != ''">#{createSite},</if>
|
||||||
|
<if test="updateSite != null and updateSite != ''">#{updateSite},</if>
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
@ -100,20 +108,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
update emis_tms_trans_plan_dtl
|
update emis_tms_trans_plan_dtl
|
||||||
<trim prefix="SET" suffixOverrides=",">
|
<trim prefix="SET" suffixOverrides=",">
|
||||||
<if test="planId != null">plan_id = #{planId},</if>
|
<if test="planId != null">plan_id = #{planId},</if>
|
||||||
<if test="startSiteCode != null and startSiteCode != ''">start_site_code = #{startSiteCode},</if>
|
<if test="startSite != null and startSite != ''">start_site = #{startSite},</if>
|
||||||
<if test="destSiteCode != null and destSiteCode != ''">dest_site_code = #{destSiteCode},</if>
|
<if test="destSite != null and destSite != ''">dest_site = #{destSite},</if>
|
||||||
<if test="transType != null and transType != ''">trans_type = #{transType},</if>
|
<if test="transType != null and transType != ''">trans_type = #{transType},</if>
|
||||||
<if test="estCostDay != null and estCostDay != ''">est_cost_day = #{estCostDay},</if>
|
<if test="estCostDay != null and estCostDay != ''">est_cost_day = #{estCostDay},</if>
|
||||||
<if test="orderNum != null">order_num = #{orderNum},</if>
|
<if test="orderNum != null">order_num = #{orderNum},</if>
|
||||||
<if test="status != null and status != ''">status = #{status},</if>
|
<if test="status != null and status != ''">status = #{status},</if>
|
||||||
<if test="createSiteCode != null and createSiteCode != ''">create_site_code = #{createSiteCode},</if>
|
|
||||||
<if test="modifySiteCode != null and modifySiteCode != ''">modify_site_code = #{modifySiteCode},</if>
|
|
||||||
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
|
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
|
||||||
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
|
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
|
||||||
<if test="createTime != null">create_time = #{createTime},</if>
|
<if test="createTime != null">create_time = #{createTime},</if>
|
||||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||||
<if test="remark != null and remark != ''">remark = #{remark},</if>
|
<if test="remark != null and remark != ''">remark = #{remark},</if>
|
||||||
|
<if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
|
||||||
|
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
|
||||||
</trim>
|
</trim>
|
||||||
where id = #{id}
|
where id = #{id}
|
||||||
</update>
|
</update>
|
||||||
|
|||||||
@ -11,18 +11,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<result property="transLineType" column="trans_line_type" />
|
<result property="transLineType" column="trans_line_type" />
|
||||||
<result property="productType" column="product_type" />
|
<result property="productType" column="product_type" />
|
||||||
<result property="status" column="status" />
|
<result property="status" column="status" />
|
||||||
<result property="createSiteCode" column="create_site_code" />
|
|
||||||
<result property="modifySiteCode" column="modify_site_code" />
|
|
||||||
<result property="delFlag" column="del_flag" />
|
<result property="delFlag" column="del_flag" />
|
||||||
<result property="createBy" column="create_by" />
|
<result property="createBy" column="create_by" />
|
||||||
<result property="createTime" column="create_time" />
|
<result property="createTime" column="create_time" />
|
||||||
<result property="updateBy" column="update_by" />
|
<result property="updateBy" column="update_by" />
|
||||||
<result property="updateTime" column="update_time" />
|
<result property="updateTime" column="update_time" />
|
||||||
<result property="remark" column="remark" />
|
<result property="remark" column="remark" />
|
||||||
|
<result property="createSite" column="create_site" />
|
||||||
|
<result property="updateSite" column="update_site" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectEmisTmsTransPlanVo">
|
<sql id="selectEmisTmsTransPlanVo">
|
||||||
select id, plan_code, plan_name, trans_line_type, product_type, status, create_site_code, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_tms_trans_plan
|
select id, plan_code, plan_name, trans_line_type, product_type, status, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_tms_trans_plan
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectEmisTmsTransPlanList" parameterType="EmisTmsTransPlan" resultMap="EmisTmsTransPlanResult">
|
<select id="selectEmisTmsTransPlanList" parameterType="EmisTmsTransPlan" resultMap="EmisTmsTransPlanResult">
|
||||||
@ -34,20 +34,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="transLineType != null and transLineType != ''"> and trans_line_type like concat('%', #{transLineType}, '%')</if>
|
<if test="transLineType != null and transLineType != ''"> and trans_line_type like concat('%', #{transLineType}, '%')</if>
|
||||||
<if test="productType != null and productType != ''"> and product_type like concat('%', #{productType}, '%')</if>
|
<if test="productType != null and productType != ''"> and product_type like concat('%', #{productType}, '%')</if>
|
||||||
<if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
|
<if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
|
||||||
<if test="createSiteCode != null and createSiteCode != ''"> and create_site_code like concat('%', #{createSiteCode}, '%')</if>
|
|
||||||
<if test="modifySiteCode != null and modifySiteCode != ''"> and modify_site_code like concat('%', #{modifySiteCode}, '%')</if>
|
|
||||||
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
|
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
|
||||||
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
|
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
|
||||||
<if test="createTime != null "> and create_time = #{createTime}</if>
|
<if test="createTime != null "> and create_time = #{createTime}</if>
|
||||||
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
|
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
|
||||||
<if test="updateTime != null "> and update_time = #{updateTime}</if>
|
<if test="updateTime != null "> and update_time = #{updateTime}</if>
|
||||||
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
|
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
|
||||||
|
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
|
||||||
|
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
|
||||||
</where>
|
</where>
|
||||||
order by create_time desc
|
order by create_time desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectEmisTmsTransPlanById" parameterType="Long" resultMap="EmisTmsTransPlanResult">
|
<select id="selectEmisTmsTransPlanById" parameterType="Long" resultMap="EmisTmsTransPlanResult">
|
||||||
select id, plan_code, plan_name, trans_line_type, product_type, status, create_site_code, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark
|
select id, plan_code, plan_name, trans_line_type, product_type, status, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site
|
||||||
from emis_tms_trans_plan a
|
from emis_tms_trans_plan a
|
||||||
where a.id = #{id}
|
where a.id = #{id}
|
||||||
</select>
|
</select>
|
||||||
@ -61,14 +61,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="transLineType != null and transLineType != ''">trans_line_type,</if>
|
<if test="transLineType != null and transLineType != ''">trans_line_type,</if>
|
||||||
<if test="productType != null and productType != ''">product_type,</if>
|
<if test="productType != null and productType != ''">product_type,</if>
|
||||||
<if test="status != null and status != ''">status,</if>
|
<if test="status != null and status != ''">status,</if>
|
||||||
<if test="createSiteCode != null and createSiteCode != ''">create_site_code,</if>
|
|
||||||
<if test="modifySiteCode != null and modifySiteCode != ''">modify_site_code,</if>
|
|
||||||
<if test="delFlag != null and delFlag != ''">del_flag,</if>
|
<if test="delFlag != null and delFlag != ''">del_flag,</if>
|
||||||
<if test="createBy != null and createBy != ''">create_by,</if>
|
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||||
<if test="createTime != null">create_time,</if>
|
<if test="createTime != null">create_time,</if>
|
||||||
<if test="updateBy != null and updateBy != ''">update_by,</if>
|
<if test="updateBy != null and updateBy != ''">update_by,</if>
|
||||||
<if test="updateTime != null">update_time,</if>
|
<if test="updateTime != null">update_time,</if>
|
||||||
<if test="remark != null and remark != ''">remark,</if>
|
<if test="remark != null and remark != ''">remark,</if>
|
||||||
|
<if test="createSite != null and createSite != ''">create_site,</if>
|
||||||
|
<if test="updateSite != null and updateSite != ''">update_site,</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="id != null">#{id},</if>
|
<if test="id != null">#{id},</if>
|
||||||
@ -77,14 +77,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="transLineType != null and transLineType != ''">#{transLineType},</if>
|
<if test="transLineType != null and transLineType != ''">#{transLineType},</if>
|
||||||
<if test="productType != null and productType != ''">#{productType},</if>
|
<if test="productType != null and productType != ''">#{productType},</if>
|
||||||
<if test="status != null and status != ''">#{status},</if>
|
<if test="status != null and status != ''">#{status},</if>
|
||||||
<if test="createSiteCode != null and createSiteCode != ''">#{createSiteCode},</if>
|
|
||||||
<if test="modifySiteCode != null and modifySiteCode != ''">#{modifySiteCode},</if>
|
|
||||||
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
|
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
|
||||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||||
<if test="createTime != null">#{createTime},</if>
|
<if test="createTime != null">#{createTime},</if>
|
||||||
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
|
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
|
||||||
<if test="updateTime != null">#{updateTime},</if>
|
<if test="updateTime != null">#{updateTime},</if>
|
||||||
<if test="remark != null and remark != ''">#{remark},</if>
|
<if test="remark != null and remark != ''">#{remark},</if>
|
||||||
|
<if test="createSite != null and createSite != ''">#{createSite},</if>
|
||||||
|
<if test="updateSite != null and updateSite != ''">#{updateSite},</if>
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
@ -96,14 +96,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="transLineType != null and transLineType != ''">trans_line_type = #{transLineType},</if>
|
<if test="transLineType != null and transLineType != ''">trans_line_type = #{transLineType},</if>
|
||||||
<if test="productType != null and productType != ''">product_type = #{productType},</if>
|
<if test="productType != null and productType != ''">product_type = #{productType},</if>
|
||||||
<if test="status != null and status != ''">status = #{status},</if>
|
<if test="status != null and status != ''">status = #{status},</if>
|
||||||
<if test="createSiteCode != null and createSiteCode != ''">create_site_code = #{createSiteCode},</if>
|
|
||||||
<if test="modifySiteCode != null and modifySiteCode != ''">modify_site_code = #{modifySiteCode},</if>
|
|
||||||
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
|
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
|
||||||
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
|
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
|
||||||
<if test="createTime != null">create_time = #{createTime},</if>
|
<if test="createTime != null">create_time = #{createTime},</if>
|
||||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||||
<if test="remark != null and remark != ''">remark = #{remark},</if>
|
<if test="remark != null and remark != ''">remark = #{remark},</if>
|
||||||
|
<if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
|
||||||
|
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
|
||||||
</trim>
|
</trim>
|
||||||
where id = #{id}
|
where id = #{id}
|
||||||
</update>
|
</update>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user