diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisDestinationController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisDestinationController.java index 8ba480a3e..da10ab60c 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisDestinationController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisDestinationController.java @@ -65,8 +65,7 @@ public class EmisDestinationController extends BaseController @JacksonFilter(include= { "id","destCode","destName","destNameEn", - "lineCode","siteCode","lineName","countryName", - "provinceName","cityName","countyName","siteName", + "lineCode","lineName","countryName","country","siteCode","siteName", },value= EmisDestination.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @RequestMapping("/listSimple") public TableDataInfo listSimple(EmisDestination emisDestination) @@ -77,6 +76,27 @@ public class EmisDestinationController extends BaseController } + /** + * 根据客户信息获取目的地站点 + * @param province + * @return + */ + @RequestMapping("/getDestSite") + @JacksonFilter(include= { + "id","destCode","destName","destNameEn", + "lineCode","lineName","countryName","country","siteCode","siteName", + },value= EmisDestination.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + public AjaxResult getDestSite(String lineCode,String province,String city,String county,String address) + { + +// startPage(); +// List list = emisDestinationService.selectEmisDestinationList(emisDestination); + // 自动匹配 + + return AjaxResult.success("获取成功"); + } + + /** * 导出目的地列表 */ diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java new file mode 100644 index 000000000..934cbed61 --- /dev/null +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java @@ -0,0 +1,130 @@ + +/** + * @Project: emis + * @Title: EmisWarehouseInController.java + * @author linfso + * @date 2024-04-27 06:13:46 + * @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 com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; +import com.xdadan.erp.emis.domain.EmisTransProduct; +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.EmisWarehouseIn; +import com.xdadan.erp.emis.service.IEmisWarehouseInService; + +/** + * 进仓单Controller + * + * @author linfso + * @date 2024-04-27 06:13:46 + */ +@RestController +@RequestMapping("/emis/emisWarehouseIn") +public class EmisWarehouseInController extends BaseController +{ + @Autowired + private IEmisWarehouseInService emisWarehouseInService; + + /** + * 查询进仓单列表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisWarehouseIn:list')") + @GetMapping("/list") + public TableDataInfo list(EmisWarehouseIn emisWarehouseIn) + { + startPage(); + List list = emisWarehouseInService.selectEmisWarehouseInList(emisWarehouseIn); + return getDataTable(list); + } + + @JacksonFilter(include= {"id","inNo","customerCode","customerName","superiorDate"},value= EmisWarehouseIn.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + @RequestMapping("/listSimple") + public TableDataInfo listSimple(EmisWarehouseIn emisWarehouseIn) + { + startPage(); + List list = emisWarehouseInService.selectEmisWarehouseInList(emisWarehouseIn); + return getDataTable(list); + } + + /** + * 导出进仓单列表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisWarehouseIn:export')") + @Log(title = "进仓单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EmisWarehouseIn emisWarehouseIn) + { + List list = emisWarehouseInService.selectEmisWarehouseInList(emisWarehouseIn); + ExcelUtil util = new ExcelUtil(EmisWarehouseIn.class); + util.exportExcel(response, list, "进仓单数据"); + } + + /** + * 获取进仓单详细信息 + */ + @PreAuthorize("@ss.hasPermi('emis:emisWarehouseIn:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(emisWarehouseInService.selectEmisWarehouseInById(id)); + } + + /** + * 新增进仓单 + */ + @PreAuthorize("@ss.hasPermi('emis:emisWarehouseIn:add')") + @Log(title = "进仓单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EmisWarehouseIn emisWarehouseIn) + { + return toAjax(emisWarehouseInService.insertEmisWarehouseIn(emisWarehouseIn)); + } + + /** + * 修改进仓单 + */ + @PreAuthorize("@ss.hasPermi('emis:emisWarehouseIn:edit')") + @Log(title = "进仓单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EmisWarehouseIn emisWarehouseIn) + { + return toAjax(emisWarehouseInService.updateEmisWarehouseIn(emisWarehouseIn)); + } + + /** + * 删除进仓单 + */ + @PreAuthorize("@ss.hasPermi('emis:emisWarehouseIn:remove')") + @Log(title = "进仓单", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(emisWarehouseInService.deleteEmisWarehouseInByIds(ids)); + } +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java new file mode 100644 index 000000000..f8df2f343 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java @@ -0,0 +1,54 @@ +/** + * @Project: emis + * @Title: EmisWarehouseIn.java + * @author linfso + * @date 2024-04-27 06:13:46 + * @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 EmisWarehouseIn + * @Description 进仓单 + * @author linfso + * @date 2024-04-27 06:13:46 + */ + @Data +public class EmisWarehouseIn extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /* id */ + private Long id; + /* 进仓单号 */ + private String inNo; + /* 客户编号 */ + private String customerCode; + /* 客户名称 */ + private String customerName; + /* 进仓日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date superiorDate; + /* 序号 */ + private String serialNumber; + /* 创建站点 */ + private String createSite; + /* 更新站点 */ + private String updateSite; + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java new file mode 100644 index 000000000..0e9ba385a --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java @@ -0,0 +1,70 @@ +/** + * @Project: emis + * @Title: EmisWarehouseInMapper.java + * @author linfso + * @date 2024-04-27 06:13:46 + * @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.EmisWarehouseIn; +/** + * @ClassName EmisWarehouseInMapper + * @Description

进仓单 Mapper 接口

+ * @author linfso + * @date 2024-04-27 06:13:46 + */ +public interface EmisWarehouseInMapper extends BaseMapper +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisWarehouseIn selectEmisWarehouseInById(Long id); + + /** + * 查询列表 + * + * @param emisWarehouseIn + * @return 集合 + */ + public List selectEmisWarehouseInList(EmisWarehouseIn emisWarehouseIn); + + /** + * 新增 + * + * @param emisWarehouseIn + * @return + */ + public int insertEmisWarehouseIn(EmisWarehouseIn emisWarehouseIn); + + /** + * 修改 + * + * @param emisWarehouseIn + * @return + */ + public int updateEmisWarehouseIn(EmisWarehouseIn emisWarehouseIn); + + /** + * 删除 + * + * @param id 主键 + * @return 结果 + */ + public int deleteEmisWarehouseInById(Long id); + + /** + * 批量删除 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEmisWarehouseInByIds(Long[] ids); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInService.java new file mode 100644 index 000000000..85b2e1011 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInService.java @@ -0,0 +1,69 @@ + /** + * @Project: emis + * @Title: EmisWarehouseInService.java + * @author linfso + * @date 2024-04-27 06:13:46 + * @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.EmisWarehouseIn; + +/** + * @ClassName EmisWarehouseInService + * @Description 进仓单 + * @author linfso + * @date 2024-04-27 06:13:46 + */ +public interface IEmisWarehouseInService +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisWarehouseIn selectEmisWarehouseInById(Long id); + + /** + * 查询进仓单列表 + * + * @param emisWarehouseIn 进仓单 + * @return 进仓单集合 + */ + public List selectEmisWarehouseInList(EmisWarehouseIn emisWarehouseIn); + + /** + * 新增进仓单 + * + * @param emisWarehouseIn 进仓单 + * @return 结果 + */ + public int insertEmisWarehouseIn(EmisWarehouseIn emisWarehouseIn); + + /** + * 修改进仓单 + * + * @param emisWarehouseIn 进仓单 + * @return 结果 + */ + public int updateEmisWarehouseIn(EmisWarehouseIn emisWarehouseIn); + + /** + * 批量删除进仓单 + * + * @param ids 需要删除的进仓单主键集合 + * @return 结果 + */ + public int deleteEmisWarehouseInByIds(Long[] ids); + + /** + * 删除进仓单信息 + * + * @param id 进仓单主键 + * @return 结果 + */ + public int deleteEmisWarehouseInById(Long id); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java new file mode 100644 index 000000000..ccc86c54a --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java @@ -0,0 +1,104 @@ + /** + * @Project: emis + * @Title: EmisWarehouseInServiceImpl.java + * @author linfso + * @date 2024-04-27 06:13:46 + * @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.EmisWarehouseIn; +import com.xdadan.erp.emis.mapper.EmisWarehouseInMapper; +import com.xdadan.erp.emis.service.IEmisWarehouseInService; + +/** + * 进仓单Service业务层处理 + * + * @author linfso + * @date 2024-04-27 06:13:46 + */ +@Service +public class EmisWarehouseInServiceImpl implements IEmisWarehouseInService +{ + @Autowired + private EmisWarehouseInMapper emisWarehouseInMapper; + + /** + * 查询进仓单 + * + * @param id 进仓单主键 + * @return 进仓单 + */ + @Override + public EmisWarehouseIn selectEmisWarehouseInById(Long id) + { + return emisWarehouseInMapper.selectEmisWarehouseInById(id); + } + + /** + * 查询进仓单列表 + * + * @param emisWarehouseIn 进仓单 + * @return 进仓单 + */ + @Override + public List selectEmisWarehouseInList(EmisWarehouseIn emisWarehouseIn) + { + return emisWarehouseInMapper.selectEmisWarehouseInList(emisWarehouseIn); + } + + /** + * 新增进仓单 + * + * @param emisWarehouseIn 进仓单 + * @return 结果 + */ + @Override + public int insertEmisWarehouseIn(EmisWarehouseIn emisWarehouseIn) + { + return emisWarehouseInMapper.insertEmisWarehouseIn(emisWarehouseIn); + } + + /** + * 修改进仓单 + * + * @param emisWarehouseIn 进仓单 + * @return 结果 + */ + @Override + public int updateEmisWarehouseIn(EmisWarehouseIn emisWarehouseIn) + { + return emisWarehouseInMapper.updateEmisWarehouseIn(emisWarehouseIn); + } + + /** + * 批量删除进仓单 + * + * @param ids 需要删除的进仓单主键 + * @return 结果 + */ + @Override + public int deleteEmisWarehouseInByIds(Long[] ids) + { + return emisWarehouseInMapper.deleteEmisWarehouseInByIds(ids); + } + + /** + * 删除进仓单信息 + * + * @param id 进仓单主键 + * @return 结果 + */ + @Override + public int deleteEmisWarehouseInById(Long id) + { + return emisWarehouseInMapper.deleteEmisWarehouseInById(id); + } + +} diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml new file mode 100644 index 000000000..a6a743c5b --- /dev/null +++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, in_no, customer_code, customer_name, superior_date, serial_number, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_warehouse_in + + + + + + + + insert into emis_warehouse_in + + id, + in_no, + customer_code, + customer_name, + superior_date, + serial_number, + remark, + tenant_id, + del_flag, + create_by, + create_time, + update_by, + update_time, + create_site, + update_site, + + + #{id}, + #{inNo}, + #{customerCode}, + #{customerName}, + #{superiorDate}, + #{serialNumber}, + #{remark}, + #{tenantId}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{createSite}, + #{updateSite}, + + + + + update emis_warehouse_in + + in_no = #{inNo}, + customer_code = #{customerCode}, + customer_name = #{customerName}, + superior_date = #{superiorDate}, + serial_number = #{serialNumber}, + remark = #{remark}, + tenant_id = #{tenantId}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + create_site = #{createSite}, + update_site = #{updateSite}, + + where id = #{id} + + + + delete from emis_warehouse_in where id = #{id} + + + + delete from emis_warehouse_in where id in + + #{id} + + + \ No newline at end of file