代码提交

zjh

2025-11-14 e23f47895b97601618d3cd46a789170550a2256a

 StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs

@@ -47,7 +47,7 @@
            //    "                        left join mes_items s on s.id = C.daa002" +
            //    "                       where WORKSNO='" + id + "' and DAA018='已开工'  order by DAA016 asc";
            //var sql1 = "select DAA001 tickeNo, s.ITEM_NO itemNo, s.ITEM_NAME itemName, s.ITEM_MODEL itemModel, DAA008 plannedNum\r\nfrom  WOMDAA C\r\n         left join mes_items s on s.id = C.daa002\r\nleft join womcaa A on A.caa001=C.daa021\r\nwhere C.DAA015 = '" + LineId + "'\r\n  and DAA018 = '已开工' and A.CAA023='2'\r\norder by DAA016 asc";
            var sql1 = "select DAA001 tickeNo, s.ITEM_NO itemNo, s.ITEM_NAME itemName, s.ITEM_MODEL itemModel, DAA008 plannedNum\r\nfrom  WOMDAA C\r\n         left join mes_items s on s.id = C.daa002\r\nleft join womcaa A on A.caa001=C.daa021\r\nleft join MESPROJECT_LIKE_CCLOGIN pr1 on A.PROJECT=pr1.PROJECT_ID\r\nleft join MESLINE_LIKE_CCLOGIN_WORKS2 pr2 on pr1.id=pr2.LOGINID\r\nwhere C.DAA015 = '" + LineId + "' and pr2.WORKSNO='"+ LoginId + "'\r\n  and DAA018 = '已开工' and A.CAA023='2'\r\norder by DAA016 asc";
            var sql1 = "select DAA001 tickeNo, s.ITEM_NO itemNo, s.ITEM_NAME itemName, s.ITEM_MODEL itemModel, DAA008 plannedNum\r\nfrom  WOMDAA C\r\n         left join mes_items s on s.id = C.daa002\r\nleft join womcaa A on A.caa001=C.daa021\r\nleft join MESPROJECT_LIKE_CCLOGIN pr1 on A.PROJECT=pr1.PROJECT_ID\r\nleft join MESLINE_LIKE_CCLOGIN_WORKS2 pr2 on pr1.id=pr2.LOGINID\r\nwhere C.DAA015 = '" + LineId + "' and pr2.WORKSNO='"+ LoginId + "'\r\n  and DAA018 = '已开工' and A.CAA023='2' and nvl(a.ISCANCEL,0) <>1 \r\norder by DAA016 asc";
            return SQLHelper.ExecuteQuery(sql1);
        }

