diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java index 1981094..604ae60 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java @@ -236,6 +236,18 @@ public class SaleOrderController { @Operation(summary = "更新销售订单") @PreAuthorize("@ss.hasPermission('oms:sale-order:update')") public CommonResult updateSaleOrderEntry(@Valid @RequestBody SaleOrderSaveReqVO updateReqVO) { + //拼接销售合约编码 + String saleContractCodePrefix = updateReqVO.getSaleContractCodePrefix(); + String saleContractCode = updateReqVO.getSaleContractCode(); + if(StringUtils.isBlank(saleContractCodePrefix)){ + saleContractCodePrefix = ""; + } + if(StringUtils.isNotBlank(saleContractCode)){ + saleContractCode = saleContractCode.replaceAll("[^0-9]", ""); + }else { + saleContractCode = ""; + } + updateReqVO.setSaleContractCode(saleContractCodePrefix+saleContractCode); saleOrderService.updateSaleOrder(updateReqVO); return success(true); } diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/deliveryorder/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/deliveryorder/index.vue index ef4da47..ea92e8b 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/oms/deliveryorder/index.vue +++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/deliveryorder/index.vue @@ -172,7 +172,7 @@ :formatter="dateFormatter" width="180px" /> - +