From fd155e1ccdcf5f558dc701420658af17799eff5e Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 13 三月 2023 10:56:46 +0800
Subject: [PATCH] Revert "重大更新:相同编码和型号,如果类别不同,区别为不同物料.处理方式为:型号内追加类别,最终以不同型号处理区分物料. 不影响 编码和型号确定唯一物料这一基本规则前提下区分类别不同的同编码和型号的物料"
---
src/main/java/com/whyc/controller/MaterialCodeDictionaryController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/controller/MaterialCodeDictionaryController.java b/src/main/java/com/whyc/controller/MaterialCodeDictionaryController.java
index 1921319..9173cb9 100644
--- a/src/main/java/com/whyc/controller/MaterialCodeDictionaryController.java
+++ b/src/main/java/com/whyc/controller/MaterialCodeDictionaryController.java
@@ -1,5 +1,7 @@
package com.whyc.controller;
+import com.github.pagehelper.PageInfo;
+import com.whyc.dto.Response;
import com.whyc.pojo.MaterialCodeDictionary;
import com.whyc.service.MaterialCodeDictionaryService;
import io.swagger.annotations.Api;
@@ -9,8 +11,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.io.File;
import java.io.IOException;
import java.util.LinkedList;
@@ -24,6 +28,13 @@
@Autowired
private MaterialCodeDictionaryService service;
+ @GetMapping("codeList")
+ @ApiOperation(value = "鏌ヨ缂栫爜鍒楄〃鍒嗛〉",notes = "level:0(鏌ヨ鎵�鏈�),1(涓�绾х紪鐮�),2(浜岀骇缂栫爜)")
+ public Response<PageInfo<MaterialCodeDictionary>> getCodeList(@RequestParam int pageNum,@RequestParam int pageSize,@RequestParam int level){
+ PageInfo<MaterialCodeDictionary> codeList = service.getCodeList(pageNum, pageSize, level);
+ return new Response<PageInfo<MaterialCodeDictionary>>().set(1,codeList);
+ }
+
//瑙ｆ瀽瀵煎叆鏁版嵁,鍙娇鐢ㄤ竴娆�
@Deprecated
@GetMapping("importData")
--
Gitblit v1.9.1