@@ -82,6 +82,136 @@

        //    return result;
        //}
        //public bool AddAsnInfo(AsnInfo asnInfo)
        //{
        //    var sqlHelper = new OracleSQLHelper();
        //    bool result = true;

        //    var (connection, transaction) = sqlHelper.BeginTransaction();

        //    try
        //    {
        //        // 1. 主表插入
        //        var sql1 = $@"
        //    INSERT INTO MES_SN_STATUS_DETAILS
        //      (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID,TURNOVER_CODE)
        //      VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
        //              '{asnInfo.tickeNo}',
        //              '{asnInfo.snNo}',
        //              '{asnInfo.workstationNo}',
        //              '{asnInfo.snState}',
        //              '{asnInfo.loginId}','{asnInfo.turnoverCode}')";
        //        int i = sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql1);

        //        // 2. 失败项插入
        //        if (i > 0 && asnInfo.failItems?.Count > 0)
        //        {
        //            foreach (var item in asnInfo.failItems)
        //            {
        //                var sql2 = $@"
        //            INSERT INTO CC_FAIL_ITEMS
        //              (ID, MID, DEFECT_ISSUE, ROOT_CAUSE, REPAIR_METHOD, MATERIAL_HANDLING, CREATE_DATE, CREATED_BY)
        //              VALUES (SEQ_CC_FAIL_ITEMS.NEXTVAL,
        //                      SEQ_MES_SN_STATUS_DETAILS_ID.CURRVAL,
        //                      '{item.DefectIssue}',
        //                      '{item.RootCause}',
        //                      '{item.RepairMethod}',
        //                      '{item.MaterialHandling}',
        //                      SYSDATE,
        //                      '{asnInfo.loginId}')";
        //                sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
        //            }
        //        }

        //        // 3. 配件绑定/解绑 & 日志记录
        //        if (asnInfo.accessoryList?.Count > 0)
        //        {
        //            foreach (var accessory in asnInfo.accessoryList)
        //            {
        //                var now = "SYSDATE";
        //                var user = asnInfo.loginId;
        //                var snNo = asnInfo.snNo;
        //                var partSn = accessory.accessorySn;
        //                var partName = accessory.accessoryName;

        //                if (accessory.bindingState == "0")
        //                {
        //                    // ====== 校验：同一个配件SN是否已绑定 ======
        //                    var checkSql = $@"
        //                SELECT COUNT(1) FROM MES_SN_PART_BINDING 
        //                 WHERE PART_SN_NO = '{partSn}'";
        //                    var exists = Convert.ToInt32(sqlHelper.ExecuteScalarWithTransaction(connection, transaction, checkSql));
        //                    if (exists > 0)
        //                    {
        //                        throw new Exception($"配件SN[{partSn}]已绑定，请先解绑再绑定！");
        //                    }

        //                    // 绑定
        //                    var sqlBind = $@"
        //                INSERT INTO MES_SN_PART_BINDING
        //                  (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER)
        //                  VALUES (SEQ_MES_SN_PART_BINDING.NEXTVAL,
        //                          '{snNo}',
        //                          '{partSn}',
        //                          '{partName}',
        //                          {now},
        //                          '{user}')";
        //                    sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlBind);

        //                    // 日志
        //                    var sqlLog = $@"
        //                INSERT INTO MES_SN_PART_BINDING_LOG
        //                  (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER, OP_TYPE)
        //                  VALUES (SEQ_MES_SN_PART_BINDING_LOG.NEXTVAL,
        //                          '{snNo}',
        //                          '{partSn}',
        //                          '{partName}',
        //                          {now},
        //                          '{user}',
        //                          0)";
        //                    sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlLog);
        //                }
        //                else if (accessory.bindingState == "1")
        //                {
        //                    // 解绑
        //                    var sqlUnbind = $@"
        //                DELETE FROM MES_SN_PART_BINDING
        //                 WHERE SN_NO = '{snNo}'
        //                   AND PART_SN_NO = '{partSn}'";
        //                    sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlUnbind);

        //                    // 日志
        //                    var sqlLog = $@"
        //                INSERT INTO MES_SN_PART_BINDING_LOG
        //                  (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER, OP_TYPE)
        //                  VALUES (SEQ_MES_SN_PART_BINDING_LOG.NEXTVAL,
        //                          '{snNo}',
        //                          '{partSn}',
        //                          '{partName}',
        //                          {now},
        //                          '{user}',
        //                          1)";
        //                    sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlLog);
        //                }
        //            }
        //        }

        //        transaction.Commit();
        //    }
        //    catch (Exception)
        //    {
        //        transaction.Rollback();
        //        result = false;
        //        throw;
        //    }
        //    finally
        //    {
        //        sqlHelper.CloseConnection(connection);
        //    }

        //    return result;
        //}

        public bool AddAsnInfo(AsnInfo asnInfo)
        {
            var sqlHelper = new OracleSQLHelper();
@@ -92,34 +222,72 @@
            try
            {
                // 1. 主表插入
                var sql1 = $@"
                //    var sql1 = @"
                //INSERT INTO MES_SN_STATUS_DETAILS
                //   (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID, TURNOVER_CODE,LINE_NO)
                //   VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
                //           :ticketNo,
                //           :snNo,
                //           :workstationNo,
                //           :snState,
                //           :loginId,
                //           :turnoverCode,select nvl(DAA015,'') from WOMDAA where DAA001 = ':ticketNo' and ROWNUM=1)";

                // 1. 主表插入
                var sql1 = @"
            INSERT INTO MES_SN_STATUS_DETAILS
              (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID,TURNOVER_CODE)
              VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
                      '{asnInfo.tickeNo}',
                      '{asnInfo.snNo}',
                      '{asnInfo.workstationNo}',
                      '{asnInfo.snState}',
                      '{asnInfo.loginId}','{asnInfo.turnoverCode}')";
                int i = sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql1);
                   (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID, TURNOVER_CODE, LINE_NO)
            SELECT SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
                   :ticketNo,
                   :snNo,
                   :workstationNo,
                   :snState,
                   :loginId,
                   :turnoverCode,
                   :LINE_NO
              FROM WOMDAA
             WHERE DAA001 = :ticketNo
               AND ROWNUM = 1";
                var parameters1 = new[]
                {
            new OracleParameter("ticketNo", asnInfo.tickeNo ?? (object)DBNull.Value),
            new OracleParameter("snNo", asnInfo.snNo ?? (object)DBNull.Value),
            new OracleParameter("workstationNo", asnInfo.workstationNo ?? (object)DBNull.Value),
            new OracleParameter("snState", asnInfo.snState ?? (object)DBNull.Value),
            new OracleParameter("loginId", asnInfo.loginId ?? (object)DBNull.Value),
            new OracleParameter("turnoverCode", asnInfo.turnoverCode ?? (object)DBNull.Value),
            new OracleParameter("LINE_NO", asnInfo.lineNo ?? (object)DBNull.Value)
        };

                int i = sqlHelper.ExecuteNonQueryWithTransaction(sql1, parameters1, connection, transaction);

                // 2. 失败项插入
                if (i > 0 && asnInfo.failItems?.Count > 0)
                {
                    foreach (var item in asnInfo.failItems)
                    {
                        var sql2 = $@"
                        var sql2 = @"
                    INSERT INTO CC_FAIL_ITEMS
                      (ID, MID, DEFECT_ISSUE, ROOT_CAUSE, REPAIR_METHOD, MATERIAL_HANDLING, CREATE_DATE, CREATED_BY)
                      VALUES (SEQ_CC_FAIL_ITEMS.NEXTVAL,
                              SEQ_MES_SN_STATUS_DETAILS_ID.CURRVAL,
                              '{item.DefectIssue}',
                              '{item.RootCause}',
                              '{item.RepairMethod}',
                              '{item.MaterialHandling}',
                              SYSDATE,
                              '{asnInfo.loginId}')";
                        sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
                       (ID, MID, DEFECT_ISSUE, ROOT_CAUSE, REPAIR_METHOD, MATERIAL_HANDLING, CREATE_DATE, CREATED_BY)
                       VALUES (SEQ_CC_FAIL_ITEMS.NEXTVAL,
                               SEQ_MES_SN_STATUS_DETAILS_ID.CURRVAL,
                               :defectIssue,
                               :rootCause,
                               :repairMethod,
                               :materialHandling,
                               SYSDATE,
                               :loginId)";

                        var parameters2 = new[]
                        {
                    new OracleParameter("defectIssue", item.DefectIssue ?? (object)DBNull.Value),
                    new OracleParameter("rootCause", item.RootCause ?? (object)DBNull.Value),
                    new OracleParameter("repairMethod", item.RepairMethod ?? (object)DBNull.Value),
                    new OracleParameter("materialHandling", item.MaterialHandling ?? (object)DBNull.Value),
                    new OracleParameter("loginId", asnInfo.loginId ?? (object)DBNull.Value)
                };

                        sqlHelper.ExecuteNonQueryWithTransaction(sql2, parameters2, connection, transaction);
                    }
                }

