·

src/com/uas/mes/api/pda/PdaSpmController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
+import java.util.*;
 
 @RestController("api.pdaSpmController")
 @RequestMapping("/api/pda/spm")
@@ -187,18 +187,21 @@ public class PdaSpmController extends BaseApiController{
     }
 
     @RequestMapping(value="/checkmixing.action",method = RequestMethod.POST)
-    private ModelMap checkmixing(String barcode){
+    public ModelMap checkmixing(String barcode){
         return success(pdaSpmService.checkmixing(parseBarCode(barcode)));
     }
 
     @RequestMapping(value="/mixing.action",method = RequestMethod.POST)
-    private ModelMap mixing(String barcode){
+    public ModelMap mixing(String barcode){
         pdaSpmService.mixing(parseBarCode(barcode));
         return success();
     }
 
     @RequestMapping(value="/getLine.action",method = RequestMethod.POST)
-    private ModelMap getLine(){
-        return success(pdaSpmService.getLine());
+    public Map<String, Object> getLine(){
+        Map<String, Object> list =new HashMap<String, Object>();
+        list.put("data",pdaSpmService.getLine());
+        list.put("success",true);
+        return list;
     }
 }

src/com/uas/mes/pda/service/PdaSpmService.java

@@ -33,7 +33,7 @@ public interface PdaSpmService {
 
     void mixing(String barcode);
 
-    Map<String, Object> getLine();
+    List<Map<String, Object>> getLine();
 
     List<Map<String,Object>> getMPMLog(String barcode);