diff --git a/src/main/java/com/xujie/modules/npcIqc/controller/LogisticsController.java b/src/main/java/com/xujie/modules/npcIqc/controller/LogisticsController.java index cdf05dc..dfb9b10 100644 --- a/src/main/java/com/xujie/modules/npcIqc/controller/LogisticsController.java +++ b/src/main/java/com/xujie/modules/npcIqc/controller/LogisticsController.java @@ -3,6 +3,7 @@ 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.LogisticsPoUpdateData; import com.xujie.modules.npcIqc.data.LogisticsSearchData; import com.xujie.modules.npcIqc.service.LogisticsService; import org.springframework.beans.factory.annotation.Autowired; @@ -35,4 +36,22 @@ public class LogisticsController { PageUtils page = logisticsService.getPoListPage(searchData); return R.ok().put("page", page); } + + /** + * 查询供应商下可选的PO订单(新增物流时挑选) + */ + @PostMapping("/getAvailablePoList") + public R getAvailablePoList(@RequestBody LogisticsPoSearchData searchData){ + PageUtils page = logisticsService.getAvailablePoPage(searchData); + return R.ok().put("page", page); + } + + /** + * 新增物流:将选中的PO订单绑定到指定物流单号(更新 c_flexid) + */ + @PostMapping("/updateLogisticsPo") + public R updateLogisticsPo(@RequestBody LogisticsPoUpdateData updateData){ + logisticsService.updateLogisticsFlexId(updateData); + return R.ok(); + } } diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoOrderData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoOrderData.java new file mode 100644 index 0000000..40c21f9 --- /dev/null +++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoOrderData.java @@ -0,0 +1,47 @@ +package com.xujie.modules.npcIqc.data; + +import lombok.Data; + +import java.util.Date; + +/** + * 供应商下可选的PO订单(订单级),用于新增物流时挑选要纳入的PO + */ +@Data +public class LogisticsPoOrderData { + + /** + * PO号(内部订单号,用于更新 c_flexid) + */ + private String orderNo; + + /** + * PO(展示用,对应 order_ref1) + */ + private String orderRef1; + + /** + * PO日期 + */ + private Date orderDate; + + /** + * Customer + */ + private String cCustomer; + + /** + * 供应商编码 + */ + private String supplierNo; + + /** + * 产品编码(Item) + */ + private String partNo; + + /** + * SKU + */ + private String sku; +} diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoUpdateData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoUpdateData.java new file mode 100644 index 0000000..ec31ee1 --- /dev/null +++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoUpdateData.java @@ -0,0 +1,31 @@ +package com.xujie.modules.npcIqc.data; + +import lombok.Data; +import java.util.List; + +/** + * 新增物流:将选中的PO订单绑定到指定物流单号(更新 PODetail.c_flexid) + */ +@Data +public class LogisticsPoUpdateData { + + /** + * 站点 + */ + private String site; + + /** + * 物流单号(进仓编号) + */ + private String flexId; + + /** + * 供应商编码 + */ + private String supplierNo; + + /** + * 选中的PO订单号列表 + */ + private List orderNoList; +} diff --git a/src/main/java/com/xujie/modules/npcIqc/mapper/LogisticsMapper.java b/src/main/java/com/xujie/modules/npcIqc/mapper/LogisticsMapper.java index 3c83de2..28bcf20 100644 --- a/src/main/java/com/xujie/modules/npcIqc/mapper/LogisticsMapper.java +++ b/src/main/java/com/xujie/modules/npcIqc/mapper/LogisticsMapper.java @@ -5,7 +5,9 @@ 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.LogisticsPoOrderData; import com.xujie.modules.npcIqc.data.LogisticsPoSearchData; +import com.xujie.modules.npcIqc.data.LogisticsPoUpdateData; import com.xujie.modules.npcIqc.data.LogisticsSearchData; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -22,4 +24,14 @@ public interface LogisticsMapper { * 查询PO清单(分页) */ IPage getPoListPage(Page page, @Param("param") LogisticsPoSearchData searchData); + + /** + * 查询供应商下可选的PO订单(订单级,分页) + */ + IPage getAvailablePoPage(Page page, @Param("param") LogisticsPoSearchData searchData); + + /** + * 将选中的PO订单绑定到指定物流单号(更新 c_flexid) + */ + int updateFlexIdByOrders(@Param("param") LogisticsPoUpdateData updateData); } diff --git a/src/main/java/com/xujie/modules/npcIqc/service/LogisticsService.java b/src/main/java/com/xujie/modules/npcIqc/service/LogisticsService.java index 0cdfd09..e6311b8 100644 --- a/src/main/java/com/xujie/modules/npcIqc/service/LogisticsService.java +++ b/src/main/java/com/xujie/modules/npcIqc/service/LogisticsService.java @@ -2,6 +2,7 @@ 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.LogisticsPoUpdateData; import com.xujie.modules.npcIqc.data.LogisticsSearchData; public interface LogisticsService { @@ -15,4 +16,14 @@ public interface LogisticsService { * 查询PO清单(分页) */ PageUtils getPoListPage(LogisticsPoSearchData searchData); + + /** + * 查询供应商下可选的PO订单(分页) + */ + PageUtils getAvailablePoPage(LogisticsPoSearchData searchData); + + /** + * 将选中的PO订单绑定到指定物流单号 + */ + void updateLogisticsFlexId(LogisticsPoUpdateData updateData); } 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 index 7e09d9f..7490272 100644 --- a/src/main/java/com/xujie/modules/npcIqc/service/impl/LogisticsServiceImpl.java +++ b/src/main/java/com/xujie/modules/npcIqc/service/impl/LogisticsServiceImpl.java @@ -5,12 +5,17 @@ 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.LogisticsPoOrderData; import com.xujie.modules.npcIqc.data.LogisticsPoSearchData; +import com.xujie.modules.npcIqc.data.LogisticsPoUpdateData; 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; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; @Service public class LogisticsServiceImpl implements LogisticsService { @@ -31,4 +36,21 @@ public class LogisticsServiceImpl implements LogisticsService { IPage resultList = logisticsMapper.getPoListPage(page, searchData); return new PageUtils(resultList); } + + @Override + public PageUtils getAvailablePoPage(LogisticsPoSearchData searchData) { + Page page = new Page<>(searchData.getPage(), searchData.getLimit()); + IPage resultList = logisticsMapper.getAvailablePoPage(page, searchData); + return new PageUtils(resultList); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void updateLogisticsFlexId(LogisticsPoUpdateData updateData) { + Collection orderNoList = updateData.getOrderNoList(); + if (orderNoList == null || orderNoList.isEmpty()) { + return; + } + logisticsMapper.updateFlexIdByOrders(updateData); + } } diff --git a/src/main/resources/mapper/npcIqc/LogisticsMapper.xml b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml index 463d72e..68cbd71 100644 --- a/src/main/resources/mapper/npcIqc/LogisticsMapper.xml +++ b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml @@ -63,4 +63,44 @@ ORDER BY h.order_date DESC + + + + + + UPDATE d + SET d.c_flexid = #{param.flexId} + FROM PODetail d + INNER JOIN POHeader h + ON d.order_no = h.order_no + AND d.site = h.site + WHERE d.site = #{param.site} + AND h.supplier_no = #{param.supplierNo} + AND d.order_no IN + + #{no} + + +