Просмотр исходного кода

feature:提供一下查询全部品项的接口

yingjian.wu 3 месяцев назад
Родитель
Сommit
099bf929ef

+ 13 - 0
src/main/java/com/qlm/controller/jinzai/ItemNewController.java

@@ -3,6 +3,7 @@ package com.qlm.controller.jinzai;
 import java.io.InputStream;
 import java.io.InputStream;
 import java.net.URLEncoder;
 import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Files;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -248,4 +249,16 @@ public class ItemNewController extends CommonController {
         }
         }
         renderJson(apiResponse);
         renderJson(apiResponse);
     }
     }
+
+    public void getItemAll(){
+        ApiResponse apiResponse;
+        List<Record> list = Db.find("select id,item_name from t_jz_item where Status =1");
+        if(CollUtil.isEmpty(list)){
+            apiResponse = ApiResponse.success(new ArrayList<>());
+            renderJson(apiResponse);
+            return;
+        }
+        apiResponse = ApiResponse.success(list);
+        renderJson(apiResponse);
+    }
 }
 }

+ 2 - 2
src/main/webapp/page/jinzai/itemChangeRecord.jsp

@@ -227,7 +227,6 @@
         loadFactories();
         loadFactories();
         loadWorkshopsByFactoryId();
         loadWorkshopsByFactoryId();
         loadProductionLinesByWorkshopId();
         loadProductionLinesByWorkshopId();
-        loadItems();
 
 
         table = $('#table').bootstrapTable("destroy");
         table = $('#table').bootstrapTable("destroy");
         initTable();
         initTable();
@@ -370,7 +369,7 @@
     // 加载品相数据
     // 加载品相数据
     function loadItems() {
     function loadItems() {
         $.ajax({
         $.ajax({
-            url: '${ctx}/qrcodeApply/getItemAll',
+            url: '${ctx}/itemNew/getItemAll',
             type: 'POST',
             type: 'POST',
             dataType: 'json',
             dataType: 'json',
             beforeSend: function () {
             beforeSend: function () {
@@ -660,6 +659,7 @@
 
 
     // 加载模态框中的品相数据
     // 加载模态框中的品相数据
     function loadModalItems() {
     function loadModalItems() {
+        loadItems();
         const modalAfterItemSelect = $('#modalAfterItemId');
         const modalAfterItemSelect = $('#modalAfterItemId');
         
         
         modalAfterItemSelect.empty().append('<option value="">请选择修改后品相</option>');
         modalAfterItemSelect.empty().append('<option value="">请选择修改后品相</option>');