From cbb0dfaec496d441bbf4287ca8ae85c2776e50ed Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 13 三月 2025 13:12:39 +0800 Subject: [PATCH] #修改 1. 收货通知单明细模板修改 2. 收货通知单添加动态扩展字段 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java index 02f32e6..38b052e 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.common.utils.ExcelUtil; import com.vincent.rsf.server.common.annotation.OperationLog; import com.vincent.rsf.server.common.domain.BaseParam; @@ -11,13 +12,17 @@ import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.entity.AsnOrder; import com.vincent.rsf.server.manager.service.AsnOrderService; +import com.vincent.rsf.server.system.constant.SerialRuleCode; import com.vincent.rsf.server.system.controller.BaseController; +import com.vincent.rsf.server.system.utils.SerialRuleUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import javax.mail.Multipart; import javax.servlet.http.HttpServletResponse; import java.util.*; @@ -60,9 +65,11 @@ @ApiOperation("淇濆瓨") public R save(@RequestBody AsnOrder asnOrder) { asnOrder.setCreateBy(getLoginUserId()); - asnOrder.setCreateTime(new Date()); asnOrder.setUpdateBy(getLoginUserId()); - asnOrder.setUpdateTime(new Date()); + String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, asnOrder); + if (!Objects.isNull(code)) { + asnOrder.setCode(code); + } if (!asnOrderService.save(asnOrder)) { return R.error("Save Fail"); } @@ -132,6 +139,4 @@ return R.error("涓�閿笂鎶ュけ璐ワ紒锛�"); } } - - } -- Gitblit v1.9.1