@@ -128,70 +296,96 @@
                {
                    foreach (var accessory in asnInfo.accessoryList)
                    {
                        var now = "SYSDATE";
                        var user = asnInfo.loginId;
                        var snNo = asnInfo.snNo;
                        var partSn = accessory.accessorySn;
                        var partName = accessory.accessoryName;
                        var user = asnInfo.loginId;

                        if (accessory.bindingState == "0")
                        if (accessory.bindingState == "0") // 绑定
                        {
                            // ====== 校验：同一个配件SN是否已绑定 ======
                            var checkSql = $@"
                        SELECT COUNT(1) FROM MES_SN_PART_BINDING 
                         WHERE PART_SN_NO = '{partSn}'";
                            var exists = Convert.ToInt32(sqlHelper.ExecuteScalarWithTransaction(connection, transaction, checkSql));
                            // 校验
                            var checkSql = "SELECT COUNT(1) FROM MES_SN_PART_BINDING WHERE PART_SN_NO = :partSn";
                            var checkParams = new[] { new OracleParameter("partSn", partSn ?? (object)DBNull.Value) };
                            var exists = Convert.ToInt32(sqlHelper.ExecuteScalarWithTransaction(connection, transaction, checkSql, checkParams));

                            if (exists > 0)
                            {
                                throw new Exception($"配件SN[{partSn}]已绑定，请先解绑再绑定！");
                            }

                            // 绑定
                            var sqlBind = $@"
                        INSERT INTO MES_SN_PART_BINDING
                          (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER)
                          VALUES (SEQ_MES_SN_PART_BINDING.NEXTVAL,
                                  '{snNo}',
                                  '{partSn}',
                                  '{partName}',
                                  {now},
                                  '{user}')";
                            sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlBind);
                            // 插入绑定
                            var sqlBind = @"
    INSERT INTO MES_SN_PART_BINDING
       (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER)
       VALUES (SEQ_MES_SN_PART_BINDING.NEXTVAL,
               :snNo,
               :partSn,
               :partName,
               SYSDATE,
               :createUser)";

                            // 日志
                            var sqlLog = $@"
                            var bindParams = new[]
                            {
    new OracleParameter("snNo", snNo ?? (object)DBNull.Value),
    new OracleParameter("partSn", partSn ?? (object)DBNull.Value),
    new OracleParameter("partName", partName ?? (object)DBNull.Value),
    new OracleParameter("createUser", user ?? (object)DBNull.Value)
};

                            sqlHelper.ExecuteNonQueryWithTransaction(sqlBind, bindParams, connection, transaction);


                            // 插入日志
                            var sqlLog = @"
                        INSERT INTO MES_SN_PART_BINDING_LOG
                          (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER, OP_TYPE)
                          VALUES (SEQ_MES_SN_PART_BINDING_LOG.NEXTVAL,
                                  '{snNo}',
                                  '{partSn}',
                                  '{partName}',
                                  {now},
                                  '{user}',
                                  0)";
                            sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlLog);
                           (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER, OP_TYPE)
                           VALUES (SEQ_MES_SN_PART_BINDING_LOG.NEXTVAL,
                                   :snNo,
                                   :partSn,
                                   :partName,
                                   SYSDATE,
                                   :createUser,
                                   0)";

                            sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, bindParams, connection, transaction);
                        }
                        else if (accessory.bindingState == "1")
                        else if (accessory.bindingState == "1") // 解绑
                        {
                            // 解绑
                            var sqlUnbind = $@"
                            // 删除绑定
                            var sqlUnbind = @"
                        DELETE FROM MES_SN_PART_BINDING
                         WHERE SN_NO = '{snNo}'
                           AND PART_SN_NO = '{partSn}'";
                            sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlUnbind);
                         WHERE SN_NO = :snNo
                           AND PART_SN_NO = :partSn";

                            // 日志
                            var sqlLog = $@"
                            var unbindParams = new[]
                            {
                        new OracleParameter("snNo", snNo ?? (object)DBNull.Value),
                        new OracleParameter("partSn", partSn ?? (object)DBNull.Value)
                    };

                            sqlHelper.ExecuteNonQueryWithTransaction(sqlUnbind, unbindParams, connection, transaction);

                            // 插入日志
                            var sqlLog = @"
                        INSERT INTO MES_SN_PART_BINDING_LOG
                          (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER, OP_TYPE)
                          VALUES (SEQ_MES_SN_PART_BINDING_LOG.NEXTVAL,
                                  '{snNo}',
                                  '{partSn}',
                                  '{partName}',
                                  {now},
                                  '{user}',
                                  1)";
                            sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlLog);
                           (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER, OP_TYPE)
                           VALUES (SEQ_MES_SN_PART_BINDING_LOG.NEXTVAL,
                                   :snNo,
                                   :partSn,
                                   :partName,
                                   SYSDATE,
                                   :Puser,
                                   1)";

                            var logParams = new[]
                            {
                        new OracleParameter("snNo", snNo ?? (object)DBNull.Value),
                        new OracleParameter("partSn", partSn ?? (object)DBNull.Value),
                        new OracleParameter("partName", partName ?? (object)DBNull.Value),
                        new OracleParameter("Puser", user ?? (object)DBNull.Value)
                    };

                            sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, logParams, connection, transaction);
                        }
                    }
                }
