diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductSalseController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductSalseController.java index ec332ad..2059c69 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductSalseController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductSalseController.java @@ -191,4 +191,16 @@ public class WmProductSalseController extends BaseController wmProductSalseService.updateWmProductSalse(salse); return AjaxResult.success(); } + + @GetMapping("/getItem/{clientId}") + @Log(title = "根据客户 id 获取产品清单数据") + public AjaxResult getItem(@PathVariable Long clientId) { + return wmProductSalseService.getItem(clientId); + } + + @GetMapping("/getSaleRecord/{clientId}") + @Log(title = "根据客户 id 获取销售记录数据") + public AjaxResult getSaleRecord(@PathVariable Long clientId) { + return wmProductSalseService.getSaleRecord(clientId); + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/vo/SaleRecordVO.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/vo/SaleRecordVO.java new file mode 100644 index 0000000..9d9d3c2 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/vo/SaleRecordVO.java @@ -0,0 +1,99 @@ +package com.ktg.mes.wm.domain.vo; + +import com.ktg.common.annotation.Excel; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class SaleRecordVO { + + private static final long serialVersionUID = 1L; + + /** 行ID */ + private Long lineId; + + /** 出库记录ID */ + @Excel(name = "出库记录ID") + private Long salseId; + + /** 库存记录ID */ + @Excel(name = "库存记录ID") + private Long materialStockId; + + /** 产品物料ID */ + @Excel(name = "产品物料ID") + private Long itemId; + + /** 产品物料编码 */ + @Excel(name = "产品物料编码") + private String itemCode; + + /** 产品物料名称 */ + @Excel(name = "产品物料名称") + private String itemName; + + /** 规格型号 */ + @Excel(name = "规格型号") + private String specification; + + /** 单位 */ + @Excel(name = "单位") + private String unitOfMeasure; + + /** 出库数量 */ + @Excel(name = "出库数量") + private BigDecimal quantitySalse; + + /** 批次号 */ + @Excel(name = "批次号") + private String batchCode; + + /** 仓库ID */ + @Excel(name = "仓库ID") + private Long warehouseId; + + /** 仓库编码 */ + @Excel(name = "仓库编码") + private String warehouseCode; + + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String warehouseName; + + /** 出库单编号 */ + @Excel(name = "出库单编号") + private String salseCode; + + /** 出库单名称 */ + @Excel(name = "出库单名称") + private String salseName; + + /** 出货检验单ID */ + @Excel(name = "出货检验单ID") + private Long oqcId; + + /** 出货检验单编号 */ + @Excel(name = "出货检验单编号") + private String oqcCode; + + /** 销售订单编号 */ + @Excel(name = "销售订单编号") + private String soCode; + + /** 客户ID */ + @Excel(name = "客户ID") + private Long clientId; + + /** 客户编码 */ + @Excel(name = "客户编码") + private String clientCode; + + /** 客户名称 */ + @Excel(name = "客户名称") + private String clientName; + + /** 客户简称 */ + @Excel(name = "客户简称") + private String clientNick; +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductSalseMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductSalseMapper.java index af945da..9c9f851 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductSalseMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductSalseMapper.java @@ -2,7 +2,10 @@ package com.ktg.mes.wm.mapper; import java.util.List; import com.ktg.mes.wm.domain.WmProductSalse; +import com.ktg.mes.wm.domain.WmProductSalseLine; import com.ktg.mes.wm.domain.tx.ProductSalseTxBean; +import com.ktg.mes.wm.domain.vo.SaleRecordVO; +import org.apache.ibatis.annotations.Param; /** * 销售出库单Mapper接口 @@ -73,4 +76,18 @@ public interface WmProductSalseMapper * @return */ public List getTxBeans(Long salseId); + + /** + * 根据客户id获取出库产品信息 + * @param clientId + * @return + */ + List getItem(@Param("clientId") Long clientId); + + /** + * 根据客户 id 获取销售记录数据 + * @param clientId + * @return + */ + List getSaleRecord(@Param("clientId") Long clientId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductSalseService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductSalseService.java index 76b7b40..b196ce3 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductSalseService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductSalseService.java @@ -1,6 +1,8 @@ package com.ktg.mes.wm.service; import java.util.List; + +import com.ktg.common.core.domain.AjaxResult; import com.ktg.mes.wm.domain.WmProductSalse; import com.ktg.mes.wm.domain.tx.ProductSalseTxBean; @@ -74,4 +76,18 @@ public interface IWmProductSalseService * @return 结果 */ public int deleteWmProductSalseBySalseId(Long salseId); + + /** + * 根据客户 id 获取产品清单数据 + * @param clientId + * @return + */ + AjaxResult getItem(Long clientId); + + /** + * 根据客户 id 获取销售记录数据 + * @param clientId + * @return + */ + AjaxResult getSaleRecord(Long clientId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductSalseServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductSalseServiceImpl.java index 0967104..9c6f6a0 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductSalseServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductSalseServiceImpl.java @@ -1,11 +1,16 @@ package com.ktg.mes.wm.service.impl; import java.util.List; +import java.util.function.Function; +import java.util.stream.Collectors; import com.ktg.common.constant.UserConstants; +import com.ktg.common.core.domain.AjaxResult; import com.ktg.common.utils.DateUtils; import com.ktg.common.utils.StringUtils; +import com.ktg.mes.wm.domain.WmProductSalseLine; import com.ktg.mes.wm.domain.tx.ProductSalseTxBean; +import com.ktg.mes.wm.domain.vo.SaleRecordVO; import org.apache.catalina.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -114,5 +119,31 @@ public class WmProductSalseServiceImpl implements IWmProductSalseService return wmProductSalseMapper.deleteWmProductSalseBySalseId(salseId); } + /** + * 根据客户 id 获取产品清单数据 + * @param clientId + * @return + */ + @Override + public AjaxResult getItem(Long clientId) { + List salseLines = wmProductSalseMapper.getItem(clientId); + List collect = salseLines.stream() + .collect(Collectors.toMap( + WmProductSalseLine::getItemId, + Function.identity(), + (existing, replacement) -> existing + )).values().stream().collect(Collectors.toList()); + return AjaxResult.success(collect); + } + /** + * 根据客户 id 获取销售记录数据 + * @param clientId + * @return + */ + @Override + public AjaxResult getSaleRecord(Long clientId) { + List saleRecordVOS = wmProductSalseMapper.getSaleRecord(clientId); + return AjaxResult.success(saleRecordVOS); + } } diff --git a/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml index 3f95548..bc69275 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml @@ -37,6 +37,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -72,6 +102,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select salse_id, salse_code, salse_name, oqc_id, oqc_code, so_code, client_id, client_code, client_name, client_nick, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, salse_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_salse @@ -125,6 +189,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ON ir.salse_id = irl.`salse_id` WHERE ir.`salse_id` = #{salseId} + + insert into wm_product_salse