产测配件绑定代码提交

zjh

2025-08-13 166ff0158bf60a2554047fcd32721ed7ea968874

产测配件绑定代码提交

 StandardPda/MES.Service/DB/OracleSQLHelper.cs

@@ -246,5 +246,19 @@
            connection.Dispose();
        }
    }
    public object ExecuteScalarWithTransaction(OracleConnection conn, OracleTransaction tran, string sql, params OracleParameter[] parameters)
    {
        using (var cmd = conn.CreateCommand())
        {
            cmd.Transaction = tran;
            cmd.CommandText = sql;
            if (parameters != null)
            {
                cmd.Parameters.AddRange(parameters);
            }
            return cmd.ExecuteScalar();
        }
    }


}

 StandardPda/MES.Service/Dto/service/AsnInfo.cs

@@ -29,6 +29,12 @@
        public List<CcFailItems>? failItems { get; set; }


        /// <summary>
        /// 配件绑定
        /// </summary>
        public List<AccessoryList>? accessoryList { get; set; }


    }
    /// <summary>
    /// 产测SN失败项明细表
@@ -59,4 +65,30 @@
      
    }

    /// <summary>
    /// 配件明细
    /// </summary>
    public class AccessoryList
    {

        /// <summary>
        /// 绑定状态（(0:绑定, 1:解绑）
        /// </summary>
        public string? bindingState { get; set; }

        /// <summary>
        /// 配件SN号
        /// </summary>
        public string? accessorySn { get; set; }

        /// <summary>
        ///配件中文含义
        /// </summary>
        public string? accessoryName { get; set; }

    


    }

}

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

@@ -83,50 +83,123 @@
        {
            var sqlHelper = new OracleSQLHelper();
            bool result = true;
            //

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

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

                // 1. 主表插入
                var sql1 = $@"
            INSERT INTO MES_SN_STATUS_DETAILS
              (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID)
              VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
                      '{asnInfo.tickeNo}',
                      '{asnInfo.snNo}',
                      '{asnInfo.workstationNo}',
                      '{asnInfo.snState}',
                      '{asnInfo.loginId}')";
                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}')";

                        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 ex)
            catch (Exception)
            {
                transaction.Rollback();
                result = false;
                throw; // 建议记录日志
                throw;
            }
            finally
            {
@@ -136,6 +209,8 @@
            return result;
        }



        /// <summary>
        /// 设置中箱码（绑定/解绑 SN）
        /// </summary>