@@ -217,8 +411,6 @@
        /// <summary>
        /// 设置中箱码（绑定/解绑 SN）
        /// </summary>
        /// <param name="mesMiddleBox">中箱码及SN数据</param>
        /// <returns>返回执行状态</returns>
        public string[] SetMediumBoxCode(MesMiddleBox mesMiddleBox)
        {
            var sqlHelper = new OracleSQLHelper();
@@ -233,49 +425,54 @@
                {
                    if (mesMiddleBox.SnList.Count > 0)
                    {
                        string sql1 = $"select count(*) count from MES_MIDDLE_BOX where MEDIUMBOXCODE = '{mesMiddleBox.MediumBoxCode}'";
                        DataTable data = sqlHelper.ExecuteQuery(sql1);
                        // 检查是否已存在
                        var sqlCheck = "SELECT COUNT(*) FROM MES_MIDDLE_BOX WHERE MEDIUMBOXCODE = :code";
                        var checkParams = new[] { new OracleParameter(":code", mesMiddleBox.MediumBoxCode) };
                        var count = Convert.ToInt32(sqlHelper.ExecuteScalarWithTransaction(connection, transaction, sqlCheck, checkParams));

                        if (data.Rows[0]["COUNT"].ToString() != "0")
                        if (count > 0)
                        {
                            msg[0] = "false";
                            msg[1] = "该中箱码已经绑定SN数据，如需再次绑定请先解绑！中箱码：" + mesMiddleBox.MediumBoxCode;
                            msg[1] = $"该中箱码已经绑定SN数据，如需再次绑定请先解绑！中箱码：{mesMiddleBox.MediumBoxCode}";
                            transaction.Rollback();
                            return msg;
                        }

                        foreach (var item in mesMiddleBox.SnList)
                        {
                            string sqlInsert = $@"
                            // 插入绑定
                            var sqlInsert = @"
                        INSERT INTO MES_MIDDLE_BOX (
                            ID, MEDIUMBOXCODE, LOGIN_ID, SN_NO, TICKET_NO, CREATE_DATE, CREATED_BY
                        ) VALUES (
                            SEQ_MES_MIDDLE_BOX_ID.NEXTVAL,
                            '{mesMiddleBox.MediumBoxCode}',
                            '{mesMiddleBox.LoginId}',
                            '{item.SnNo}',
                            '{item.TicketNo}',
                            SYSDATE,
                            '{mesMiddleBox.LoginId}'
                        )";
                            :code, :loginId, :snNo, :ticketNo, SYSDATE, :createdBy)";
                            var insertParams = new[]
                            {
                        new OracleParameter(":code", mesMiddleBox.MediumBoxCode),
                        new OracleParameter(":loginId", mesMiddleBox.LoginId),
                        new OracleParameter(":snNo", item.SnNo),
                        new OracleParameter(":ticketNo", item.TicketNo),
                        new OracleParameter(":createdBy", mesMiddleBox.LoginId)
                    };
                            sqlHelper.ExecuteNonQueryWithTransaction(sqlInsert, insertParams, connection, transaction);

                            sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlInsert);

                            // 日志记录插入：操作类型 0（绑定）
                            string logInsert = $@"
                            // 插入日志
                            var sqlLog = @"
                        INSERT INTO MES_MIDDLE_BOX_LOG (
                            ID, MEDIUMBOXCODE, LOGIN_ID, SN_NO, TICKET_NO, CREATE_DATE, CREATED_BY, OPERATION_TYPE
                        ) VALUES (
                            MES_MIDDLE_BOX_LOG_ID.NEXTVAL,
                            '{mesMiddleBox.MediumBoxCode}',
                            '{mesMiddleBox.LoginId}',
                            '{item.SnNo}',
                            '{item.TicketNo}',
                            SYSDATE,
                            '{mesMiddleBox.LoginId}',
                            '0'
                        )";
                            sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, logInsert);
                            :code, :loginId, :snNo, :ticketNo, SYSDATE, :createdBy, 0)";
                            var logParams = new[]
                            {
                        new OracleParameter(":code", mesMiddleBox.MediumBoxCode),
                        new OracleParameter(":loginId", mesMiddleBox.LoginId),
                        new OracleParameter(":snNo", item.SnNo),
                        new OracleParameter(":ticketNo", item.TicketNo),
                        new OracleParameter(":createdBy", mesMiddleBox.LoginId)
                    };
                            sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, logParams, connection, transaction);
                        }
                    }
                    else
