diff --git a/src/main/java/com/xujie/modules/npcIqc/controller/LogisticsController.java b/src/main/java/com/xujie/modules/npcIqc/controller/LogisticsController.java new file mode 100644 index 0000000..cdf05dc --- /dev/null +++ b/src/main/java/com/xujie/modules/npcIqc/controller/LogisticsController.java @@ -0,0 +1,38 @@ +package com.xujie.modules.npcIqc.controller; + +import com.xujie.common.utils.PageUtils; +import com.xujie.common.utils.R; +import com.xujie.modules.npcIqc.data.LogisticsPoSearchData; +import com.xujie.modules.npcIqc.data.LogisticsSearchData; +import com.xujie.modules.npcIqc.service.LogisticsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/srm/logistics") +public class LogisticsController { + + @Autowired + private LogisticsService logisticsService; + + /** + * 查询物流记录 + */ + @PostMapping("/search") + public R search(@RequestBody LogisticsSearchData searchData){ + PageUtils page = logisticsService.queryPage(searchData); + return R.ok().put("page", page); + } + + /** + * 查询PO清单 + */ + @PostMapping("/getPoList") + public R getPoList(@RequestBody LogisticsPoSearchData searchData){ + PageUtils page = logisticsService.getPoListPage(searchData); + return R.ok().put("page", page); + } +} diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsMainData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsMainData.java new file mode 100644 index 0000000..62efe41 --- /dev/null +++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsMainData.java @@ -0,0 +1,23 @@ +package com.xujie.modules.npcIqc.data; + +import lombok.Data; + +@Data +public class LogisticsMainData { + + private String flexId; + + private String supplierNo; + + private String supplierName; + + /** + * PO数量 + */ + private Integer poCount; + + /** + * 发货数量 + */ + private Double shippedQty; +} diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java new file mode 100644 index 0000000..323b4db --- /dev/null +++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java @@ -0,0 +1,23 @@ +package com.xujie.modules.npcIqc.data; + +import lombok.Data; + +import java.util.Date; + +@Data +public class LogisticsPoData { + + private String orderNo; + + private Integer itemNo; + + private String partNo; + + private Date orderDate; + + private Double qty; + + private Double shippedQty; + + private String flexId; +} diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoSearchData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoSearchData.java new file mode 100644 index 0000000..e4d8d8d --- /dev/null +++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoSearchData.java @@ -0,0 +1,19 @@ +package com.xujie.modules.npcIqc.data; +import com.xujie.common.utils.QueryPage; +import lombok.Data; + +@Data +public class LogisticsPoSearchData extends QueryPage { + + private String site; + + /** + * 进仓编号 + */ + private String flexId; + + /** + * 供应商编码 + */ + private String supplierNo; +} diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java new file mode 100644 index 0000000..8c4f095 --- /dev/null +++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java @@ -0,0 +1,24 @@ +package com.xujie.modules.npcIqc.data; +import com.xujie.common.utils.QueryPage; +import lombok.Data; + +@Data +public class LogisticsSearchData extends QueryPage { + + private String site; + + /** + * 进仓编号 + */ + private String flexId; + + /** + * 供应商编码 + */ + private String supplierNo; + + /** + * 供应商名称 + */ + private String supplierName; +} diff --git a/src/main/java/com/xujie/modules/npcIqc/mapper/LogisticsMapper.java b/src/main/java/com/xujie/modules/npcIqc/mapper/LogisticsMapper.java new file mode 100644 index 0000000..3c83de2 --- /dev/null +++ b/src/main/java/com/xujie/modules/npcIqc/mapper/LogisticsMapper.java @@ -0,0 +1,25 @@ +package com.xujie.modules.npcIqc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.xujie.modules.npcIqc.data.LogisticsMainData; +import com.xujie.modules.npcIqc.data.LogisticsPoData; +import com.xujie.modules.npcIqc.data.LogisticsPoSearchData; +import com.xujie.modules.npcIqc.data.LogisticsSearchData; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface LogisticsMapper { + + /** + * 查询物流记录(分页) + */ + IPage queryPage(Page page, @Param("param") LogisticsSearchData searchData); + + /** + * 查询PO清单(分页) + */ + IPage getPoListPage(Page page, @Param("param") LogisticsPoSearchData searchData); +} diff --git a/src/main/java/com/xujie/modules/npcIqc/service/LogisticsService.java b/src/main/java/com/xujie/modules/npcIqc/service/LogisticsService.java new file mode 100644 index 0000000..0cdfd09 --- /dev/null +++ b/src/main/java/com/xujie/modules/npcIqc/service/LogisticsService.java @@ -0,0 +1,18 @@ +package com.xujie.modules.npcIqc.service; + +import com.xujie.common.utils.PageUtils; +import com.xujie.modules.npcIqc.data.LogisticsPoSearchData; +import com.xujie.modules.npcIqc.data.LogisticsSearchData; + +public interface LogisticsService { + + /** + * 查询物流记录(分页) + */ + PageUtils queryPage(LogisticsSearchData searchData); + + /** + * 查询PO清单(分页) + */ + PageUtils getPoListPage(LogisticsPoSearchData searchData); +} diff --git a/src/main/java/com/xujie/modules/npcIqc/service/impl/LogisticsServiceImpl.java b/src/main/java/com/xujie/modules/npcIqc/service/impl/LogisticsServiceImpl.java new file mode 100644 index 0000000..7e09d9f --- /dev/null +++ b/src/main/java/com/xujie/modules/npcIqc/service/impl/LogisticsServiceImpl.java @@ -0,0 +1,34 @@ +package com.xujie.modules.npcIqc.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.xujie.common.utils.PageUtils; +import com.xujie.modules.npcIqc.data.LogisticsMainData; +import com.xujie.modules.npcIqc.data.LogisticsPoData; +import com.xujie.modules.npcIqc.data.LogisticsPoSearchData; +import com.xujie.modules.npcIqc.data.LogisticsSearchData; +import com.xujie.modules.npcIqc.mapper.LogisticsMapper; +import com.xujie.modules.npcIqc.service.LogisticsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class LogisticsServiceImpl implements LogisticsService { + + @Autowired + private LogisticsMapper logisticsMapper; + + @Override + public PageUtils queryPage(LogisticsSearchData searchData) { + Page page = new Page<>(searchData.getPage(), searchData.getLimit()); + IPage resultList = logisticsMapper.queryPage(page, searchData); + return new PageUtils(resultList); + } + + @Override + public PageUtils getPoListPage(LogisticsPoSearchData searchData) { + Page page = new Page<>(searchData.getPage(), searchData.getLimit()); + IPage resultList = logisticsMapper.getPoListPage(page, searchData); + return new PageUtils(resultList); + } +} diff --git a/src/main/resources/mapper/npcIqc/LogisticsMapper.xml b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml new file mode 100644 index 0000000..a7b81c7 --- /dev/null +++ b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + +