From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/controller/SalesOrderController.java | 125 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 125 insertions(+), 0 deletions(-)
diff --git a/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/controller/SalesOrderController.java b/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/controller/SalesOrderController.java
new file mode 100644
index 0000000..985fb60
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/controller/SalesOrderController.java
@@ -0,0 +1,125 @@
+package jnpf.controller;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jnpf.base.ActionResult;
+import jnpf.base.controller.SuperController;
+import jnpf.constant.MsgCode;
+import jnpf.entity.SalesOrderEntity;
+import jnpf.entity.SalesOrderEntryEntity;
+import jnpf.exception.WorkFlowException;
+import jnpf.model.salesorder.SalesOrderEntryEntityInfoModel;
+import jnpf.model.salesorder.SalesOrderForm;
+import jnpf.model.salesorder.SalesOrderInfoVO;
+import jnpf.service.SalesOrderService;
+import jnpf.util.GeneraterSwapUtil;
+import jnpf.util.JsonUtil;
+import jnpf.util.StringUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 閿�鍞鍗�
+ *
+ * @author JNPF寮�鍙戝钩鍙扮粍
+ * @version V3.1.0
+ * @copyright 寮曡繄淇℃伅鎶�鏈湁闄愬叕鍙�
+ * @date 2019骞�9鏈�29鏃� 涓婂崍9:18
+ */
+@Tag(name = "閿�鍞鍗�", description = "SalesOrder")
+@RestController
+@RequestMapping("/Form/SalesOrder")
+@RequiredArgsConstructor
+public class SalesOrderController extends SuperController<SalesOrderService, SalesOrderEntity> {
+
+
+ private final SalesOrderService salesOrderService;
+
+ private final GeneraterSwapUtil generaterSwapUtil;
+
+ /**
+ * 鑾峰彇閿�鍞鍗曚俊鎭�
+ *
+ * @param id 涓婚敭鍊�
+ * @return
+ */
+ @Operation(summary = "鑾峰彇閿�鍞鍗曚俊鎭�")
+ @GetMapping("/{id}")
+ @Parameter(name = "id", description = "涓婚敭", required = true)
+ public ActionResult<Object> info(@PathVariable("id") String id) {
+ SalesOrderEntity entity = salesOrderService.getInfo(id);
+ List<SalesOrderEntryEntity> entityList = salesOrderService.getSalesEntryList(id);
+ SalesOrderInfoVO vo = JsonUtil.getJsonToBean(entity, SalesOrderInfoVO.class);
+ if (vo != null) {
+ vo.setEntryList(JsonUtil.getJsonToList(entityList, SalesOrderEntryEntityInfoModel.class));
+ }
+ return ActionResult.success(vo);
+ }
+
+ /**
+ * 鏂板缓閿�鍞鍗�
+ *
+ * @param salesOrderForm 琛ㄥ崟瀵硅薄
+ * @return
+ * @throws WorkFlowException
+ */
+ @Operation(summary = "鏂板缓閿�鍞鍗�")
+ @PostMapping("/{id}")
+ @Parameter(name = "id", description = "涓婚敭", required = true)
+ @Parameter(name = "salesOrderForm", description = "閿�鍞ā鍨�", required = true)
+ public ActionResult<Object> create(@RequestBody SalesOrderForm salesOrderForm, @PathVariable("id") String id) throws WorkFlowException {
+ SalesOrderEntity sales = JsonUtil.getJsonToBean(salesOrderForm, SalesOrderEntity.class);
+ List<SalesOrderEntryEntity> salesEntryList = JsonUtil.getJsonToList(salesOrderForm.getEntryList(), SalesOrderEntryEntity.class);
+ salesOrderService.submit(id, sales, salesEntryList, salesOrderForm);
+ return ActionResult.success(MsgCode.SU006.get());
+ }
+
+ /**
+ * 淇敼閿�鍞鍗�
+ *
+ * @param salesOrderForm 琛ㄥ崟瀵硅薄
+ * @param id 涓婚敭
+ * @return
+ * @throws WorkFlowException
+ */
+ @Operation(summary = "淇敼閿�鍞鍗�")
+ @PutMapping("/{id}")
+ @Parameter(name = "id", description = "涓婚敭", required = true)
+ @Parameter(name = "salesOrderForm", description = "閿�鍞ā鍨�", required = true)
+ public ActionResult<Object> update(@RequestBody SalesOrderForm salesOrderForm, @PathVariable("id") String id) throws WorkFlowException {
+ SalesOrderEntity sales = JsonUtil.getJsonToBean(salesOrderForm, SalesOrderEntity.class);
+ sales.setId(id);
+ List<SalesOrderEntryEntity> salesEntryList = JsonUtil.getJsonToList(salesOrderForm.getEntryList(), SalesOrderEntryEntity.class);
+ salesOrderService.submit(id, sales, salesEntryList, salesOrderForm);
+ return ActionResult.success(MsgCode.SU006.get());
+ }
+
+ /**
+ * 鍒犻櫎閿�鍞鍗曚俊鎭�
+ *
+ * @param id 涓婚敭
+ */
+ @Operation(summary = "鍒犻櫎閿�鍞鍗曚俊鎭�")
+ @DeleteMapping("/{id}")
+ @Parameter(name = "id", description = "涓婚敭", required = true)
+ public ActionResult delete(@PathVariable("id") String id, @RequestParam(name = "forceDel", defaultValue = "false") Boolean forceDel) {
+ SalesOrderEntity entity = salesOrderService.getInfo(id);
+ if (null != entity) {
+ if (Boolean.FALSE.equals(forceDel)) {
+ String errMsg = generaterSwapUtil.deleteFlowTask(entity.getId());
+ if (StringUtils.isNotBlank(errMsg)) {
+ throw new IllegalArgumentException(errMsg);
+ }
+ }
+ salesOrderService.delete(entity);
+ return ActionResult.success(MsgCode.SU003.get());
+ }
+ return ActionResult.fail(MsgCode.FA003.get());
+ }
+}
--
Gitblit v1.8.0