Browse Source

feat(order): 添加发货单号选填功能支持

- 在PODetailMapper中增加flexid参数用于可选回写发货单号
- 更新updateShipProgress方法支持条件性更新c_flexid字段
- 在PODetailServiceImpl中传递flexid参数到数据更新操作
- 为PoShipSubmitVo添加flexid字段并添加文档说明
- 实现发货单号非空时才更新数据库的逻辑控制
master
qiankanghui 2 months ago
parent
commit
b1a2fad16e
  1. 4
      src/main/java/com/xujie/modules/order/dao/PODetailMapper.java
  2. 4
      src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java
  3. 3
      src/main/java/com/xujie/modules/order/vo/PoShipSubmitVo.java
  4. 6
      src/main/resources/mapper/order/PODetailMapper.xml

4
src/main/java/com/xujie/modules/order/dao/PODetailMapper.java

@ -134,6 +134,7 @@ public interface PODetailMapper extends BaseMapper<PODetail> {
/**
* 提交发货时回写订单数量、累计发货数量和状态,同时记录修改时间与修改人。
* flexid 为选填发货单号,非空时同步回写 c_flexid,为空则不更新该字段。
*/
int updateShipProgress(@Param("orderNo") String orderNo,
@Param("site") String site,
@ -142,6 +143,7 @@ public interface PODetailMapper extends BaseMapper<PODetail> {
@Param("newShipQty") BigDecimal newShipQty,
@Param("status") String status,
@Param("edit") String edit,
@Param("endPlanner") String endPlanner);
@Param("endPlanner") String endPlanner,
@Param("flexid") String flexid);
}

4
src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java

@ -597,7 +597,8 @@ public class PODetailServiceImpl extends ServiceImpl<PODetailMapper, PODetail> i
newShipQty,
newStatus,
currentTimeStr,
currentUserName
currentUserName,
normalized.getFlexid()
);
if (updateCount == 0) {
throw new RuntimeException("发货提交失败,请刷新后重试");
@ -625,6 +626,7 @@ public class PODetailServiceImpl extends ServiceImpl<PODetailMapper, PODetail> i
normalized.setItemNo(itemNo);
normalized.setOrderQty(model.getOrderQty());
normalized.setShipQty(model.getShipQty());
normalized.setFlexid(StringUtils.hasText(model.getFlexid()) ? model.getFlexid().trim() : null);
return normalized;
}

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

6
src/main/resources/mapper/order/PODetailMapper.xml

@ -633,7 +633,8 @@
发货提交回写:
1) 支持更新订单数量(qty);
2) 累加后的累计发货数量写入 c_ship_qty;
3) 同步更新订单状态与审计字段。
3) 同步更新订单状态与审计字段;
4) flexid 非空时才回写发货单号 c_flexid,为空则不更新。
-->
<update id="updateShipProgress">
UPDATE PODetail
@ -642,6 +643,9 @@
status = #{status},
c_edit = #{edit},
c_end_planner = #{endPlanner}
<if test="flexid != null and flexid != ''">
, c_flexid = #{flexid}
</if>
WHERE order_no = #{orderNo}
AND site = #{site}
AND item_no = #{itemNo}

Loading…
Cancel
Save