|
|
@@ -178,6 +178,7 @@ public class MesQualityController extends BaseController {
|
|
|
// CookieUtils.setCookie(response,"jeesite.session.id",request.getParameter("__sid"));
|
|
|
model.addAttribute("__sid", request.getParameter("__sid"));
|
|
|
String oprno = request.getParameter("oprno");
|
|
|
+ String lineSn = request.getParameter("lineSn");
|
|
|
|
|
|
List<DictData> types = DictUtils.getDictList("mes_quality_type");
|
|
|
//logger.info("types:"+ JSON.toJSONString(types));
|
|
|
@@ -186,11 +187,13 @@ public class MesQualityController extends BaseController {
|
|
|
MesRepairItems mesRepairItems = new MesRepairItems();
|
|
|
mesRepairItems.setStatus("0");
|
|
|
mesRepairItems.setOprno(oprno);
|
|
|
+ mesRepairItems.setLineSn(lineSn);
|
|
|
List<MesRepairItems> items = mesRepairItemsService.findList(mesRepairItems);
|
|
|
// logger.info("items:"+ JSON.toJSONString(items));
|
|
|
model.addAttribute("items", items);
|
|
|
|
|
|
model.addAttribute("oprno", oprno);
|
|
|
+ model.addAttribute("lineSn", lineSn);
|
|
|
|
|
|
model.addAttribute("mesQuality", mesQuality);
|
|
|
return "modules/mes/mesQualityCheck";
|
|
|
@@ -327,6 +330,11 @@ public class MesQualityController extends BaseController {
|
|
|
Map<String, Object> map = MapUtils.newHashMap();
|
|
|
String oprno = req.getParameter("oprno");
|
|
|
String lineSn = req.getParameter("lineSn");
|
|
|
+ if(StringUtils.isEmpty(lineSn)){
|
|
|
+ resp.setResult(Global.FALSE);
|
|
|
+ resp.setMessage("参数错误");
|
|
|
+ return resp;
|
|
|
+ }
|
|
|
MesRepairItems mesRepairItems = new MesRepairItems();
|
|
|
mesRepairItems.setStatus("0");
|
|
|
mesRepairItems.setOprno(oprno);
|