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/ProductclassifyController.java |  130 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 130 insertions(+), 0 deletions(-)

diff --git a/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/controller/ProductclassifyController.java b/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/controller/ProductclassifyController.java
new file mode 100644
index 0000000..7931247
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/controller/ProductclassifyController.java
@@ -0,0 +1,130 @@
+package jnpf.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Parameter;
+import jnpf.base.controller.SuperController;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import jnpf.base.ActionResult;
+import jnpf.base.vo.ListVO;
+import jnpf.constant.MsgCode;
+import jnpf.entity.ProductclassifyEntity;
+import jnpf.model.productclassify.*;
+import jnpf.service.ProductclassifyService;
+import jnpf.util.JsonUtil;
+import jnpf.util.treeutil.SumTree;
+import jnpf.util.treeutil.TreeDotUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import jakarta.validation.Valid;
+import java.util.List;
+
+/**
+ * 浜у搧鍒嗙被
+ *
+ * @鐗堟湰锛� V3.1.0
+ * @鐗堟潈锛� 寮曡繄淇℃伅鎶�鏈湁闄愬叕鍙革紙https://www.jnpfsoft.com锛�
+ * @浣滆�咃細 JNPF寮�鍙戝钩鍙扮粍
+ * @鏃ユ湡锛� 2021-07-10 14:34:04
+ */
+@Slf4j
+@RestController
+@Tag(name = "浜у搧鍒嗙被", description = "Classify")
+@RequestMapping("/saleOrder/Classify")
+@RequiredArgsConstructor
+public class ProductclassifyController extends SuperController<ProductclassifyService, ProductclassifyEntity> {
+
+    private final ProductclassifyService productclassifyService;
+
+    /**
+     * 鍒楄〃
+     *
+     * @return
+     */
+    @GetMapping
+    @Operation(summary = "鍒楄〃")
+    @SaCheckPermission("extend.orderDemo")
+    public ActionResult<ListVO<ProductclassifyListVO>> list() {
+        List<ProductclassifyEntity> data = productclassifyService.getList();
+        List<ProductclassifyModel> modelList = JsonUtil.getJsonToList(data, ProductclassifyModel.class);
+        List<SumTree<ProductclassifyModel>> sumTrees = TreeDotUtils.convertListToTreeDot(modelList);
+        List<ProductclassifyListVO> list = JsonUtil.getJsonToList(sumTrees, ProductclassifyListVO.class);
+        ListVO<ProductclassifyListVO> vo = new ListVO<>();
+        vo.setList(list);
+        return ActionResult.success(vo);
+    }
+
+    /**
+     * 鍒涘缓
+     *
+     * @param classifyCrForm 鍒嗙被妯″瀷
+     * @return
+     */
+    @PostMapping
+    @Operation(summary = "鍒涘缓")
+    @Parameter(name = "classifyCrForm", description = "鍒嗙被妯″瀷", required = true)
+    @SaCheckPermission("extend.orderDemo")
+    public ActionResult<Object> create(@RequestBody @Valid ProductclassifyCrForm classifyCrForm) {
+        ProductclassifyEntity entity = JsonUtil.getJsonToBean(classifyCrForm, ProductclassifyEntity.class);
+        productclassifyService.create(entity);
+        return ActionResult.success(MsgCode.SU001.get());
+    }
+
+    /**
+     * 淇℃伅
+     *
+     * @param id 涓婚敭
+     * @return
+     */
+    @GetMapping("/{id}")
+    @Operation(summary = "淇℃伅")
+    @Parameter(name = "id", description = "涓婚敭", required = true)
+    @SaCheckPermission("extend.orderDemo")
+    public ActionResult<ProductclassifyInfoVO> info(@PathVariable("id") String id) {
+        ProductclassifyEntity entity = productclassifyService.getInfo(id);
+        ProductclassifyInfoVO vo = JsonUtil.getJsonToBean(entity, ProductclassifyInfoVO.class);
+        return ActionResult.success(vo);
+    }
+
+    /**
+     * 鏇存柊
+     *
+     * @param id             涓婚敭
+     * @param classifyUpForm 鍒嗙被妯″瀷
+     * @return
+     */
+    @PutMapping("/{id}")
+    @Operation(summary = "鏇存柊")
+    @Parameter(name = "id", description = "涓婚敭", required = true)
+    @Parameter(name = "classifyUpForm", description = "鍒嗙被妯″瀷", required = true)
+    @SaCheckPermission("extend.orderDemo")
+    public ActionResult<Object> update(@PathVariable("id") String id, @RequestBody @Valid ProductclassifyUpForm classifyUpForm) {
+        ProductclassifyEntity entity = JsonUtil.getJsonToBean(classifyUpForm, ProductclassifyEntity.class);
+        boolean ok = productclassifyService.update(id, entity);
+        if (ok) {
+            return ActionResult.success(MsgCode.SU004.get());
+        }
+        return ActionResult.fail(MsgCode.FA002.get());
+    }
+
+    /**
+     * 鍒犻櫎
+     *
+     * @param id 涓婚敭
+     * @return
+     */
+    @DeleteMapping("/{id}")
+    @Operation(summary = "鍒犻櫎")
+    @Parameter(name = "id", description = "涓婚敭", required = true)
+    @SaCheckPermission("extend.orderDemo")
+    public ActionResult<Object> delete(@PathVariable("id") String id) {
+        ProductclassifyEntity entity = productclassifyService.getInfo(id);
+        if (entity != null) {
+            productclassifyService.delete(entity);
+        }
+        return ActionResult.success(MsgCode.SU003.get());
+    }
+
+}

--
Gitblit v1.8.0