|
|
@@ -533,12 +533,14 @@ public class MesRepairController extends BaseController {
|
|
|
@RequestMapping(value = "ulist")
|
|
|
@ResponseBody
|
|
|
public CommonResp ulist(HttpServletRequest request, HttpServletResponse response) {
|
|
|
+ String lineSn = request.getParameter("lineSn");//产线编号
|
|
|
CommonResp<Map<String, Object>> resp = new CommonResp<>();
|
|
|
Map<String, Object> map = MapUtils.newHashMap();
|
|
|
User user = UserUtils.getUser();
|
|
|
|
|
|
MesRepair mesRepair = new MesRepair();
|
|
|
mesRepair.setCreateBy(user.getUserCode());
|
|
|
+ mesRepair.setLineSn(lineSn);
|
|
|
mesRepair.setPage(new Page<>(request, response));
|
|
|
Page<MesRepair> list = mesRepairService.findPage(mesRepair);
|
|
|
map.put("lists", list);
|
|
|
@@ -589,6 +591,7 @@ public class MesRepairController extends BaseController {
|
|
|
CommonResp<MesRepair> resp = new CommonResp<>();
|
|
|
resp.setResult(Global.FALSE);
|
|
|
String sn = req.getParameter("sn");
|
|
|
+ String lineSn = req.getParameter("lineSn");
|
|
|
String fxOprno = req.getParameter("fxOprno");
|
|
|
String oprno = req.getParameter("oprno");
|
|
|
String itemId = req.getParameter("itemId");
|
|
|
@@ -611,9 +614,15 @@ public class MesRepairController extends BaseController {
|
|
|
resp.setMessage("参数错误");
|
|
|
return resp;
|
|
|
}
|
|
|
+ //根据产线编号查询对应线信息
|
|
|
+
|
|
|
+ String infoCate = mesLineService.findInfoCate(lineSn);
|
|
|
+
|
|
|
+
|
|
|
|
|
|
MesProduct mesProduct = new MesProduct();
|
|
|
mesProduct.setSn(sn);
|
|
|
+ mesProduct.setCate(infoCate);
|
|
|
MesProduct pd = mesProductService.findInfo(mesProduct);
|
|
|
if(ObjectUtils.isEmpty(pd)){
|
|
|
resp.setMessage("产品信息不存在");
|
|
|
@@ -670,4 +679,4 @@ public class MesRepairController extends BaseController {
|
|
|
return resp;
|
|
|
|
|
|
}
|
|
|
-}
|
|
|
+}
|