优化

src/com/mes/ui/LoginFrame.java

@@ -24,7 +24,7 @@ public class LoginFrame extends JFrame {
     static JButton scanLoginButton = new JButton("扫  码  登  录");
 
     public LoginFrame() {
-        setTitle("MES系统客户端：OP310B/OP320" + " - " + Config.gw_des_1);
+        setTitle("MES系统客户端：OP400A/OP400B" + " - " + "总成气密检测");
 
         ImageIcon bg = new ImageIcon(Objects.requireNonNull(MesClient.class.getResource("/background.png")));
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

src/com/mes/ui/MesClient.java

@@ -378,7 +378,7 @@ public class MesClient extends JFrame {
 
     public MesClient() {
         setIconImage(Toolkit.getDefaultToolkit().getImage(MesClient.class.getResource("/bg/logo.png")));
-        setTitle("MES系统客户端：OP310B/OP320 " + Config.gw_des_1);
+        setTitle("MES系统客户端：OP400A/OP400B " + "总成气密检测");
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         setBounds(0, 0, 1024, 768);
 

src/com/mes/ui/OprnoUtil.java

@@ -17,7 +17,7 @@ public class OprnoUtil {
             "框架找漏","冷板安装+拉铆","清理溢胶","水冷板FSW","CNC总成反面（2序）","CNC总成正面加工","总成正面清洁","框架终检",
             "恒温静置","正面安装钢丝螺套","反面安装钢丝螺套","反面拉铆","半成品气密","涂液冷板加强件结构胶","涂密封胶 安装加强件","清胶",
             "胶水固化","底护板预装+水嘴安装","底护板装配","成品气密，液冷板气密","人工清洁","贴PI膜/限位条","正面涂胶+拉铆",
-            "安装复合横梁","贴EPDM保温棉","绝缘耐压测试","在线检测（错漏）","在线检测（尺寸）","终检","GP12","包装"
+            "安装复合横梁","贴EPDM保温棉","绝缘耐压测试","在线检测（错漏）","总成气密检测","终检","GP12","包装"
     };
     public static String[] lboprnos = new String[]{
             "OP040","OP050","OP060","OP070","OP080","OP090","OP100","OP110",

src/com/mes/util/QMParamsDAO.java

@@ -20,20 +20,21 @@ public class QMParamsDAO {
 
     public static void createTable() {
         String qmParams = "CREATE TABLE if not exists qm_params(\n" +
-                "id INTEGER PRIMARY KEY AUTOINCREMENT, -- 自增ID\n" +
+                "id INTEGER PRIMARY KEY AUTOINCREMENT, -- 自增 ID\n" +
                 "oprno VARCHAR(20),                    -- 工位号 \n" +
-                "sn VARCHAR(48),                       -- 工件码\n" +
-                "program_number INTEGER,               -- 程序号\n" +
-                "test_result VARCHAR(64),               -- 测试结果\n" +
-                "pressure_value VARCHAR(128),          -- 压力值\n" +
-                "leak_value VARCHAR(128),              -- 泄漏值\n" +
-                "pressure_unit VARCHAR(64),            -- 压力单位\n" +
-                "leak_unit VARCHAR(64),                -- 泄漏单位\n" +
-                "fill_time INTEGER,                    -- 填充时间\n" +
-                "stabilize_time INTEGER,               -- 稳定时间\n" +
-                "test_time INTEGER,                    -- 测试时间\n" +
-                "record_time DATETIME,                 -- 记录时间\n" +
-                "state CHAR(1)      -- 状态(0 ->未提交, 1 ->已提交)\n" +
+                "sn VARCHAR(48),                       -- 工件码 \n" +
+                "program_number INTEGER,               -- 程序号 \n" +
+                "test_result VARCHAR(64),               -- 测试结果 \n" +
+                "pressure_value VARCHAR(128),          -- 压力值 \n" +
+                "leak_value VARCHAR(128),              -- 泄漏值 \n" +
+                "pressure_unit VARCHAR(64),            -- 压力单位 \n" +
+                "leak_unit VARCHAR(64),                -- 泄漏单位 \n" +
+                "fill_time INTEGER,                    -- 填充时间 \n" +
+                "stabilize_time INTEGER,               -- 稳定时间 \n" +
+                "test_time INTEGER,                    -- 测试时间 \n" +
+                "record_time DATETIME,                 -- 记录时间 \n" +
+                "work_num VARCHAR(48),                 -- 测试人员 \n" +
+                "state CHAR(1)                         -- 状态 (0 ->未提交，1 ->已提交)\n" +
                 ")";
 
         try (Statement stmt = conn.createStatement()) {
@@ -47,13 +48,13 @@ public class QMParamsDAO {
     public static void insert(String oprno, String sn, int programNumber, String testResult,
                              String pressureValue, String leakValue,
                              String pressureUnit, String leakUnit,
-                             int fillTime, int stabilizeTime, int testTime) {
+                             int fillTime, int stabilizeTime, int testTime,String workNum) {
 
         if(sn.trim().isEmpty() || oprno.trim().isEmpty()) return;
 
         String sql = "INSERT INTO qm_params(oprno, sn, program_number, test_result, pressure_value, "
                 + "leak_value, pressure_unit, leak_unit, fill_time, stabilize_time, "
-                + "test_time, record_time, state) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,0)";
+                + "test_time, record_time,state,work_num) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,0,?)";
 
         try (PreparedStatement pstmt = conn.prepareStatement(sql)) {
 
@@ -69,6 +70,7 @@ public class QMParamsDAO {
             pstmt.setInt(10, stabilizeTime);
             pstmt.setInt(11, testTime);
             pstmt.setString(12, DateLocalUtils.getCurrentTime());
+            pstmt.setString(13, workNum);
 
             pstmt.executeUpdate();
             log.info("qm_params表插入数据成功: {}", pstmt);

src/com/mes/util/UpdateQualityTimer.java

@@ -77,7 +77,9 @@ public class UpdateQualityTimer {
                                     .fluentPut("byDuration", params.get("stabilize_time"))
                                     .fluentPut("csDuration", params.get("test_time"))
                                     .fluentPut("testTime", params.get("record_time"))
-                                    .fluentPut("testResult", params.get("test_result"));
+                                    .fluentPut("testResult", params.get("test_result"))
+                                    .fluentPut("title", "总成气密检测")
+                                    .fluentPut("workNum", params.get("work_num"));
                             String response = HttpUtils.sendJsonPost(String.format("http://%s:8980/js/a/mes/mesProductQm/addItem", Config.server_ip), json.toJSONString());
                             JSONObject jsonObject = JSON.parseObject(response);
                             Boolean result = jsonObject.getBoolean("result");

src/com/mes/util/WorkTimer.java

@@ -133,7 +133,7 @@ public class WorkTimer {
                             DataUtil.bindLeakValue(sn, leakString, Config.gw_1);
 
                             // 将气密参数放入本地SQLite数据库
-                            QMParamsDAO.insert(Config.gw_1, sn.trim(), lastResult.programNumber, ret, pressureValue, leakValue, lastResult.pressureUnit, lastResult.leakUnit, params.fillTime, params.stabilizeTime, params.testTime);
+                            QMParamsDAO.insert(Config.gw_1, sn.trim(), lastResult.programNumber, ret, pressureValue, leakValue, lastResult.pressureUnit, lastResult.leakUnit, params.fillTime, params.stabilizeTime, params.testTime, MesClient.user20 );//添加作业人员
 
                             // 刷新工作面板
                             MesClient.resetScanA();
@@ -208,7 +208,7 @@ public class WorkTimer {
                             DataUtil.bindLeakValue(sn, leakString, Config.gw_2);
 
                             // 将气密参数放入本地SQLite数据库
-                            QMParamsDAO.insert(Config.gw_2, sn.trim(), lastResult.programNumber, ret, pressureValue, leakValue, lastResult.pressureUnit, lastResult.leakUnit, params.fillTime, params.stabilizeTime, params.testTime);
+                            QMParamsDAO.insert(Config.gw_2, sn.trim(), lastResult.programNumber, ret, pressureValue, leakValue, lastResult.pressureUnit, lastResult.leakUnit, params.fillTime, params.stabilizeTime, params.testTime, MesClient.user20);
 
                             // 刷新工作面板
                             MesClient.resetScanB();

src/resources/config/config.properties

@@ -1,7 +1,7 @@
-mes.gw_1=OP320
-mes.gw_2=OP310B
+mes.gw_1=OP400A
+mes.gw_2=OP400B
 #mes.server_ip=127.0.0.1
-mes.server_ip=192.168.17.99
+mes.server_ip=192.168.18.99
 mes.tcp_port=3000
 
 mes.heart_beat_cycle=60