@@ -286,34 +483,32 @@
                }
                else if (mesMiddleBox.type.ToUpper() == "F") // 解绑
                {
                    // 查询要解绑的记录
                    string sqlSelect = $@"
                SELECT * FROM MES_MIDDLE_BOX WHERE MEDIUMBOXCODE = '{mesMiddleBox.MediumBoxCode}'";

                    DataTable dt = sqlHelper.ExecuteQuery(sqlSelect);
                    var sqlSelect = "SELECT * FROM MES_MIDDLE_BOX WHERE MEDIUMBOXCODE = :code";
                    var selectParams = new[] { new OracleParameter(":code", mesMiddleBox.MediumBoxCode) };
                    var dt = sqlHelper.ExecuteDataTable(sqlSelect, CommandType.Text, selectParams);

                    foreach (DataRow row in dt.Rows)
                    {
                        // 插入解绑日志：操作类型 1（解绑）
                        string logInsert = $@"
                        var sqlLog = @"
                    INSERT INTO MES_MIDDLE_BOX_LOG (
                        ID, MEDIUMBOXCODE, LOGIN_ID, SN_NO, TICKET_NO, CREATE_DATE, CREATED_BY, OPERATION_TYPE
                    ) VALUES (
                        MES_MIDDLE_BOX_LOG_ID.NEXTVAL,
                        '{row["MEDIUMBOXCODE"]}',
                        '{row["LOGIN_ID"]}',
                        '{row["SN_NO"]}',
                        '{row["TICKET_NO"]}',
                        SYSDATE,
                        '{mesMiddleBox.LoginId}',
                        '1'
                    )";
                        sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, logInsert);
                        :code, :loginId, :snNo, :ticketNo, SYSDATE, :createdBy, 1)";
                        var logParams = new[]
                        {
                    new OracleParameter(":code", row["MEDIUMBOXCODE"]),
                    new OracleParameter(":loginId", row["LOGIN_ID"]),
                    new OracleParameter(":snNo", row["SN_NO"]),
                    new OracleParameter(":ticketNo", row["TICKET_NO"]),
                    new OracleParameter(":createdBy", mesMiddleBox.LoginId)
                };
                        sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, logParams, connection, transaction);
                    }

                    // 执行解绑（删除）
                    string sqlDelete = $@"DELETE FROM MES_MIDDLE_BOX WHERE MEDIUMBOXCODE = '{mesMiddleBox.MediumBoxCode}'";
                    sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlDelete);
                    var sqlDelete = "DELETE FROM MES_MIDDLE_BOX WHERE MEDIUMBOXCODE = :code";
                    var delParams = new[] { new OracleParameter(":code", mesMiddleBox.MediumBoxCode) };
                    sqlHelper.ExecuteNonQueryWithTransaction(sqlDelete, delParams, connection, transaction);
                }
                else
                {
@@ -328,7 +523,7 @@
                transaction.Rollback();
                msg[0] = "false";
                msg[1] = ex.Message;
                throw; // 建议记录日志
                throw;
            }
            finally
            {
@@ -338,13 +533,9 @@
            return msg;
        }



        /// <summary>
        /// 设置栈板码（绑定/解绑 SN）
        /// </summary>
        /// <param name="mesPalletBinding">绑定参数</param>
        /// <returns>返回绑定结果</returns>
        public string[] SetStackCode(MesPalletBinding mesPalletBinding)
        {
            var sqlHelper = new OracleSQLHelper();
@@ -355,57 +546,48 @@

            try
            {
                // 绑定
                if (mesPalletBinding.Type.ToUpper() == "A")
                if (mesPalletBinding.Type.ToUpper() == "A") // 绑定
                {
                    if (mesPalletBinding.SnList.Count > 0)
                    {
                        string sql1 = $"SELECT COUNT(*) COUNT FROM MES_PALLET_BINDING WHERE STACKCODE = '{mesPalletBinding.StackCode}'";
                        DataTable data = sqlHelper.ExecuteQuery(sql1);
                        var sqlCheck = "SELECT COUNT(*) FROM MES_PALLET_BINDING WHERE STACKCODE = :stackCode";
                        var checkParams = new[] { new OracleParameter(":stackCode", mesPalletBinding.StackCode) };
                        var count = Convert.ToInt32(sqlHelper.ExecuteScalarWithTransaction(connection, transaction, sqlCheck, checkParams));

                        if (data.Rows[0]["COUNT"].ToString() != "0")
                        if (count > 0)
                        {
                            msg[0] = "false";
                            msg[1] = "该栈板码已经绑定SN数据，如需再次绑定请先解绑！栈板码：" + mesPalletBinding.StackCode;
                            msg[1] = $"该栈板码已经绑定SN数据，如需再次绑定请先解绑！栈板码：{mesPalletBinding.StackCode}";
                            transaction.Rollback();
                            return msg;
                        }

                        foreach (var item in mesPalletBinding.SnList)
                        {
                            string sqlInsert = $@"
                            var sqlInsert = @"
                        INSERT INTO MES_PALLET_BINDING (
                            ID, STACKCODE, LOGIN_ID, SN_NO, TICKET_NO, MEDIUMBOXCODE, CREATE_DATE, CREATED_BY
                        ) VALUES (
                            SEQ_MES_PALLET_BINDING_ID.NEXTVAL,
                            '{mesPalletBinding.StackCode}',
                            '{mesPalletBinding.LoginId}',
                            '{item.SnNo}',
                            '{item.TicketNo}',
                            '{item.MediumBoxCode}',
                            SYSDATE,
                            '{mesPalletBinding.LoginId}'
                        )";
                            :stackCode, :loginId, :snNo, :ticketNo, :mediumBoxCode, SYSDATE, :createdBy)";
                            var insertParams = new[]
                            {
                        new OracleParameter(":stackCode", mesPalletBinding.StackCode),
                        new OracleParameter(":loginId", mesPalletBinding.LoginId),
                        new OracleParameter(":snNo", item.SnNo),
                        new OracleParameter(":ticketNo", item.TicketNo),
                        new OracleParameter(":mediumBoxCode", item.MediumBoxCode),
                        new OracleParameter(":createdBy", mesPalletBinding.LoginId)
                    };
                            sqlHelper.ExecuteNonQueryWithTransaction(sqlInsert, insertParams, connection, transaction);

                            sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlInsert);

                            // 插入绑定日志（操作类型 0）
                            string logInsert = $@"
                            var sqlLog = @"
                        INSERT INTO MES_PALLET_BINDING_LOG (
                            ID, STACKCODE, LOGIN_ID, SN_NO, TICKET_NO, MEDIUMBOXCODE, CREATE_DATE, CREATED_BY, OPERATION_TYPE
                        ) VALUES (
                            MES_PALLET_BINDING_LOG_ID.NEXTVAL,
                            '{mesPalletBinding.StackCode}',
                            '{mesPalletBinding.LoginId}',
                            '{item.SnNo}',
                            '{item.TicketNo}',
                            '{item.MediumBoxCode}',
                            SYSDATE,
                            '{mesPalletBinding.LoginId}',
                            '0'
                        )";

                            sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, logInsert);
                            :stackCode, :loginId, :snNo, :ticketNo, :mediumBoxCode, SYSDATE, :createdBy, 0)";
                            sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, insertParams, connection, transaction);
                        }
                    }
                    else
