From b1a2fad16e57c7d0c299f316a48d306302dfa238 Mon Sep 17 00:00:00 2001 From: qiankanghui Date: Fri, 18 Sep 2026 10:40:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E5=8F=B7=E9=80=89=E5=A1=AB=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在PODetailMapper中增加flexid参数用于可选回写发货单号 - 更新updateShipProgress方法支持条件性更新c_flexid字段 - 在PODetailServiceImpl中传递flexid参数到数据更新操作 - 为PoShipSubmitVo添加flexid字段并添加文档说明 - 实现发货单号非空时才更新数据库的逻辑控制 --- .../java/com/xujie/modules/order/dao/PODetailMapper.java | 4 +++- .../modules/order/service/Impl/PODetailServiceImpl.java | 4 +++- .../java/com/xujie/modules/order/vo/PoShipSubmitVo.java | 3 +++ src/main/resources/mapper/order/PODetailMapper.xml | 6 +++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/xujie/modules/order/dao/PODetailMapper.java b/src/main/java/com/xujie/modules/order/dao/PODetailMapper.java index 17382b7..870278f 100644 --- a/src/main/java/com/xujie/modules/order/dao/PODetailMapper.java +++ b/src/main/java/com/xujie/modules/order/dao/PODetailMapper.java @@ -134,6 +134,7 @@ public interface PODetailMapper extends BaseMapper { /** * 提交发货时回写订单数量、累计发货数量和状态,同时记录修改时间与修改人。 + * flexid 为选填发货单号,非空时同步回写 c_flexid,为空则不更新该字段。 */ int updateShipProgress(@Param("orderNo") String orderNo, @Param("site") String site, @@ -142,6 +143,7 @@ public interface PODetailMapper extends BaseMapper { @Param("newShipQty") BigDecimal newShipQty, @Param("status") String status, @Param("edit") String edit, - @Param("endPlanner") String endPlanner); + @Param("endPlanner") String endPlanner, + @Param("flexid") String flexid); } diff --git a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java index 8392bd1..252dadf 100644 --- a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java +++ b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java @@ -597,7 +597,8 @@ public class PODetailServiceImpl extends ServiceImpl i newShipQty, newStatus, currentTimeStr, - currentUserName + currentUserName, + normalized.getFlexid() ); if (updateCount == 0) { throw new RuntimeException("发货提交失败,请刷新后重试"); @@ -625,6 +626,7 @@ public class PODetailServiceImpl extends ServiceImpl i normalized.setItemNo(itemNo); normalized.setOrderQty(model.getOrderQty()); normalized.setShipQty(model.getShipQty()); + normalized.setFlexid(StringUtils.hasText(model.getFlexid()) ? model.getFlexid().trim() : null); return normalized; } diff --git a/src/main/java/com/xujie/modules/order/vo/PoShipSubmitVo.java b/src/main/java/com/xujie/modules/order/vo/PoShipSubmitVo.java index 94905c2..59d2a17 100644 --- a/src/main/java/com/xujie/modules/order/vo/PoShipSubmitVo.java +++ b/src/main/java/com/xujie/modules/order/vo/PoShipSubmitVo.java @@ -32,4 +32,7 @@ public class PoShipSubmitVo { @ApiModelProperty(value = "本次发货数量(shipQty)") private BigDecimal shipQty; + + @ApiModelProperty(value = "发货单号(c_flexid,选填;填写则回写,不填则不更新)") + private String flexid; } diff --git a/src/main/resources/mapper/order/PODetailMapper.xml b/src/main/resources/mapper/order/PODetailMapper.xml index 6c806c7..bbc7a81 100644 --- a/src/main/resources/mapper/order/PODetailMapper.xml +++ b/src/main/resources/mapper/order/PODetailMapper.xml @@ -633,7 +633,8 @@ 发货提交回写: 1) 支持更新订单数量(qty); 2) 累加后的累计发货数量写入 c_ship_qty; - 3) 同步更新订单状态与审计字段。 + 3) 同步更新订单状态与审计字段; + 4) flexid 非空时才回写发货单号 c_flexid,为空则不更新。 --> UPDATE PODetail @@ -642,6 +643,9 @@ status = #{status}, c_edit = #{edit}, c_end_planner = #{endPlanner} + + , c_flexid = #{flexid} + WHERE order_no = #{orderNo} AND site = #{site} AND item_no = #{itemNo}