hou 1 hete
szülő
commit
6362205831

+ 7 - 0
src/main/java/com/jeesite/modules/mes/web/MesRepairController.java

@@ -633,6 +633,13 @@ public class MesRepairController extends BaseController {
 			return resp;
 		}
 
+		MesRepairItems mesRepairItems1 = mesRepairItemsService.get(itemId);
+		if(ObjectUtils.isEmpty(mesRepairItems1)){
+			resp.setMessage("参数错误");
+			return resp;
+		}
+		oprno = mesRepairItems1.getOprno();
+
 		MesProductRecord mesProductRecord = new MesProductRecord();
 		mesProductRecord.setSn(sn);
 		mesProductRecord.setOprno(oprno);

+ 3 - 2
src/main/resources/config/application.yml

@@ -57,8 +57,8 @@ jdbc:
 #  url: jdbc:mysql://127.0.0.1:3307/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
   url: jdbc:mysql://192.168.21.99:3306/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 #  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_x13?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#  username: mescloud
-#  password: 8neywEN86NLam3ts
+  username: mescloud
+  password: 8neywEN86NLam3ts
 #  username: root
 #  password: 123456
 #
@@ -673,6 +673,7 @@ shiro:
     ${adminPath}/mes/mesProductRecord/select = anon
     ${adminPath}/mes/mesProductRecord/submit = anon
     ${adminPath}/mes/mesRepairItems/submit = anon
+    ${adminPath}/mes/mesProductQm/addItem = anon
     ${adminPath}/** = user
 
 

+ 1 - 1
src/main/resources/views/modules/mes/mesProductQmList.html

@@ -71,7 +71,7 @@ $('#dataGrid').dataGrid({
 		{header:'${text("工件号")}', name:'componentNum', index:'a.component_num', width:280, align:"center", frozen:true},
 		{header:'${text("产线编号")}', name:'productCate', index:'a.product_cate', width:100, align:"center"},
 		{header:'${text("工位号")}', name:'oprno', index:'a.oprno', width:100, align:"center"},
-		{header:'${text("名称")}', name:'title', index:'a.title', width:100, align:"center"},
+		// {header:'${text("名称")}', name:'title', index:'a.title', width:100, align:"center"},
 		{header:'${text("测试人员")}', name:'workNum', index:'a.work_num', width:150, align:"center"},
 		{header:'${text("测试时间")}', name:'testTime', index:'a.test_time', width:150, align:"center"},
 		{header:'${text("测试压")}', name:'testPressure', index:'a.test_pressure', width:150, align:"center"},