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/limsController/LimsBizConfigController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/limsController/LimsBizConfigController.java b/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/limsController/LimsBizConfigController.java
new file mode 100644
index 0000000..af44f24
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/limsController/LimsBizConfigController.java
@@ -0,0 +1,60 @@
+package jnpf.limsController;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jnpf.limsEntity.ZhiliangBiaozhunGuanliEntity;
+import jnpf.limsService.ZhiliangBiaozhunGuanliService;
+import jnpf.util.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@Slf4j
+@Tag(name = "lims鍚庡彴鍩虹閰嶇疆鎺ュ彛", description = "璐ㄩ噺鏍囧噯绛夊熀纭�閰嶇疆鏌ヨ鍏ュ彛")
+@RestController
+@RequestMapping("/lims/biz/config")
+public class LimsBizConfigController {
+
+ @Autowired
+ private ZhiliangBiaozhunGuanliService zhiliangBiaozhunGuanliService;
+
+ // ======================== 璐ㄩ噺鏍囧噯 ========================
+
+ /**
+ * 閫氳繃鏍峰搧 ID 鏌ヨ璐ㄩ噺鏍囧噯锛堝崟鏉★級
+ */
+ @Operation(summary = "閫氳繃鏍峰搧ID鏌ヨ璐ㄩ噺鏍囧噯")
+ @GetMapping("/zhiliang-biaozhun/get-by-yangpin-id")
+ public R<ZhiliangBiaozhunGuanliEntity> getZhiliangBiaozhunByYangpinId(
+ @RequestParam("yangpinId") String yangpinId) {
+ if (yangpinId == null || yangpinId.isEmpty()) {
+ return R.error("鏍峰搧ID涓嶈兘涓虹┖");
+ }
+ ZhiliangBiaozhunGuanliEntity entity = zhiliangBiaozhunGuanliService.findByYangpinId(yangpinId);
+ if (entity == null) {
+ return R.error("鏈壘鍒板搴旂殑璐ㄩ噺鏍囧噯鏁版嵁");
+ }
+ return R.success(entity);
+ }
+
+ /**
+ * 璐ㄩ噺鏍囧噯鐗堟湰鍗囩骇锛氭妸浼犲叆鐨� formData锛堜富琛� + 鍔ㄦ�� tableFieldXxxxxx 瀛愯〃锛夋暣浣撳鍒朵负鏂颁竴浠斤紝
+ * 鏂颁富琛� biz_enabled=disabled锛屾柊瀛愯〃 f_foreign_id 鍏宠仈鏂颁富琛� f_id锛屽巻鍙叉暟鎹笉鍔ㄣ��
+ */
+ @Operation(summary = "璐ㄩ噺鏍囧噯鐗堟湰鍗囩骇")
+ @PostMapping("/zhiliang-biaozhun/version-upgrade")
+ public R<String> versionUpgradeZhiliangBiaozhun(@RequestBody Map<String, Object> formData) {
+ String newId = zhiliangBiaozhunGuanliService.versionUpgrade(formData);
+ if (newId == null) {
+ return R.success();
+ }
+ return R.success("鍗囩骇鎴愬姛", newId);
+ }
+}
--
Gitblit v1.8.0