优化

src/com/mes/component/GunPanel.java

@@ -5,6 +5,7 @@ import com.mes.ui.YgslUtil;
 import com.mes.util.JdbcUtils;
 import com.mes.ygsl.YgslClient;
 import com.mes.ygsl.YgslConfig;
+import com.mes.ygsl.YgslParam;
 
 import javax.swing.*;
 import java.awt.*;
@@ -220,6 +221,13 @@ public class GunPanel extends JPanel {
         String angle = com.mes.ygsl.YgslParam.getAngle(content);
         String tighteningID = com.mes.ygsl.YgslParam.getTighteningID(content);
         String jobID = com.mes.ygsl.YgslParam.getJobID(content);
+        String torqueMin = YgslParam.getTorqueMinLimit(content);
+        String torqueMax = YgslParam.getTorqueMaxLimit(content);
+        String torqueFinal = YgslParam.getTorqueFinalTarget(content);
+        String angleMin = YgslParam.getAngleMin(content);
+        String angleMax = YgslParam.getAngleMax(content);
+        String angleFinal = YgslParam.getFinalAngleTarget(content);
+
 
         if (tighteningID.isEmpty() || tighteningIds.contains(tighteningID)) {
             YgslUtil.lastTighteningResultDataAcknowledge(gunClient);
@@ -259,10 +267,10 @@ public class GunPanel extends JPanel {
             });
 
             JdbcUtils.insertTighteningData(
-                    MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),
-                    tighteningStatus, torqueStatus, angleStatus, "", "", "", torque,
-                    "", "", "", angle, tighteningID, jobID, String.valueOf(displayCount),
-                    pos, MesClient.user_menu.getText()
+                    MesClient.mes_gw,MesClient.mes_line_sn,MesClient.product_sn.getText(),
+                    tighteningStatus,torqueStatus,angleStatus,torqueMin,torqueMax,torqueFinal,torque,
+                    angleMin,angleMax,angleFinal,angle,tighteningID,jobID,"",
+                    pos,MesClient.user_menu.getText()
             );
 
             if (currentCount >= taskCount) {

src/com/mes/ui/MesClient.java

@@ -207,7 +207,7 @@ public class MesClient extends JFrame {
                 if (submitSuccess) {
                     setMenuStatus("所有任务完成，结果已提交", 0);
                     resetScanA();
-                    scanBarcode();
+//                    scanBarcode();
                 } else {
                     setMenuStatus("结果提交失败，请重试", -1);
                 }

src/com/mes/ui/MesRevice.java

@@ -102,8 +102,8 @@ public class MesRevice {
 //                MesClient.status_menu.setText("结果提交成功，请扫下一件");
                 MesClient.setMenuStatus("结果提交成功，请扫下一件",0);
                 MesClient.scan_type = 1;
-                MesClient.scanBarcode();
 
+//                MesClient.scanBarcode();
             }else{
                 MesClient.setMenuStatus("结果提交失败，请重试",-1);
 //                MesClient.status_menu.setText("结果提交失败，请重试");

src/com/mes/util/JdbcUtils.java

@@ -344,14 +344,18 @@ public class JdbcUtils {
 			}
 			String now = DateLocalUtils.getCurrentTime();
 			Statement statement = conn.createStatement();
-			statement.executeUpdate("UPDATE ygsl_config SET gun_name = '" + config.getGunName() + "', "
+			String sql = "UPDATE ygsl_config SET gun_index = " + config.getGunIndex() + ", "
+					+ "gun_name = '" + config.getGunName() + "', "
 					+ "ip_address = '" + config.getIpAddress() + "', "
 					+ "port = " + config.getPort() + ", "
 					+ "task_count = " + config.getTaskCount() + ", "
 					+ "enabled = " + config.getEnabled() + ", "
 					+ "auto_submit = " + config.getAutoSubmit() + ", "
 					+ "update_time = '" + now + "' "
-					+ "WHERE id = " + config.getId());
+					+ "WHERE id = " + config.getId();
+			System.out.println("执行SQL: " + sql);
+			int rowsAffected = statement.executeUpdate(sql);
+			System.out.println("更新行数: " + rowsAffected);
 			statement.close();
 			ret = true;
 		} catch (Exception e) {