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,17 @@ 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;
+		}
+		if(StringUtils.isEmpty(oprno)){
+			resp.setResult(Global.FALSE);
+			resp.setMessage("参数错误");
+			return resp;
+		}
+		oprno = CommonUitl.formatOprno(oprno);
 		MesRepairItems mesRepairItems = new MesRepairItems();
 		mesRepairItems.setStatus("0");
 		mesRepairItems.setOprno(oprno);

src/main/java/com/jeesite/modules/mes/web/MesRepairItemsController.java

@@ -4,8 +4,10 @@ import com.jeesite.common.config.Global;
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.web.BaseController;
+import com.jeesite.modules.mes.entity.MesLine;
 import com.jeesite.modules.mes.entity.MesRepairItems;
 import com.jeesite.modules.mes.resp.CommonResp;
+import com.jeesite.modules.mes.service.MesLineService;
 import com.jeesite.modules.mes.service.MesRepairItemsService;
 import com.jeesite.modules.mes.util.CommonUitl;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -34,6 +37,9 @@ public class MesRepairItemsController extends BaseController {
 
 	@Autowired
 	private MesRepairItemsService mesRepairItemsService;
+
+	@Autowired
+	private MesLineService mesLineService;
 	
 	/**
 	 * 获取数据
@@ -49,6 +55,7 @@ public class MesRepairItemsController extends BaseController {
 	@RequiresPermissions("mes:mesRepairItems:view")
 	@RequestMapping(value = {"list", ""})
 	public String list(MesRepairItems mesRepairItems, Model model) {
+		model.addAttribute("mesLineList", getMesLineList(mesRepairItems.getLineSn()));
 		model.addAttribute("mesRepairItems", mesRepairItems);
 		return "modules/mes/mesRepairItemsList";
 	}
@@ -71,6 +78,7 @@ public class MesRepairItemsController extends BaseController {
 	@RequiresPermissions("mes:mesRepairItems:view")
 	@RequestMapping(value = "form")
 	public String form(MesRepairItems mesRepairItems, Model model) {
+		model.addAttribute("mesLineList", getMesLineList(mesRepairItems.getLineSn()));
 		model.addAttribute("mesRepairItems", mesRepairItems);
 		return "modules/mes/mesRepairItemsForm";
 	}
@@ -125,6 +133,13 @@ public class MesRepairItemsController extends BaseController {
 	@ResponseBody
 	public CommonResp all(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.setLineSn(lineSn);
 //		if(StringUtils.isEmpty(request.getParameter("oprno"))){
 //			resp1.setResult(Global.FALSE);
 //			resp1.setMessage("参数错误");
@@ -171,7 +186,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<>();
 
@@ -179,4 +202,29 @@ public class MesRepairItemsController extends BaseController {
 		resp.setResult(Global.TRUE);
 		return resp;
 	}
+
+	/**
+	 * 获取产线下拉列表（启用状态的产线；若当前产线不在列表中，补充进去，避免编辑/查询时原值丢失）
+	 */
+	private List<MesLine> getMesLineList(String lineSn) {
+		MesLine mesLine = new MesLine();
+		mesLine.setStatus(MesLine.STATUS_NORMAL);
+		List<MesLine> lineList = new ArrayList<>(mesLineService.findList(mesLine));
+		if (StringUtils.isNotBlank(lineSn)) {
+			boolean exists = false;
+			for (MesLine line : lineList) {
+				if (lineSn.equals(line.getSn())) {
+					exists = true;
+					break;
+				}
+			}
+			if (!exists) {
+				MesLine current = new MesLine();
+				current.setSn(lineSn);
+				current.setTitle(lineSn);
+				lineList.add(0, current);
+			}
+		}
+		return lineList;
+	}
 }

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

src/main/resources/views/modules/mes/mesRepairItemsForm.html

@@ -28,7 +28,7 @@
 						<label class="control-label col-sm-4" title="">
 							<span class="required ">*</span> ${text('产线编号')}：<i class="fa icon-question hide"></i></label>
 						<div class="col-sm-8">
-							<#form:input path="lineSn" maxlength="20" class="form-control required"/>
+							<#form:select path="lineSn" items="${mesLineList}" itemLabel="title" itemValue="sn" blankOption="true" class="form-control required"/>
 						</div>
 					</div>
 				</div>

src/main/resources/views/modules/mes/mesRepairItemsList.html

@@ -24,8 +24,8 @@
 				</div>
 			<div class="form-group">
 				<label class="control-label">${text('产线编号')}：</label>
-				<div class="control-inline">
-					<#form:input path="lineSn" maxlength="50" class="form-control width-120"/>
+				<div class="control-inline width-160">
+					<#form:select path="lineSn" items="${mesLineList}" itemLabel="title" itemValue="sn" blankOption="true" class="form-control isQuick"/>
 				</div>
 			</div>