提货列表

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApplyPickController.java

@@ -203,7 +203,7 @@ public class ApplyPickController {
             approvalProductionItem.setProductionId(ap.getProductionId());
             List<ApprovalProductionItem> approvalProductionItemList = approvalProductionService.getApprovalProductionItemList(approvalProductionItem);
             ap.setListProductionItem(approvalProductionItemList);
-            rj.addResponseKeyValue("ApprovalProduction",ap);
+            rj.addResponseKeyValue("approvalProduction",ap);
         }
 
         /*获取当前登录人查看当前审批的记录，判断状态*/
@@ -257,4 +257,5 @@ public class ApplyPickController {
         }
         return rj;
     }
+
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

@@ -9,6 +9,7 @@ import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.faces.approval.ApplyPickService;
 import com.iamberry.rst.faces.approval.ApprovalOrderService;
+import com.iamberry.rst.faces.approval.ApprovalProductionService;
 import com.iamberry.rst.faces.approval.ApprovalTaskService;
 import com.iamberry.rst.faces.sys.SysService;
 import com.iamberry.wechat.core.entity.WechatUtils;
@@ -51,6 +52,8 @@ public class ApprovalController {
     private SysService sysService;
     @Autowired
     private ApplyPickService applyPickService;
+    @Autowired
+    private ApprovalProductionService approvalProductionService;
     @SuppressWarnings("restriction")
     private BASE64Decoder decoder = new BASE64Decoder();
     /**
@@ -679,4 +682,30 @@ public class ApprovalController {
                 "url");
         return rj;
     }
+
+
+    /**
+     *  查询入库记录
+     * @param approvalId
+     * @return productionItem
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping(value = "/getProductionItem")
+    public ResponseJson getProductionItem(HttpServletRequest request,Integer approvalId) throws Exception {
+        ResponseJson rj =new ResponseJson(200, "查询成功", 200);
+        if(approvalId == null){
+            return  ResponseJson.getFAILURE();
+        }
+        ApprovalProduction  approvalProduction = new ApprovalProduction();
+        approvalProduction.setApprovalId(approvalId);
+        List<ApprovalProduction> approvalProductionList = approvalProductionService.getApprovalProductionList(approvalProduction);
+        approvalProduction = approvalProductionList.get(0);
+        ApprovalProductionItem approvalProductionItem = new ApprovalProductionItem();
+        approvalProductionItem.setProductionId(approvalProduction.getProductionId());
+        List<ApprovalProductionItem> approvalProductionItemList = approvalProductionService.getApprovalProductionItemList(approvalProductionItem);
+        rj.addResponseKeyValue("apItemList",approvalProductionItemList);
+        return rj;
+    }
+
 }