This commit is contained in:
linfso 2024-05-22 09:23:42 +08:00
parent 1996dc5437
commit f799df9c24
8 changed files with 593 additions and 0 deletions

View File

@ -80,6 +80,7 @@ public class EmisMonthpayAccountController extends BaseController
{
startPage();
emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode());
emisCustomerUser.setCustomerType("2");
List<EmisCustomerUser> list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser);
return getDataTable(list);

View File

@ -94,6 +94,16 @@ public class EmisWarehouseInBatchController extends BaseController
return toAjax(emisWarehouseInBatchService.insertEmisWarehouseInBatch(emisWarehouseInBatch));
}
@Log(title = "进仓单登记", businessType = BusinessType.INSERT)
@RequestMapping("/registerWarehouseInInfo")
public AjaxResult registerWarehouseInInfo(@RequestBody EmisWarehouseInBatch emisWarehouseInBatch)
{
return toAjax(emisWarehouseInBatchService.insertEmisWarehouseInBatch(emisWarehouseInBatch));
}
/**
* 修改进仓单批次
*/

View File

@ -0,0 +1,118 @@
/**
* @Project: emis
* @Title: EmisWaybillTransferController.java
* @author linfso
* @date 2024-05-22 01:07:48
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> 运单转件表 控制器 </p>
*/
package com.xdadan.erp.web.emis;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.xdadan.erp.common.annotation.Log;
import com.xdadan.erp.common.core.controller.BaseController;
import com.xdadan.erp.common.core.domain.AjaxResult;
import com.xdadan.erp.common.core.page.TableDataInfo;
import com.xdadan.erp.common.enums.BusinessType;
import com.xdadan.erp.common.utils.StringUtils;
import com.xdadan.erp.common.utils.poi.ExcelUtil;
import com.xdadan.erp.emis.domain.EmisWaybillTransfer;
import com.xdadan.erp.emis.service.IEmisWaybillTransferService;
/**
* 运单转件表Controller
*
* @author linfso
* @date 2024-05-22 01:07:48
*/
@RestController
@RequestMapping("/emis/emisWaybillTransfer")
public class EmisWaybillTransferController extends BaseController
{
@Autowired
private IEmisWaybillTransferService emisWaybillTransferService;
/**
* 查询运单转件表列表
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybillTransfer:list')")
@GetMapping("/list")
public TableDataInfo list(EmisWaybillTransfer emisWaybillTransfer)
{
startPage();
List<EmisWaybillTransfer> list = emisWaybillTransferService.selectEmisWaybillTransferList(emisWaybillTransfer);
return getDataTable(list);
}
/**
* 导出运单转件表列表
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybillTransfer:export')")
@Log(title = "运单转件表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, EmisWaybillTransfer emisWaybillTransfer)
{
List<EmisWaybillTransfer> list = emisWaybillTransferService.selectEmisWaybillTransferList(emisWaybillTransfer);
ExcelUtil<EmisWaybillTransfer> util = new ExcelUtil<EmisWaybillTransfer>(EmisWaybillTransfer.class);
util.exportExcel(response, list, "运单转件表数据");
}
/**
* 获取运单转件表详细信息
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybillTransfer:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(emisWaybillTransferService.selectEmisWaybillTransferById(id));
}
/**
* 新增运单转件表
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybillTransfer:add')")
@Log(title = "运单转件表", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody EmisWaybillTransfer emisWaybillTransfer)
{
return toAjax(emisWaybillTransferService.insertEmisWaybillTransfer(emisWaybillTransfer));
}
/**
* 修改运单转件表
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybillTransfer:edit')")
@Log(title = "运单转件表", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody EmisWaybillTransfer emisWaybillTransfer)
{
return toAjax(emisWaybillTransferService.updateEmisWaybillTransfer(emisWaybillTransfer));
}
/**
* 删除运单转件表
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybillTransfer:remove')")
@Log(title = "运单转件表", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(emisWaybillTransferService.deleteEmisWaybillTransferByIds(ids));
}
}

View File

@ -0,0 +1,64 @@
/**
* @Project: emis
* @Title: EmisWaybillTransfer.java
* @author linfso
* @date 2024-05-22 01:07:48
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> 运单转件表 实体类 </p>
*/
package com.xdadan.erp.emis.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.xdadan.erp.common.annotation.Excel;
import com.xdadan.erp.common.core.domain.BaseEntity;
import com.xdadan.erp.common.core.domain.TreeEntity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
/**
* @ClassName EmisWaybillTransfer
* @Description 运单转件表
* @author linfso
* @date 2024-05-22 01:07:48
*/
@Data
public class EmisWaybillTransfer extends BaseEntity
{
private static final long serialVersionUID = 1L;
/* id */
private Long id;
/* 运单号 */
private String billCode;
/* 转件单号 */
private String transferBillCode;
/* 转件日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date transferDate;
/* 转件公司 */
private String transferExpress;
/* 联系人 */
private String linkMan;
/* 联系电话 */
private String linkPhone;
/* 转件费 */
private BigDecimal transferFee;
/* 转件重量 */
private BigDecimal transferWeight;
/* 转件体积 */
private BigDecimal transferVolume;
/* 转件原因 */
private String transferResean;
/* 转件城市 */
private String transferCity;
/* 数据来源 */
private String dataFrom;
}

View File

@ -0,0 +1,70 @@
/**
* @Project: emis
* @Title: EmisWaybillTransferMapper.java
* @author linfso
* @date 2024-05-22 01:07:48
* @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 java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xdadan.erp.emis.domain.EmisWaybillTransfer;
/**
* @ClassName EmisWaybillTransferMapper
* @Description <p> 运单转件表 Mapper 接口 </p>
* @author linfso
* @date 2024-05-22 01:07:48
*/
public interface EmisWaybillTransferMapper extends BaseMapper<EmisWaybillTransfer>
{
/**
* 主键查询
* @param id
* @return
*/
public EmisWaybillTransfer selectEmisWaybillTransferById(Long id);
/**
* 查询列表
*
* @param emisWaybillTransfer
* @return 集合
*/
public List<EmisWaybillTransfer> selectEmisWaybillTransferList(EmisWaybillTransfer emisWaybillTransfer);
/**
* 新增
*
* @param emisWaybillTransfer
* @return
*/
public int insertEmisWaybillTransfer(EmisWaybillTransfer emisWaybillTransfer);
/**
* 修改
*
* @param emisWaybillTransfer
* @return
*/
public int updateEmisWaybillTransfer(EmisWaybillTransfer emisWaybillTransfer);
/**
* 删除
*
* @param id 主键
* @return 结果
*/
public int deleteEmisWaybillTransferById(Long id);
/**
* 批量删除
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteEmisWaybillTransferByIds(Long[] ids);
}

View File

@ -0,0 +1,69 @@
/**
* @Project: emis
* @Title: EmisWaybillTransferService.java
* @author linfso
* @date 2024-05-22 01:07:48
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> 运单转件表 服务类接口 </p>
*/
package com.xdadan.erp.emis.service;
import java.util.List;
import com.xdadan.erp.emis.domain.EmisWaybillTransfer;
/**
* @ClassName EmisWaybillTransferService
* @Description 运单转件表
* @author linfso
* @date 2024-05-22 01:07:48
*/
public interface IEmisWaybillTransferService
{
/**
* 主键查询
* @param id
* @return
*/
public EmisWaybillTransfer selectEmisWaybillTransferById(Long id);
/**
* 查询运单转件表列表
*
* @param emisWaybillTransfer 运单转件表
* @return 运单转件表集合
*/
public List<EmisWaybillTransfer> selectEmisWaybillTransferList(EmisWaybillTransfer emisWaybillTransfer);
/**
* 新增运单转件表
*
* @param emisWaybillTransfer 运单转件表
* @return 结果
*/
public int insertEmisWaybillTransfer(EmisWaybillTransfer emisWaybillTransfer);
/**
* 修改运单转件表
*
* @param emisWaybillTransfer 运单转件表
* @return 结果
*/
public int updateEmisWaybillTransfer(EmisWaybillTransfer emisWaybillTransfer);
/**
* 批量删除运单转件表
*
* @param ids 需要删除的运单转件表主键集合
* @return 结果
*/
public int deleteEmisWaybillTransferByIds(Long[] ids);
/**
* 删除运单转件表信息
*
* @param id 运单转件表主键
* @return 结果
*/
public int deleteEmisWaybillTransferById(Long id);
}

View File

@ -0,0 +1,104 @@
/**
* @Project: emis
* @Title: EmisWaybillTransferServiceImpl.java
* @author linfso
* @date 2024-05-22 01:07:48
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> 运单转件表 实体类 </p>
*/
package com.xdadan.erp.emis.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.xdadan.erp.emis.domain.EmisWaybillTransfer;
import com.xdadan.erp.emis.mapper.EmisWaybillTransferMapper;
import com.xdadan.erp.emis.service.IEmisWaybillTransferService;
/**
* 运单转件表Service业务层处理
*
* @author linfso
* @date 2024-05-22 01:07:48
*/
@Service
public class EmisWaybillTransferServiceImpl implements IEmisWaybillTransferService
{
@Autowired
private EmisWaybillTransferMapper emisWaybillTransferMapper;
/**
* 查询运单转件表
*
* @param id 运单转件表主键
* @return 运单转件表
*/
@Override
public EmisWaybillTransfer selectEmisWaybillTransferById(Long id)
{
return emisWaybillTransferMapper.selectEmisWaybillTransferById(id);
}
/**
* 查询运单转件表列表
*
* @param emisWaybillTransfer 运单转件表
* @return 运单转件表
*/
@Override
public List<EmisWaybillTransfer> selectEmisWaybillTransferList(EmisWaybillTransfer emisWaybillTransfer)
{
return emisWaybillTransferMapper.selectEmisWaybillTransferList(emisWaybillTransfer);
}
/**
* 新增运单转件表
*
* @param emisWaybillTransfer 运单转件表
* @return 结果
*/
@Override
public int insertEmisWaybillTransfer(EmisWaybillTransfer emisWaybillTransfer)
{
return emisWaybillTransferMapper.insertEmisWaybillTransfer(emisWaybillTransfer);
}
/**
* 修改运单转件表
*
* @param emisWaybillTransfer 运单转件表
* @return 结果
*/
@Override
public int updateEmisWaybillTransfer(EmisWaybillTransfer emisWaybillTransfer)
{
return emisWaybillTransferMapper.updateEmisWaybillTransfer(emisWaybillTransfer);
}
/**
* 批量删除运单转件表
*
* @param ids 需要删除的运单转件表主键
* @return 结果
*/
@Override
public int deleteEmisWaybillTransferByIds(Long[] ids)
{
return emisWaybillTransferMapper.deleteEmisWaybillTransferByIds(ids);
}
/**
* 删除运单转件表信息
*
* @param id 运单转件表主键
* @return 结果
*/
@Override
public int deleteEmisWaybillTransferById(Long id)
{
return emisWaybillTransferMapper.deleteEmisWaybillTransferById(id);
}
}

View File

@ -0,0 +1,157 @@
<?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.EmisWaybillTransferMapper">
<resultMap type="EmisWaybillTransfer" id="EmisWaybillTransferResult">
<result property="id" column="id" />
<result property="billCode" column="bill_code" />
<result property="transferBillCode" column="transfer_bill_code" />
<result property="transferDate" column="transfer_date" />
<result property="transferExpress" column="transfer_express" />
<result property="linkMan" column="link_man" />
<result property="linkPhone" column="link_phone" />
<result property="transferFee" column="transfer_fee" />
<result property="transferWeight" column="transfer_weight" />
<result property="transferVolume" column="transfer_volume" />
<result property="transferResean" column="transfer_resean" />
<result property="transferCity" column="transfer_city" />
<result property="dataFrom" column="data_from" />
<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="remark" column="remark" />
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
</resultMap>
<sql id="selectEmisWaybillTransferVo">
select id, bill_code, transfer_bill_code, transfer_date, transfer_express, link_man, link_phone, transfer_fee, transfer_weight, transfer_volume, transfer_resean, transfer_city, data_from, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill_transfer
</sql>
<select id="selectEmisWaybillTransferList" parameterType="EmisWaybillTransfer" resultMap="EmisWaybillTransferResult">
<include refid="selectEmisWaybillTransferVo"/>
<where>
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="billCode != null and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
<if test="transferBillCode != null and transferBillCode != ''"> and transfer_bill_code like concat('%', #{transferBillCode}, '%')</if>
<if test="transferDate != null "> and transfer_date = #{transferDate}</if>
<if test="transferExpress != null and transferExpress != ''"> and transfer_express like concat('%', #{transferExpress}, '%')</if>
<if test="linkMan != null and linkMan != ''"> and link_man like concat('%', #{linkMan}, '%')</if>
<if test="linkPhone != null and linkPhone != ''"> and link_phone like concat('%', #{linkPhone}, '%')</if>
<if test="transferFee != null "> and transfer_fee = #{transferFee}</if>
<if test="transferWeight != null "> and transfer_weight = #{transferWeight}</if>
<if test="transferVolume != null "> and transfer_volume = #{transferVolume}</if>
<if test="transferResean != null and transferResean != ''"> and transfer_resean like concat('%', #{transferResean}, '%')</if>
<if test="transferCity != null and transferCity != ''"> and transfer_city like concat('%', #{transferCity}, '%')</if>
<if test="dataFrom != null and dataFrom != ''"> and data_from like concat('%', #{dataFrom}, '%')</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="createTime != null "> and create_time = #{createTime}</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="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>
order by create_time desc
</select>
<select id="selectEmisWaybillTransferById" parameterType="Long" resultMap="EmisWaybillTransferResult">
select id, bill_code, transfer_bill_code, transfer_date, transfer_express, link_man, link_phone, transfer_fee, transfer_weight, transfer_volume, transfer_resean, transfer_city, data_from, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site
from emis_waybill_transfer a
where a.id = #{id}
</select>
<insert id="insertEmisWaybillTransfer" parameterType="EmisWaybillTransfer" useGeneratedKeys="true" keyProperty="id">
insert into emis_waybill_transfer
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="billCode != null and billCode != ''">bill_code,</if>
<if test="transferBillCode != null and transferBillCode != ''">transfer_bill_code,</if>
<if test="transferDate != null">transfer_date,</if>
<if test="transferExpress != null and transferExpress != ''">transfer_express,</if>
<if test="linkMan != null and linkMan != ''">link_man,</if>
<if test="linkPhone != null and linkPhone != ''">link_phone,</if>
<if test="transferFee != null">transfer_fee,</if>
<if test="transferWeight != null">transfer_weight,</if>
<if test="transferVolume != null">transfer_volume,</if>
<if test="transferResean != null and transferResean != ''">transfer_resean,</if>
<if test="transferCity != null and transferCity != ''">transfer_city,</if>
<if test="dataFrom != null and dataFrom != ''">data_from,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="updateTime != null">update_time,</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 prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="billCode != null and billCode != ''">#{billCode},</if>
<if test="transferBillCode != null and transferBillCode != ''">#{transferBillCode},</if>
<if test="transferDate != null">#{transferDate},</if>
<if test="transferExpress != null and transferExpress != ''">#{transferExpress},</if>
<if test="linkMan != null and linkMan != ''">#{linkMan},</if>
<if test="linkPhone != null and linkPhone != ''">#{linkPhone},</if>
<if test="transferFee != null">#{transferFee},</if>
<if test="transferWeight != null">#{transferWeight},</if>
<if test="transferVolume != null">#{transferVolume},</if>
<if test="transferResean != null and transferResean != ''">#{transferResean},</if>
<if test="transferCity != null and transferCity != ''">#{transferCity},</if>
<if test="dataFrom != null and dataFrom != ''">#{dataFrom},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</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>
</insert>
<update id="updateEmisWaybillTransfer" parameterType="EmisWaybillTransfer">
update emis_waybill_transfer
<trim prefix="SET" suffixOverrides=",">
<if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
<if test="transferBillCode != null and transferBillCode != ''">transfer_bill_code = #{transferBillCode},</if>
<if test="transferDate != null">transfer_date = #{transferDate},</if>
<if test="transferExpress != null and transferExpress != ''">transfer_express = #{transferExpress},</if>
<if test="linkMan != null and linkMan != ''">link_man = #{linkMan},</if>
<if test="linkPhone != null and linkPhone != ''">link_phone = #{linkPhone},</if>
<if test="transferFee != null">transfer_fee = #{transferFee},</if>
<if test="transferWeight != null">transfer_weight = #{transferWeight},</if>
<if test="transferVolume != null">transfer_volume = #{transferVolume},</if>
<if test="transferResean != null and transferResean != ''">transfer_resean = #{transferResean},</if>
<if test="transferCity != null and transferCity != ''">transfer_city = #{transferCity},</if>
<if test="dataFrom != null and dataFrom != ''">data_from = #{dataFrom},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</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>
where id = #{id}
</update>
<delete id="deleteEmisWaybillTransferById" parameterType="Long">
delete from emis_waybill_transfer where id = #{id}
</delete>
<delete id="deleteEmisWaybillTransferByIds" parameterType="String">
delete from emis_waybill_transfer where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>