@@ -414,40 +596,49 @@
                        msg[1] = "SN明细为空，请确认！";
                    }
                }
                // 解绑
                else if (mesPalletBinding.Type.ToUpper() == "F")
                else if (mesPalletBinding.Type.ToUpper() == "F") // 解绑
                {
                    // 先查询绑定的记录
                    string sqlSelect = $"SELECT * FROM MES_PALLET_BINDING WHERE STACKCODE = '{mesPalletBinding.StackCode}'";
                    DataTable dt = sqlHelper.ExecuteQuery( sqlSelect);
                    var sqlCheck = "SELECT COUNT(*) FROM MES_PALLET_BINDING WHERE STACKCODE = :stackCode AND IS_INBOUND = 1";
                    var checkParams = new[] { new OracleParameter(":stackCode", mesPalletBinding.StackCode) };
                    var count = Convert.ToInt32(sqlHelper.ExecuteScalarWithTransaction(connection, transaction, sqlCheck, checkParams));

                    if (count > 0)
                    {
                        msg[0] = "false";
                        msg[1] = $"该栈板码已经在MES入库，不允许解绑！栈板码：{mesPalletBinding.StackCode}";
                        transaction.Rollback();
                        return msg;
                    }

                    var sqlSelect = "SELECT * FROM MES_PALLET_BINDING WHERE STACKCODE = :stackCode";
                    var selectParams = new[] { new OracleParameter(":stackCode", mesPalletBinding.StackCode) };
                    var dt = sqlHelper.ExecuteDataTable(sqlSelect, CommandType.Text, selectParams);

                    foreach (DataRow row in dt.Rows)
                    {
                        // 插入解绑日志（操作类型 1）
                        string logInsert = $@"
                        var sqlLog = @"
                    INSERT INTO MES_PALLET_BINDING_LOG (
                        ID, STACKCODE, LOGIN_ID, SN_NO, TICKET_NO, MEDIUMBOXCODE, CREATE_DATE, CREATED_BY, OPERATION_TYPE
                    ) VALUES (
                        MES_PALLET_BINDING_LOG_ID.NEXTVAL,
                        '{row["STACKCODE"]}',
                        '{row["LOGIN_ID"]}',
                        '{row["SN_NO"]}',
                        '{row["TICKET_NO"]}',
                        '{row["MEDIUMBOXCODE"]}',
                        SYSDATE,
                        '{mesPalletBinding.LoginId}',
                        '1'
                    )";

                        sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, logInsert);
                        :stackCode, :loginId, :snNo, :ticketNo, :mediumBoxCode, SYSDATE, :createdBy, 1)";
                        var logParams = new[]
                        {
                    new OracleParameter(":stackCode", row["STACKCODE"]),
                    new OracleParameter(":loginId", row["LOGIN_ID"]),
                    new OracleParameter(":snNo", row["SN_NO"]),
                    new OracleParameter(":ticketNo", row["TICKET_NO"]),
                    new OracleParameter(":mediumBoxCode", row["MEDIUMBOXCODE"]),
                    new OracleParameter(":createdBy", mesPalletBinding.LoginId)
                };
                        sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, logParams, connection, transaction);
                    }

                    // 删除绑定记录
                    string sqlDelete = $"DELETE FROM MES_PALLET_BINDING WHERE STACKCODE = '{mesPalletBinding.StackCode}'";
                    sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlDelete);
                    var sqlDelete = "DELETE FROM MES_PALLET_BINDING WHERE STACKCODE = :stackCode";
                    var delParams = new[] { new OracleParameter(":stackCode", mesPalletBinding.StackCode) };
                    sqlHelper.ExecuteNonQueryWithTransaction(sqlDelete, delParams, connection, transaction);
                }

                // 提交事务
                transaction.Commit();
            }
            catch (Exception ex)
@@ -455,7 +646,7 @@
                transaction.Rollback();
                msg[0] = "false";
                msg[1] = ex.Message;
                throw; // 建议记录日志
                throw;
            }
            finally
            {