From f799df9c2439f0fb1fcab64be9a1c4cc9d43ade6 Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 22 May 2024 09:23:42 +0800 Subject: [PATCH] md --- .../emis/EmisMonthpayAccountController.java | 1 + .../emis/EmisWarehouseInBatchController.java | 10 ++ .../emis/EmisWaybillTransferController.java | 118 +++++++++++++ .../erp/emis/domain/EmisWaybillTransfer.java | 64 +++++++ .../mapper/EmisWaybillTransferMapper.java | 70 ++++++++ .../service/IEmisWaybillTransferService.java | 69 ++++++++ .../impl/EmisWaybillTransferServiceImpl.java | 104 ++++++++++++ .../mapper/EmisWaybillTransferMapper.xml | 157 ++++++++++++++++++ 8 files changed, 593 insertions(+) create mode 100644 emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillTransferMapper.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillTransferService.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java create mode 100644 emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java index aaf4874eb..70bea4ef6 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java @@ -80,6 +80,7 @@ public class EmisMonthpayAccountController extends BaseController { startPage(); emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); + emisCustomerUser.setCustomerType("2"); List list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser); return getDataTable(list); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java index 4f24d0d5c..72810c2cd 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java @@ -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)); + } + + + + /** * 修改进仓单批次 */ diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java new file mode 100644 index 000000000..3b6cfec09 --- /dev/null +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java @@ -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:

运单转件表 控制器

+ */ + +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 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 list = emisWaybillTransferService.selectEmisWaybillTransferList(emisWaybillTransfer); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java new file mode 100644 index 000000000..816471302 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java @@ -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:

运单转件表 实体类

+ */ + +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; + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillTransferMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillTransferMapper.java new file mode 100644 index 000000000..231cfcca7 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillTransferMapper.java @@ -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:

运单转件表 Mapper 接口

+ * Warning : This file is generate by ai tools,don't edit!!! + */ +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

运单转件表 Mapper 接口

+ * @author linfso + * @date 2024-05-22 01:07:48 + */ +public interface EmisWaybillTransferMapper extends BaseMapper +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisWaybillTransfer selectEmisWaybillTransferById(Long id); + + /** + * 查询列表 + * + * @param emisWaybillTransfer + * @return 集合 + */ + public List 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); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillTransferService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillTransferService.java new file mode 100644 index 000000000..6ba5b7c7c --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillTransferService.java @@ -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:

运单转件表 服务类接口

+ */ +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 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); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java new file mode 100644 index 000000000..84d8b6f01 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java @@ -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:

运单转件表 实体类

+ */ + +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 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); + } + +} diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml new file mode 100644 index 000000000..f4848d3ac --- /dev/null +++ b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into emis_waybill_transfer + + 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, + + + #{id}, + #{billCode}, + #{transferBillCode}, + #{transferDate}, + #{transferExpress}, + #{linkMan}, + #{linkPhone}, + #{transferFee}, + #{transferWeight}, + #{transferVolume}, + #{transferResean}, + #{transferCity}, + #{dataFrom}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{createSite}, + #{updateSite}, + + + + + update emis_waybill_transfer + + bill_code = #{billCode}, + transfer_bill_code = #{transferBillCode}, + transfer_date = #{transferDate}, + transfer_express = #{transferExpress}, + link_man = #{linkMan}, + link_phone = #{linkPhone}, + transfer_fee = #{transferFee}, + transfer_weight = #{transferWeight}, + transfer_volume = #{transferVolume}, + transfer_resean = #{transferResean}, + transfer_city = #{transferCity}, + data_from = #{dataFrom}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + create_site = #{createSite}, + update_site = #{updateSite}, + + where id = #{id} + + + + delete from emis_waybill_transfer where id = #{id} + + + + delete from emis_waybill_transfer where id in + + #{id} + + + \ No newline at end of file