【奥维-赛力斯】

src/main/java/com/uas/eis/controller/SERESController.java

@@ -48,6 +48,7 @@ public class SERESController {
      *
      * */
     @PostMapping("/api/ZHJK/getInventory")
+    @ResponseBody
     public Map<String, Object> getInventory(HttpServletRequest request, @RequestBody String param) throws IOException {
         SpObserver.putSp("AW_ZHJK");
         Map<String, Object> modelMap =seresService.getERPStock(param);

src/main/java/com/uas/eis/serviceImpl/SERESServiceImpl.java

@@ -166,28 +166,32 @@ public class SERESServiceImpl implements SERESService {
                 SqlRowList rs_det = baseDao.queryForRowSet("select StockCode,StockName,StockAddress,FGQualifiedStock,FGNonQualifiedStock from ZHJK_SERES_STOCK_VIEW where "+prcon+" order by StockCode");
                 while (rs_det.next()){
                     SeresStockDet detInfo=new SeresStockDet();
-                    detInfo.setStockCode(rs.getString("StockCode"));
-                    detInfo.setStockName(rs.getString("StockName"));
-                    detInfo.setStockAddress(rs.getString("StockAddress"));
-                    detInfo.setFGQualifiedStock(rs.getGeneralDouble("FGQualifiedStock"));
-                    detInfo.setFGNonQualifiedStock(rs.getGeneralDouble("FGNonQualifiedStock"));
+                    detInfo.setStockCode(rs_det.getString("StockCode"));
+                    detInfo.setStockName(rs_det.getString("StockName"));
+                    detInfo.setStockAddress(rs_det.getString("StockAddress"));
+                    detInfo.setFGQualifiedStock(rs_det.getGeneralDouble("FGQualifiedStock"));
+                    detInfo.setFGNonQualifiedStock(rs_det.getGeneralDouble("FGNonQualifiedStock"));
                     det.add(detInfo);
                 }
+                seresStock.setStockList(det);
                 data.add(seresStock);
             }
-            System.out.println(JSONArray.toJSONString(data));
+            String resp=JSONArray.toJSONString(data);
+            System.out.println(resp);
             modelMap.put("code",0);
             modelMap.put("message","成功");
-            modelMap.put("data",JSONArray.toJSONString(data));
+            modelMap.put("data",data);
         } else if (StringUtil.hasText(MaterialCode_Q)) {
             //物料号不存在
             modelMap.put("code",1);
             modelMap.put("message","物料号不存在");
+            modelMap.put("data",data);
             System.out.println("物料号不存在");
         }else{
             //未配置对照关系
             modelMap.put("code",1);
             modelMap.put("message","未配置对照关系");
+            modelMap.put("data",data);
             System.out.println("未配置对照关系");
         }
         return modelMap;