From 72ecfe19354d60990edd9f28cb3f54739c0d396b Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 26 七月 2023 16:04:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/Haier_MES
---
gmms/WebContent/mysqlInsert/toPlc.jsp | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/gmms/WebContent/mysqlInsert/toPlc.jsp b/gmms/WebContent/mysqlInsert/toPlc.jsp
index b091225..eea7076 100644
--- a/gmms/WebContent/mysqlInsert/toPlc.jsp
+++ b/gmms/WebContent/mysqlInsert/toPlc.jsp
@@ -1,6 +1,11 @@
<%@page import="builder.Manager"%>
<%
+<<<<<<< HEAD
+
+Manager.sendtoPLC(76,20,4,new byte[]{0,1,0,1},0);
+Manager.sendtoPLC(77,20,4,new byte[]{0,1,0,1},0);
+=======
String zt=request.getParameter("zt");
String peifanhao=request.getParameter("peifanhao");
@@ -14,5 +19,6 @@
}else if(zts==3){
Manager.sendtoPLC(76,20,4,new byte[]{0,0,0,0},0);
}
+>>>>>>> 09a05342f4c60c834c3ee17a13529cd91c624f34
%>
\ No newline at end of file
--
Gitblit v1.8.0