Prechádzať zdrojové kódy

问题清单按产线编号筛选:allItems/wtqd接口校验lineSn,抽检页面回传lineSn

hbx 1 týždeň pred
rodič
commit
a8b9e17056

+ 8 - 0
src/main/java/com/jeesite/modules/mes/web/MesQualityController.java

@@ -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);

+ 8 - 0
src/main/java/com/jeesite/modules/mes/web/MesRepairItemsController.java

@@ -171,7 +171,15 @@ public class MesRepairItemsController extends BaseController {
 	@RequestMapping(value = "allItems")
 	@ResponseBody
 	public CommonResp allItems(MesRepairItems mesRepairItems, HttpServletRequest request, HttpServletResponse response) {
+		CommonResp<Map<String, Object>> resp1 = new CommonResp<>();
+		String lineSn = request.getParameter("lineSn");
+		if(StringUtils.isEmpty(lineSn)){
+			resp1.setResult(Global.FALSE);
+			resp1.setMessage("参数错误");
+			return resp1;
+		}
 		mesRepairItems.setStatus("0");
+		mesRepairItems.setLineSn(lineSn);
 		List<MesRepairItems> lists = mesRepairItemsService.findList(mesRepairItems);
 		CommonResp<List<MesRepairItems>> resp = new CommonResp<>();
 

+ 3 - 2
src/main/resources/views/modules/mes/mesQualityCheck.html

@@ -160,6 +160,7 @@
 <script>
 	var flag = 0;
 	var oprno = "${oprno}";
+	var lineSn = "${lineSn}";
 	var type = "";
 	var result = "";
 	var items = [];
@@ -233,7 +234,7 @@
 		$(".fxbox-result").hide();
 		// resetPage();
 		$("#sn").val(text);
-		$.post('${ctx}/mes/mesQuality/checkProduct',{sn:text,oprno:oprno,__sid:__sid,__ajax:"json"},function (res){
+		$.post('${ctx}/mes/mesQuality/checkProduct',{sn:text,oprno:oprno,lineSn:lineSn,__sid:__sid,__ajax:"json"},function (res){
 			if(res.result=='true'){
 				flag = 1;
 				$("#product_result").html(res.data);
@@ -293,7 +294,7 @@
 			}
 		}
 
-		$.post('${ctx}/mes/mesQuality/checkSave',{sn:sn,oprno:oprno,type:type,result:result,items:items.join(","),__sid:__sid,__ajax:"json"},function (res){
+		$.post('${ctx}/mes/mesQuality/checkSave',{sn:sn,oprno:oprno,lineSn:lineSn,type:type,result:result,items:items.join(","),__sid:__sid,__ajax:"json"},function (res){
 			$(_self).attr("data-ff",0);
 			if(res.result=='true'){
 				layer.alert(res.message);