Browse Source

feat(logistics): 新增物流管理功能模块

- 添加了查询供应商下可选PO订单的接口和实现
- 实现了将选定PO订单绑定到指定物流单号的功能
- 新增了LogisticsPoOrderData和LogisticsPoUpdateData数据传输对象
- 添加了相应的数据库映射配置和SQL语句
- 完成了服务层和控制层的完整业务逻辑实现
master
qiankanghui 2 months ago
parent
commit
c1e52be816
  1. 19
      src/main/java/com/xujie/modules/npcIqc/controller/LogisticsController.java
  2. 47
      src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoOrderData.java
  3. 31
      src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoUpdateData.java
  4. 12
      src/main/java/com/xujie/modules/npcIqc/mapper/LogisticsMapper.java
  5. 11
      src/main/java/com/xujie/modules/npcIqc/service/LogisticsService.java
  6. 22
      src/main/java/com/xujie/modules/npcIqc/service/impl/LogisticsServiceImpl.java
  7. 40
      src/main/resources/mapper/npcIqc/LogisticsMapper.xml

19
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();
}
}

47
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;
}

31
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<String> orderNoList;
}

12
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<LogisticsPoData> getPoListPage(Page<?> page, @Param("param") LogisticsPoSearchData searchData);
/**
* 查询供应商下可选的PO订单(订单级,分页)
*/
IPage<LogisticsPoOrderData> getAvailablePoPage(Page<?> page, @Param("param") LogisticsPoSearchData searchData);
/**
* 将选中的PO订单绑定到指定物流单号(更新 c_flexid)
*/
int updateFlexIdByOrders(@Param("param") LogisticsPoUpdateData updateData);
}

11
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);
}

22
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<LogisticsPoData> resultList = logisticsMapper.getPoListPage(page, searchData);
return new PageUtils(resultList);
}
@Override
public PageUtils getAvailablePoPage(LogisticsPoSearchData searchData) {
Page<LogisticsPoOrderData> page = new Page<>(searchData.getPage(), searchData.getLimit());
IPage<LogisticsPoOrderData> resultList = logisticsMapper.getAvailablePoPage(page, searchData);
return new PageUtils(resultList);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateLogisticsFlexId(LogisticsPoUpdateData updateData) {
Collection<String> orderNoList = updateData.getOrderNoList();
if (orderNoList == null || orderNoList.isEmpty()) {
return;
}
logisticsMapper.updateFlexIdByOrders(updateData);
}
}

40
src/main/resources/mapper/npcIqc/LogisticsMapper.xml

@ -63,4 +63,44 @@
ORDER BY h.order_date DESC
</select>
<!-- 查询供应商下可选的PO订单:仅未绑定物流单号且非草稿/已关闭的 -->
<select id="getAvailablePoPage" resultType="com.xujie.modules.npcIqc.data.LogisticsPoOrderData">
SELECT DISTINCT
d.order_no AS orderNo,
d.order_ref1 AS orderRef1,
h.order_date AS orderDate,
h.c_customer AS cCustomer,
h.supplier_no AS supplierNo,
d.part_no AS partNo,
p.sku AS sku
FROM PODetail d
INNER JOIN POHeader h
ON d.order_no = h.order_no
AND d.site = h.site
LEFT JOIN part p
ON d.part_no = p.part_no
AND d.site = p.site
WHERE d.site = #{param.site}
AND h.supplier_no = #{param.supplierNo}
AND ISNULL(d.c_flexid, '') = ''
AND ISNULL(h.status, '') NOT IN ('Draft', 'Closed', '草稿', '已关闭')
ORDER BY h.order_date DESC
</select>
<!-- 将选中的PO订单绑定到指定物流单号:更新这些订单下的PO明细行的 c_flexid -->
<update id="updateFlexIdByOrders">
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
<foreach collection="param.orderNoList" item="no" open="(" separator="," close=")">
#{no}
</foreach>
</update>
</mapper>
Loading…
Cancel
Save