From 2cb2fbb2663d975c3812def5c49c8b7495bfb6aa Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期三, 24 十二月 2025 09:58:09 +0800
Subject: [PATCH] 后端接口配合调整
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java | 96 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 96 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
new file mode 100644
index 0000000..09194cd
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
@@ -0,0 +1,96 @@
+package com.vincent.rsf.server.manager.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.common.utils.FieldsUtils;
+import com.vincent.rsf.server.manager.entity.Task;
+import com.vincent.rsf.server.manager.entity.TaskItem;
+import com.vincent.rsf.server.manager.entity.WkOrder;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.service.OutStockService;
+import com.vincent.rsf.server.manager.service.TaskService;
+import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+@RestController
+@Api(tags = "澶囨枡鍗�")
+public class MatPreparationController extends BaseController {
+
+ Logger logger = LoggerFactory.getLogger(OutStockController.class);
+
+ @Resource
+ private TaskService taskService;
+
+ @PostMapping("/preparation/page")
+ public R page(@RequestBody Map<String, Object> map) {
+
+// JSONObject jsonObject = new JSONObject(map);
+// jsonObject.put("orderCode", "BL25090927787678");
+// jsonObject.put("orderStatus", 1);
+// jsonObject.put("orderTime", new Date());
+// jsonObject.put("anfme", 100);
+// List<JSONObject> list = new ArrayList<>();
+// list.add(jsonObject);
+//
+// return R.ok().add(list);
+
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
+ QueryWrapper<Task> queryWrapper = pageParam.buildWrapper(true);
+ return R.ok().add(taskService.page(pageParam, queryWrapper));
+ }
+
+// @PreAuthorize("hasAuthority('manager:outStock:list')")
+ @PostMapping("/preparation/list")
+ public R list(@RequestBody Map<String, Object> map) {
+
+ return R.ok().add(taskService.list());
+ }
+
+
+// @PreAuthorize("hasAuthority('manager:taskItem:list')")
+ @PostMapping("/preparationItem/page")
+ public R itemPage(@RequestBody Map<String, Object> map) {
+// BaseParam baseParam = buildParam(map, BaseParam.class);
+// PageParam<TaskItem, BaseParam> pageParam = new PageParam<>(baseParam, TaskItem.class);
+// /**鎷兼帴鎵╁睍瀛楁*/
+// PageParam<TaskItem, BaseParam> page = taskItemService.page(pageParam, pageParam.buildWrapper(true));
+// List<TaskItem> records = page.getRecords();
+// for (TaskItem record : records) {
+// if (!Objects.isNull(record.getFieldsIndex())) {
+// Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+// record.setExtendFields(fields);
+// }
+// }
+// page.setRecords(records);
+
+
+ JSONObject jsonObject = new JSONObject(map);
+ jsonObject.put("matnrCode", "BL25090927787678");
+ jsonObject.put("maktx", "鎷夋潌");
+ jsonObject.put("unit", "涓�");
+ jsonObject.put("spec", "閾濆悎閲� 閾惰壊");
+ jsonObject.put("model", "澶�");
+ jsonObject.put("anfme", 100);
+ jsonObject.put("workQty", 60);
+ jsonObject.put("status", 11);
+ List<JSONObject> list = new ArrayList<>();
+ list.add(jsonObject);
+ return R.ok().add(list);
+ }
+
+}
--
Gitblit v1.9.1