修改更换工件码,删除拧紧枪NG显示

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

@@ -15,6 +15,7 @@ import com.jeesite.modules.file.service.FileUploadService;
 import com.jeesite.modules.mes.entity.MesProduct;
 import com.jeesite.modules.mes.entity.MesProductModify;
 import com.jeesite.modules.mes.resp.CommonResp;
+import com.jeesite.modules.mes.service.MesProductModelService;
 import com.jeesite.modules.mes.service.MesProductModifyService;
 import com.jeesite.modules.mes.service.MesProductService;
 import com.jeesite.modules.mes.util.CommonUitl;
@@ -54,6 +55,9 @@ public class MesProductModifyController extends BaseController {
 
 	@Autowired
 	private FileUploadService fileUploadService;
+
+	@Autowired
+	private MesProductModelService mesProductModelService;
 	
 	/**
 	 * 获取数据
@@ -135,8 +139,8 @@ public class MesProductModifyController extends BaseController {
 
 		String checkProductSn = Global.getConfig("mes.check.productSn");
 		if(checkProductSn.equals("1")){
-			if(!CommonUitl.checkProductSn(mesProductModify.getNewsn(),mesProduct.getCate())){
-				return renderResult(Global.TRUE, text("工件码不正确！"));
+			if(!mesProductModelService.checkSn(mesProductModify.getNewsn())){
+				return renderResult(Global.FALSE, text( "工件码格式不正确! "));
 			}
 		}
 

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

@@ -63,6 +63,7 @@ public class MesProductYgslController extends BaseController {
 		MesSearchDateReq dateMap = CommonUitl.getSearchDate();
 		mesProductYgsl.setTighteningDate_gte(dateMap.getStartDate());
 		mesProductYgsl.setTighteningDate_lte(dateMap.getEndtDate());
+		applyOkStatusFilter(mesProductYgsl);
 		model.addAttribute("mesProductYgsl", mesProductYgsl);
 		return "modules/mes/mesProductYgslList";
 	}
@@ -74,6 +75,7 @@ public class MesProductYgslController extends BaseController {
 	@RequestMapping(value = "listData")
 	@ResponseBody
 	public Page<MesProductYgsl> listData(MesProductYgsl mesProductYgsl, HttpServletRequest request, HttpServletResponse response) {
+		applyOkStatusFilter(mesProductYgsl);
 		mesProductYgsl.setPage(new Page<>(request, response));
 		Page<MesProductYgsl> page = mesProductYgslService.findPage(mesProductYgsl);
 		return page;
@@ -106,6 +108,7 @@ public class MesProductYgslController extends BaseController {
 	@RequiresPermissions("mes:mesProductYgsl:view")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesProductYgsl mesProductYgsl, HttpServletResponse response) {
+		applyOkStatusFilter(mesProductYgsl);
 		List<MesProductYgsl> list = mesProductYgslService.findList(mesProductYgsl);
 		String fileName = "扭力枪参数" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try(ExcelExport ee = new ExcelExport("扭力枪参数", MesProductYgsl.class)){
@@ -184,4 +187,13 @@ public class MesProductYgslController extends BaseController {
 
 		return renderResult(Global.TRUE, text("操作成功！"));
 	}
+
+	/**
+	 * 列表仅展示拧紧/扭矩/角度状态为 OK 的数据
+	 */
+	private void applyOkStatusFilter(MesProductYgsl mesProductYgsl) {
+		mesProductYgsl.setTighteningStatus("1");
+		mesProductYgsl.setTorqueStatus("1");
+		mesProductYgsl.setAngleStatus("1");
+	}
 }

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

@@ -42,24 +42,9 @@
 						<#form:input path="pos" maxlength="10" class="form-control width-120"/>
 					</div>
 				</div>
-				<div class="form-group">
-					<label class="control-label">${text('拧紧状态')}：</label>
-					<div class="control-inline width-120">
-						<#form:select path="tighteningStatus" dictType="ygsl_tightening_status" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('扭矩状态')}：</label>
-					<div class="control-inline width-120">
-						<#form:select path="torqueStatus" dictType="ygsl_torque_status" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('角度状态')}：</label>
-					<div class="control-inline width-120">
-						<#form:select path="angleStatus" dictType="ygsl_torque_status" blankOption="true" class="form-control"/>
-					</div>
-				</div>
+				<#form:hidden path="tighteningStatus"/>
+				<#form:hidden path="torqueStatus"/>
+				<#form:hidden path="angleStatus"/>
 				<div class="form-group">
 					<label class="control-label">${text('拧紧时间')}：</label>
 					<div class="control-inline">